aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix url mismatches of a single trailing slash for feed author/owner ↵friendica2014-09-234-15/+10
| | | | comparisons; update diaspora_compat
* 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 page
| | * update German main help pagezottel2014-09-231-3/+8
| |/
* / diaspora private mail seems to work now - but there's an obfuscation leak ↵friendica2014-09-233-11/+14
|/ | | | 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-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 ↵friendica2014-09-222-11/+8
| | | | back the other way.
* 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.
| | * Don't link unknown likes.Klaus Weidenbach2014-09-212-96/+96
| | | | | | | | | | | | | | | 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-213-2/+3
|/ | | | didn't fall through to RSS discovery. Issue #599
* Navbar notifications: don't show "nothing new here" unless we've checked and ↵friendica2014-09-204-2/+4
| | | | there's nothing. Until we know for sure, display "Loading...".
* 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 created
| | * 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 ↵marijus2014-09-205-605/+671
| | | | | | | | whole gallery
* | fix empty likesfriendica2014-09-202-3/+10
|/
* Repeat after me - we always refer to our clientelle as 'members'. If your ↵friendica2014-09-192-4/+11
| | | | software calls you a "user" - get rid of it.
* 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
| | | | | | | | last.
| * 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 ↵friendica2014-09-182-0/+2
| | | | it. It needs a bit of theming to even work correctly.
* add stylish_select library to provide a way to clean up and theme all the ↵friendica2014-09-184-0/+927
| | | | ugly select boxes
* 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
| |\ | | | | | | Allow syschan use and extend ping
| | * 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
| | | | | | | | | | | | | | | a while tends to have a longer ping, we should probably have a longer ping
| | * 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
| | | | | | | | | | | | | | | | | | | | they're also an administrator.
* | | | | repeated content collapse on update from display page under rare conditions ↵friendica2014-09-184-2/+9
| |/ / / |/| | | | | | | | | | | (when the conversation hasn't changed)
* | | | keep the language consistentfriendica2014-09-171-1/+1
| | | |
* | | | typofriendica2014-09-171-1/+1
| | | |