aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge from origintuscanhobbit2014-09-220-0/+0
|\
| * Merge pull request #3 from friendica/masterPaolo T2014-09-1841-205/+5638
| |\ | | | | | | Merge from upstream
| * \ Merge branch 'master' of https://github.com/friendica/redPaolo Tacconi2014-09-1533-640/+667
| |\ \
* | \ \ Merge from upstreamtuscanhobbit2014-09-22156-3017/+10141
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| | | | | |
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | doing something in the background - trying to complete the nick field for them (and then check it before they submit).
| * | | | | channel permission rolesfriendica2014-09-175-9/+46
| |/ / / /
| * | | | 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
| * | | | make the output a bit more readablefriendica2014-09-171-2/+2
| | | | |
| * | | | let the xchan diagnostic accept a webbiefriendica2014-09-171-14/+14
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 14:10:25 +0000