aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-013-2/+73
|\
| * admin/dbsync not reporting failed updatesfriendica2015-02-011-1/+1
| * two tracks proceeding in parallel - first adding the ability to store a digit...friendica2015-02-012-1/+72
* | Merge branch 'master' into tresfriendica2015-01-315-7/+146
|\|
| * Merge pull request #881 from cvogeley/masterRedMatrix2015-01-301-0/+3
| |\
| | * Add allowed and not allowed emails to the UI in theChristian Vogeley2015-01-291-0/+3
| * | how did that stuff merge? grrrr....friendica2015-01-291-1/+1
| * | enable ratings only in this branch until we're ready to pushfriendica2015-01-291-1/+1
| * | Merge branch 'master' into pocoratefriendica2015-01-292-4/+3
| |\ \
| | * \ Merge https://github.com/friendica/red into pending_mergefriendica2015-01-291-4/+2
| | |\ \
| | | * | fix issue 848 + code commentsRedSwede2015-01-291-4/+2
| | | |/
| | * / disable ratings until we're a bit further along. It's all changing.friendica2015-01-291-0/+1
| | |/
| * | Merge branch 'master' into pocoratefriendica2015-01-2989-593/+593
| |\|
| * | prate modulefriendica2015-01-291-0/+91
| * | basic query for number of raters. Should probably be a join or subselect but ...friendica2015-01-281-1/+11
| * | updates to put rating info into the local xlink before sending it to known di...friendica2015-01-281-2/+38
* | | cleanup event form and various required indicators on inputsfriendica2015-01-291-3/+4
* | | Merge branch 'master' into tresfriendica2015-01-2989-595/+595
|\ \ \ | | |/ | |/|
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-281-1/+1
| |\ \
| | * | Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-288-236/+83
| | |\|
| | * | fix implicit booleanHabeas Codice2015-01-281-1/+1
| * | | remote_user => remote_channelfriendica2015-01-2817-23/+23
| * | | local_user => local_channelfriendica2015-01-2887-584/+584
| | |/ | |/|
| * | no need for new line here - spacing is done via cssmarijus2015-01-281-1/+1
* | | more message restrict conversionsfriendica2015-01-2910-26/+25
* | | Merge branch 'master' into tresfriendica2015-01-274-28/+54
|\| |
| * | allow RSS connections in the type 'a' autocomplete results as that is used fo...friendica2015-01-271-3/+7
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-271-14/+24
| |\ \
| | * | move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser...marijus2015-01-271-14/+24
| * | | allow doc/help system to use subdirsfriendica2015-01-271-6/+14
| |/ /
| * | superblock enhancementsfriendica2015-01-261-5/+9
* | | Merge branch 'master' into tres and add some work on the item_deleted flag re...friendica2015-01-2611-273/+82
|\| |
| * | provide a json feed of search resultsfriendica2015-01-261-0/+17
| * | abstract poco into a single function in socgraph so we can provide different ...friendica2015-01-252-207/+11
| |/
| * Hide all the scary decision making stuff that sends intellectually challenged...friendica2015-01-251-0/+2
| * rework the new connection stuff so we don't need a "permissions have been cha...friendica2015-01-251-10/+3
| * misspellinganaqreon2015-01-251-1/+1
| * standardize sqlHabeas Codice2015-01-241-1/+1
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-233-30/+13
| |\
| | * some more kissmarijus2015-01-241-30/+9
| | * some code restructuremarijus2015-01-232-3/+4
| | * this will require more fixing in include/enotifymarijus2015-01-231-1/+1
| | * possible performance improvement for sharedwithme update querymarijus2015-01-221-4/+7
| * | rand() fixesHabeas Codice2015-01-232-3/+5
| |/
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-213-42/+49
| |\
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-221-3/+9
| | |\
| | | * couple of hubloc manager issuesfriendica2015-01-211-1/+5
| | | * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-212-39/+39
| | | |\
| | | * | hubloc manage issuefriendica2015-01-211-2/+4
| | * | | make $links an array of linksmarijus2015-01-221-1/+2
| | | |/ | | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 19:08:29 +0000