Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | more css shifting | marijus | 2014-09-27 | 3 | -16/+17 | |
| | |/ / | |/| | | ||||||
| * | | | upload first but not inside another {{if}} | marijus | 2014-09-26 | 1 | -1/+1 | |
| * | | | upload should be first | marijus | 2014-09-26 | 1 | -3/+3 | |
| * | | | fix blockquote | marijus | 2014-09-26 | 4 | -16/+17 | |
| * | | | So much so, in fact, that I didn't even notice the typo. | Thomas Willingham | 2014-09-26 | 1 | -1/+1 | |
| * | | | Minor doco. Add some clarity - that had me scratching my head. | Thomas Willingham | 2014-09-26 | 1 | -1/+1 | |
* | | | | Merge from origin | tuscanhobbit | 2014-09-28 | 83 | -1956/+2370 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Rebase from upstream | Paolo Tacconi | 2014-09-26 | 67 | -1246/+1444 | |
| |\| | | ||||||
| | * | | move some css to the right place | marijus | 2014-09-26 | 3 | -12/+13 | |
| | * | | some more work on photos - work in progress | marijus | 2014-09-26 | 6 | -84/+73 | |
| | |/ | ||||||
| | * | doc updates, clean up buttons on PM edit template to match other edit buttons | friendica | 2014-09-26 | 55 | -1147/+1274 | |
| | * | optionally include wall items (posts) in import/export | friendica | 2014-09-25 | 6 | -9/+90 | |
| | * | Typo | Thomas Willingham | 2014-09-25 | 1 | -1/+1 | |
| * | | Rebase from upstream | Paolo Tacconi | 2014-09-25 | 123 | -2915/+4795 | |
| |\| | ||||||
| | * | constrain viewsrc colorbox to 80% of the current page size. It gets messy scr... | friendica | 2014-09-24 | 1 | -1/+1 | |
| | * | if no rss/atom element author, use feed level contact | friendica | 2014-09-24 | 1 | -7/+11 | |
| | * | make it the default | friendica | 2014-09-24 | 1 | -21/+20 | |
| | * | one step closer | friendica | 2014-09-24 | 1 | -1/+3 | |
| | * | more testing | friendica | 2014-09-24 | 1 | -3/+18 | |
| | * | just an experiment - don't do anything with this until I'm finished with it. | friendica | 2014-09-24 | 2 | -1/+10 | |
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-23 | 1 | -632/+721 | |
| | |\ | ||||||
| | | * | Merge pull request #601 from solstag/master | RedMatrix | 2014-09-24 | 1 | -632/+721 | |
| | | |\ | ||||||
| | | | * | update pt-br translation | Alexandre Hannud Abdo | 2014-09-22 | 1 | -632/+721 | |
| | * | | | fix url mismatches of a single trailing slash for feed author/owner compariso... | friendica | 2014-09-23 | 4 | -15/+10 | |
| | |/ / | ||||||
| | * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-23 | 1 | -3/+8 | |
| | |\ \ | ||||||
| | | * \ | Merge pull request #602 from zzottel/master | zzottel | 2014-09-23 | 1 | -3/+8 | |
| | | |\ \ | ||||||
| | | | * | | update German main help page | zottel | 2014-09-23 | 1 | -3/+8 | |
| | | |/ / | ||||||
| | * / / | diaspora private mail seems to work now - but there's an obfuscation leak via... | friendica | 2014-09-23 | 3 | -11/+14 | |
| | |/ / | ||||||
| | * | | d* little fixes | friendica | 2014-09-23 | 1 | -10/+4 | |
| | * | | d* PM cont. | friendica | 2014-09-23 | 3 | -4/+11 | |
| | * | | more work on d* private messages | friendica | 2014-09-23 | 3 | -9/+78 | |
| | * | | trying to call mod/magic on rss resources - which have no hub | friendica | 2014-09-22 | 2 | -5/+9 | |
| | * | | better way to deal with effective_uid | friendica | 2014-09-22 | 3 | -12/+12 | |
| | * | | make discover items interactive | friendica | 2014-09-22 | 5 | -11/+30 | |
| | * | | found the sucker | friendica | 2014-09-22 | 2 | -2/+4 | |
| | |/ | ||||||
* | | | Merge from origin | tuscanhobbit | 2014-09-22 | 0 | -0/+0 | |
|\| | | ||||||
| * | | Merge pull request #3 from friendica/master | Paolo T | 2014-09-18 | 41 | -205/+5638 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' of https://github.com/friendica/red | Paolo Tacconi | 2014-09-15 | 33 | -640/+667 | |
| |\ \ \ | ||||||
* | \ \ \ | Merge from upstream | tuscanhobbit | 2014-09-22 | 156 | -3017/+10141 | |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | ||||||
| * | | | private mail from d* to r# seems to work with these edits. - Now have to go b... | friendica | 2014-09-22 | 2 | -11/+8 | |
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-21 | 2 | -96/+96 | |
| |\ \ \ | ||||||
| | * \ \ | Merge pull request #600 from dawnbreak/master | RedMatrix | 2014-09-22 | 2 | -96/+96 | |
| | |\ \ \ | ||||||
| | | * | | | Don't link unknown likes. | Klaus Weidenbach | 2014-09-21 | 2 | -96/+96 | |
| * | | | | | we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = HUB... | friendica | 2014-09-21 | 1 | -2/+3 | |
| |/ / / / | ||||||
| * / / / | feeds with '@' in the URL were being handled as webfinger addresses and didn'... | friendica | 2014-09-21 | 3 | -2/+3 | |
| |/ / / | ||||||
| * | | | Navbar notifications: don't show "nothing new here" unless we've checked and ... | friendica | 2014-09-20 | 4 | -2/+4 | |
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-20 | 10 | -613/+709 | |
| |\ \ \ | ||||||
| | * \ \ | Merge pull request #598 from cvogeley/master | cvogeley | 2014-09-20 | 1 | -1/+3 | |
| | |\ \ \ | ||||||
| | | * | | | Allow ordering by created | Christian Vogeley | 2014-09-20 | 1 | -1/+3 | |
| | |/ / / | ||||||
| | * | | | oups... | marijus | 2014-09-20 | 1 | -1/+1 |