aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Navbar notifications: don't show "nothing new here" unless we've checked and ...friendica2014-09-202-1/+2
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-204-7/+35
|\
| * oups...marijus2014-09-201-1/+1
| * aalso change the way we check for number of chatroomsmarijus2014-09-203-4/+15
| * show bookmarks menu only if we have any bookmarks alreadymarijus2014-09-203-3/+20
* | fix empty likesfriendica2014-09-201-2/+9
|/
* closing tagfriendica2014-09-191-1/+1
* try to sort out walltowall translation for diaspora recipientsfriendica2014-09-193-15/+7
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-1812-64/+527
|\
| * usability tweaksfriendica2014-09-172-2/+15
| * channel permission rolesfriendica2014-09-172-6/+31
| * defined several permission roles - these will probably require some review an...friendica2014-09-171-0/+245
| * implement permission roles - the backend should be done except for maybe a co...friendica2014-09-173-12/+73
| * that's why bb2diaspora_itemwallwall() wasn't doing its thang.friendica2014-09-161-3/+3
| * still some old Friendica database queries in diaspora_signed_retractionfriendica2014-09-161-17/+15
| * z_post_url_json() added to easily deal with JSON post APIs; without getting c...friendica2014-09-161-0/+17
| * just mark dead hubloc deleted - don't remove them. This could cause problems....friendica2014-09-163-13/+9
| * use the more portable encoded_item format for exported items - but with added...friendica2014-09-162-15/+31
| * channel export with itemsfriendica2014-09-152-6/+40
| * honour service class restrictions for total_identities, total_channels ("frie...friendica2014-09-152-4/+59
| * final piece of the mrjive delivery puzzle, and now we've got most all the too...friendica2014-09-151-3/+6
* | Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-155-14/+73
|\|
| * provide a way to sync locations and get rid of bogus hublocs, now implementedfriendica2014-09-145-14/+73
* | Very, very cautiously let a developer switch to the sys chan ifThomas Willingham2014-09-151-0/+13
* | Bugger, revert - not only a dodgy cut and paste between terminals, butThomas Willingham2014-09-151-14/+0
* | Very, very cautiously, let a developer switch to the sys chan, ifThomas Willingham2014-09-151-0/+14
|/
* that won't work...friendica2014-09-141-1/+2
* bb2diaspora_itemwallwall not finding author elements - inserting empty bbcodefriendica2014-09-141-0/+4
* fix diaspora_retractionfriendica2014-09-141-7/+4
* pull the plug on the old location sync section of import_xchan - this has now...friendica2014-09-141-168/+12
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-141-0/+1
|\
| * Thanks to Thomas other people see now your posts on your channel page also li...Jeroen2014-09-141-1/+1
| * Made link post titles to source optional in display settings. Hopefully I did...Jeroen2014-09-141-0/+1
* | privacy issue - restrictive stream permission setting with a non-targetted po...friendica2014-09-141-2/+20
|/
* more heavy lifting on the hubloc management and revocation infrastructure; do...friendica2014-09-141-10/+51
* some backend work for the remaining missing bits of mod_hubman - this is stil...friendica2014-09-132-3/+255
* log why this doesn't get executedfriendica2014-09-121-0/+2
* doc updates and a couple of issues spotted in the logs (diaspora likes, feed ...friendica2014-09-122-2/+2
* bad redirectsfriendica2014-09-111-0/+6
* red group/collection query calls for apifriendica2014-09-111-0/+33
* don't allow an xchan to be imported with an empty name. To avoid translation ...friendica2014-09-111-2/+2
* correct item author for feeds with multiple or different authorsfriendica2014-09-111-8/+90
* add gif to supported image types (if it's supported)friendica2014-09-111-1/+1
* issue #588 can't add feeds to collections using connedit page group sidebar w...friendica2014-09-111-0/+1
* disabling ability for diaspora to plustag redmatrix forums. See the notes.friendica2014-09-101-1/+5
* possible solution to diaspora walltowall mistaken attributionfriendica2014-09-102-9/+22
* encrypt diaspora_meta since it may contain private message contentsfriendica2014-09-103-19/+47
* fix the like signatures to the "new ordering" - inbound and outboundfriendica2014-09-101-20/+12
* don't include plus-sign in the stored term for imported mentionsfriendica2014-09-101-1/+3
* this should be the final piece of the puzzlefriendica2014-09-091-0/+14