aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge from origintuscanhobbit2014-09-2883-1956/+2370
|\
| * Rebase from upstreamPaolo Tacconi2014-09-2667-1246/+1444
| |\
| | * move some css to the right placemarijus2014-09-263-12/+13
| | |
| | * some more work on photos - work in progressmarijus2014-09-266-84/+73
| | |
| | * doc updates, clean up buttons on PM edit template to match other edit buttonsfriendica2014-09-2655-1147/+1274
| | |
| | * optionally include wall items (posts) in import/exportfriendica2014-09-256-9/+90
| | |
| | * TypoThomas Willingham2014-09-251-1/+1
| | |
| * | Rebase from upstreamPaolo Tacconi2014-09-25123-2915/+4795
| |\|
| | * constrain viewsrc colorbox to 80% of the current page size. It gets messy ↵friendica2014-09-241-1/+1
| | | | | | | | | | | | scrolling to the right for days to find the close button.
| | * 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 translation
| | | | * update pt-br translationAlexandre Hannud Abdo2014-09-221-632/+721
| | | | |
| | * | | 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
| | |/
* | | 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
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 07:34:47 +0000