Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | doc updates | friendica | 2014-10-10 | 140 | -1903/+3809 | |
| | * | | allow (our own) ajax urls to pass through bbcode intact. | friendica | 2014-10-09 | 4 | -7/+11 | |
| * | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-09 | 22 | -3380/+3802 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge remote branch 'upstream/master' | habeascodice | 2014-10-07 | 5 | -18/+29 | |
| |\ \ \ \ | ||||||
| * | | | | | x | habeascodice | 2014-10-07 | 1 | -0/+1 | |
| * | | | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-07 | 66 | -7600/+648 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge remote branch 'upstream/master' | habeascodice | 2014-10-06 | 176 | -1201/+12679 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge remote branch 'upstream/master' | habeascodice | 2014-09-29 | 7 | -1366/+1983 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | habeascodice | 2014-10-09 | 36 | -182/+151 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-09 | 28 | -30/+67 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | Added the display setting for generic (other) content wrapper. Also did set t... | Jeroen | 2014-10-09 | 8 | -6/+22 | |
| | * | | | | | | | Added and changed on some places div class generic-content-wrapper. And added... | Jeroen | 2014-10-09 | 21 | -29/+50 | |
| * | | | | | | | | OK this is important. So read it carefully. | friendica | 2014-10-09 | 1 | -3/+33 | |
| * | | | | | | | | add site apps directory to .gitignore | friendica | 2014-10-09 | 1 | -0/+3 | |
| * | | | | | | | | allow a site to over-ride the system app list without causing git issues | friendica | 2014-10-09 | 1 | -1/+4 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-09 | 1 | -112/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | remove some cruft - revert if you find any regressions | marijus | 2014-10-09 | 1 | -112/+0 | |
| * | | | | | | | | return of the missing diaspora wall-to-wall attribution | friendica | 2014-10-09 | 2 | -12/+12 | |
| |/ / / / / / / | ||||||
| * | | | | | | | fix css for [code] | marijus | 2014-10-09 | 3 | -8/+12 | |
| * | | | | | | | fix userinfo icon size | marijus | 2014-10-09 | 1 | -1/+1 | |
| * | | | | | | | more css fixes | marijus | 2014-10-09 | 2 | -0/+5 | |
| * | | | | | | | css fixes | marijus | 2014-10-09 | 2 | -15/+14 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-09 | 22 | -3380/+3802 | |
|\| | | | | | | ||||||
| * | | | | | | try to track down intermittent wall-to-wall attribution on Diaspora exported ... | friendica | 2014-10-09 | 2 | -1/+5 | |
| * | | | | | | oembed issues | friendica | 2014-10-08 | 2 | -9/+9 | |
| * | | | | | | change parent constructor per discussion | friendica | 2014-10-08 | 1 | -1/+1 | |
| * | | | | | | dav issue | friendica | 2014-10-08 | 2 | -2/+1 | |
| * | | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-08 | 5 | -3279/+3688 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge pull request #622 from solstag/master | RedMatrix | 2014-10-09 | 2 | -3276/+3679 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | update pt-br translation | Alexandre Hannud Abdo | 2014-10-07 | 2 | -3276/+3679 | |
| | * | | | | | | | Merge pull request #627 from tuscanhobbit/dev | RedMatrix | 2014-10-09 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | it's probably better to return an int type in json | tuscanhobbit | 2014-10-08 | 1 | -1/+2 | |
| | | * | | | | | | | The simplest way to hide hubs in statistics | tuscanhobbit | 2014-10-08 | 1 | -1/+2 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Small fix so search field and search buttons fit well. | Jeroen | 2014-10-08 | 1 | -1/+5 | |
| | * | | | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-08 | 2 | -1/+10 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | css fix | marijus | 2014-10-08 | 1 | -1/+1 | |
| * | | | | | | | | | disable email notifications when bulk importing content. | friendica | 2014-10-08 | 2 | -0/+37 | |
| * | | | | | | | | | don't double-encode hashtags | friendica | 2014-10-08 | 1 | -4/+4 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | soundcloud using a slightly different oembed mechanism - react accordingly | friendica | 2014-10-08 | 2 | -1/+10 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #626 from habeascodice/master | RedMatrix | 2014-10-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| * | | | | | | | make nav-pills a bit smaller in height | marijus | 2014-10-08 | 2 | -3/+7 | |
| * | | | | | | | template for searchbox and some more work on saved searches | marijus | 2014-10-08 | 6 | -67/+42 | |
| * | | | | | | | nav pills for apps aside | marijus | 2014-10-08 | 1 | -1/+1 | |
| * | | | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge pull request #625 from letterbomber/master | RedMatrix | 2014-10-08 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | put back local file check so body is fetched from z_ functions | nostupidzone | 2014-10-07 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
| * / / / / / / / | make author link bold again | marijus | 2014-10-08 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
| * | | | | | / | css fixes | marijus | 2014-10-08 | 3 | -20/+5 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-07 | 5 | -18/+29 | |
|\| | | | | | | ||||||
| * | | | | | | add imagick version check when guessing mimetype. It probably isn't important... | friendica | 2014-10-07 | 1 | -10/+21 |