aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge remote branch 'upstream/master'habeascodice2014-09-283-106/+286
| |\
| * | Typo in regex causes runtime errorhabeascodice2014-09-281-1/+1
| | |
* | | Silence insanely noisy log - should probably stick this in a dloggerThomas Willingham2014-09-291-1/+1
| |/ |/| | | | | if we need it - we're getting literally hundreds of thousands of these.
* | BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does.Thomas Willingham2014-09-281-1/+1
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-271-105/+269
|\ \
| * | Some documentation of include/config.php.Klaus Weidenbach2014-09-261-105/+269
| |/ | | | | | | | | I hope my guesses are not completely wrong, anyway please take look not that I tell complete bullshit.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-271-1/+1
|\|
| * So much so, in fact, that I didn't even notice the typo.Thomas Willingham2014-09-261-1/+1
| |
| * Minor doco. Add some clarity - that had me scratching my head.Thomas Willingham2014-09-261-1/+1
| |
* | some background work for import/export of things and liked things/profilesfriendica2014-09-271-0/+16
|/
* optionally include wall items (posts) in import/exportfriendica2014-09-253-6/+29
|
* TypoThomas Willingham2014-09-251-1/+1
|
* if no rss/atom element author, use feed level contactfriendica2014-09-241-7/+11
|
* make it the defaultfriendica2014-09-241-21/+20
|
* one step closerfriendica2014-09-241-1/+3
|
* more testingfriendica2014-09-241-3/+18
|
* just an experiment - don't do anything with this until I'm finished with it.friendica2014-09-241-0/+9
|
* fix url mismatches of a single trailing slash for feed author/owner ↵friendica2014-09-233-4/+8
| | | | comparisons; update diaspora_compat
* diaspora private mail seems to work now - but there's an obfuscation leak ↵friendica2014-09-232-11/+13
| | | | via the conversation structure that needs to be dealt with.
* d* little fixesfriendica2014-09-231-10/+4
|
* d* PM cont.friendica2014-09-233-4/+11
|
* more work on d* private messagesfriendica2014-09-232-8/+77
|
* trying to call mod/magic on rss resources - which have no hubfriendica2014-09-222-5/+9
|
* better way to deal with effective_uidfriendica2014-09-222-10/+10
|
* make discover items interactivefriendica2014-09-223-9/+25
|
* found the suckerfriendica2014-09-222-2/+4
|
* private mail from d* to r# seems to work with these edits. - Now have to go ↵friendica2014-09-221-10/+7
| | | | back the other way.
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-211-96/+90
|\
| * Merge pull request #600 from dawnbreak/masterRedMatrix2014-09-221-96/+90
| |\ | | | | | | Don't link unknown likes.
| | * Don't link unknown likes.Klaus Weidenbach2014-09-211-96/+90
| | | | | | | | | | | | | | | Likes/Dislikes of unknown channels have disabled links now. Fixed intention a bit, romved a unused variable.
* | | we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = ↵friendica2014-09-211-2/+3
|/ / | | | | | | HUBLOC_OFFLINE instead. Filter this as well from deliveries.
* / feeds with '@' in the URL were being handled as webfinger addresses and ↵friendica2014-09-212-1/+2
|/ | | | didn't fall through to RSS discovery. Issue #599
* Navbar notifications: don't show "nothing new here" unless we've checked and ↵friendica2014-09-202-1/+2
| | | | there's nothing. Until we know for sure, display "Loading...".
* 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 ↵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.