aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'habeascodice2014-09-283-106/+286
|\
| * 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
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-271-1/+1
| |\|
| * | some background work for import/export of things and liked things/profilesfriendica2014-09-271-0/+16
* | | Typo in regex causes runtime errorhabeascodice2014-09-281-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
|/
* 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 compariso...friendica2014-09-233-4/+8
* diaspora private mail seems to work now - but there's an obfuscation leak via...friendica2014-09-232-11/+13
* 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 b...friendica2014-09-221-10/+7
* 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.Klaus Weidenbach2014-09-211-96/+90
* | | we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = HUB...friendica2014-09-211-2/+3
|/ /
* / feeds with '@' in the URL were being handled as webfinger addresses and didn'...friendica2014-09-212-1/+2
|/
* 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