aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rebase from upstreamPaolo Tacconi2014-09-25123-2915/+4795
|\
| * constrain viewsrc colorbox to 80% of the current page size. It gets messy scr...friendica2014-09-241-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-242-1/+10
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-231-632/+721
| |\
| | * Merge pull request #601 from solstag/masterRedMatrix2014-09-241-632/+721
| | |\
| | | * update pt-br translationAlexandre Hannud Abdo2014-09-221-632/+721
| * | | fix url mismatches of a single trailing slash for feed author/owner compariso...friendica2014-09-234-15/+10
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-231-3/+8
| |\ \
| | * \ Merge pull request #602 from zzottel/masterzzottel2014-09-231-3/+8
| | |\ \
| | | * | update German main help pagezottel2014-09-231-3/+8
| | |/ /
| * / / diaspora private mail seems to work now - but there's an obfuscation leak via...friendica2014-09-233-11/+14
| |/ /
| * | d* little fixesfriendica2014-09-231-10/+4
| * | d* PM cont.friendica2014-09-233-4/+11
| * | more work on d* private messagesfriendica2014-09-233-9/+78
| * | trying to call mod/magic on rss resources - which have no hubfriendica2014-09-222-5/+9
| * | better way to deal with effective_uidfriendica2014-09-223-12/+12
| * | make discover items interactivefriendica2014-09-225-11/+30
| * | 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-222-11/+8
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-212-96/+96
| |\
| | * Merge pull request #600 from dawnbreak/masterRedMatrix2014-09-222-96/+96
| | |\
| | | * Don't link unknown likes.Klaus Weidenbach2014-09-212-96/+96
| * | | 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-213-2/+3
| |/
| * Navbar notifications: don't show "nothing new here" unless we've checked and ...friendica2014-09-204-2/+4
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-2010-613/+709
| |\
| | * Merge pull request #598 from cvogeley/mastercvogeley2014-09-201-1/+3
| | |\
| | | * Allow ordering by createdChristian Vogeley2014-09-201-1/+3
| | |/
| | * 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
| | * update jg to latest preview release and try once more to really justify the w...marijus2014-09-205-605/+671
| * | fix empty likesfriendica2014-09-202-3/+10
| |/
| * Repeat after me - we always refer to our clientelle as 'members'. If your sof...friendica2014-09-192-4/+11
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-195-762/+881
| |\
| | * Bit tweakingJeroen2014-09-191-3/+3
| | * Another piece that didn't fit well in the dark schema. Hopefully this is the ...Jeroen2014-09-193-15/+42
| | * update nl.2Jeroen2014-09-192-13/+13
| | * update nlJeroen2014-09-192-745/+837
| * | closing tagfriendica2014-09-193-20/+20
| |/
| * try to sort out walltowall translation for diaspora recipientsfriendica2014-09-197-18/+133
| * doc updatesfriendica2014-09-1970-693/+1063
| * add stylish_select to new_channel page - but comment out until we can theme i...friendica2014-09-182-0/+2
| * add stylish_select library to provide a way to clean up and theme all the ugl...friendica2014-09-184-0/+927
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-184-4/+17
| |\
| | * Merge pull request #596 from beardy-unixer/masterRedMatrix2014-09-193-3/+16
| | |\