aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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 ↵friendica2014-09-171-0/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and adjustment. social social_restricted social_private forum forum_restricted forum_private feed feed_restricted soapbox
| * implement permission roles - the backend should be done except for maybe a ↵friendica2014-09-173-12/+73
| | | | | | | | couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone.
| * 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 ↵friendica2014-09-161-0/+17
| | | | | | | | content-type unknown warnings/errors. Also added a debug option to z_get|post_url so you could track and log some of these nasty little buggers.
| * just mark dead hubloc deleted - don't remove them. This could cause ↵friendica2014-09-163-13/+9
| | | | | | | | problems. Also clean up fetch_url/post_url header option
| * use the more portable encoded_item format for exported items - but with ↵friendica2014-09-162-15/+31
| | | | | | | | added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this.
| * channel export with itemsfriendica2014-09-152-6/+40
| |
| * honour service class restrictions for total_identities, total_channels ↵friendica2014-09-152-4/+59
| | | | | | | | ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
| * final piece of the mrjive delivery puzzle, and now we've got most all the ↵friendica2014-09-151-3/+6
| | | | | | | | tools to implement mod_hubman
* | 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
| | | | | | | | they're also an administrator.
* | Bugger, revert - not only a dodgy cut and paste between terminals, butThomas Willingham2014-09-151-14/+0
| | | | | | | | also pushed to the wrong repo
* | Very, very cautiously, let a developer switch to the sys chan, ifThomas Willingham2014-09-151-0/+14
|/ | | | they're also an admin.
* 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 ↵friendica2014-09-141-168/+12
| | | | | | now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different. Please revert this if the matrix breaks in the next few hours.
* 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 ↵Jeroen2014-09-141-1/+1
| | | | | | | | linked to source. If enabled.
| * Made link post titles to source optional in display settings. Hopefully I ↵Jeroen2014-09-141-0/+1
| | | | | | | | did a right.
* | privacy issue - restrictive stream permission setting with a non-targetted ↵friendica2014-09-141-2/+20
|/ | | | post cannot be enforced on remote networks. Restrict these posts to zot network.
* more heavy lifting on the hubloc management and revocation infrastructure; ↵friendica2014-09-141-10/+51
| | | | don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
* some backend work for the remaining missing bits of mod_hubman - this is ↵friendica2014-09-132-3/+255
| | | | still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
* 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
| | | | author import)
* 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
| | | | issues we'll just make it '-'.
* 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 ↵friendica2014-09-111-0/+1
| | | | widget
* 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
|
* cross-network mention issuesfriendica2014-09-091-2/+5
|
* Did I ever mention how much I HATE hacking crypto? If you've got a protocol ↵friendica2014-09-091-1/+12
| | | | doc that says how you sign something, you damm well better sign it that way.
* go through the entire discovery sequence for mentions to make sure we have ↵friendica2014-09-091-1/+9
| | | | the correct URL