aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge from upstreamtuscanhobbit2014-09-22156-3017/+10141
|\
| * 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
| | |\
| | | * Catch the settings tooThomas Willingham2014-09-181-1/+1
| | | * If a short ping causes lots of issues, and anyone who has been hereThomas Willingham2014-09-181-2/+2
| | | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-1840-198/+5619
| | | |\ | | | |/ | | |/|
| | * | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-09-188-11/+71
| | |\ \
| | * | | Doco - permissions needs some work, but this is a relative whopper.Thomas Willingham2014-09-181-1/+1
| | | | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-1510-25/+103
| | | | |\
| | | | * | Very, very cautiously let a developer switch to the sys chan ifThomas Willingham2014-09-151-0/+13
| * | | | | repeated content collapse on update from display page under rare conditions (...friendica2014-09-184-2/+9
| | |/ / / | |/| | |
| * | | | keep the language consistentfriendica2014-09-171-1/+1
| * | | | typofriendica2014-09-171-1/+1
| * | | | use 24-hour clock for non-American datesfriendica2014-09-171-0/+2
| * | | | forgot this one...friendica2014-09-171-0/+2
| * | | | usability tweaksfriendica2014-09-172-2/+15
| * | | | add a spinner or two to the new channel page so folks have a clue that we're ...friendica2014-09-172-0/+6
| * | | | channel permission rolesfriendica2014-09-175-9/+46
| |/ / /
| * | | defined several permission roles - these will probably require some review an...friendica2014-09-171-0/+245
| * | | make the output a bit more readablefriendica2014-09-171-2/+2
| * | | let the xchan diagnostic accept a webbiefriendica2014-09-171-14/+14
| * | | implement permission roles - the backend should be done except for maybe a co...friendica2014-09-177-16/+122
| * | | no sense maintaining 2 to-do files. I think the one I'm removing is reference...friendica2014-09-162-83/+0
| * | | Merge pull request #595 from solstag/masterRedMatrix2014-09-172-2/+2
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 08:03:02 +0000