aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | doc updatesfriendica2014-10-10140-1903/+3809
| | * | allow (our own) ajax urls to pass through bbcode intact.friendica2014-10-094-7/+11
| * | | Merge remote branch 'upstream/master'habeascodice2014-10-0922-3380/+3802
| |\ \ \
| * \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-075-18/+29
| |\ \ \ \
| * | | | | xhabeascodice2014-10-071-0/+1
| * | | | | Merge remote branch 'upstream/master'habeascodice2014-10-0766-7600/+648
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-06176-1201/+12679
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-09-297-1366/+1983
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-0936-182/+151
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-0928-30/+67
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Added the display setting for generic (other) content wrapper. Also did set t...Jeroen2014-10-098-6/+22
| | * | | | | | | Added and changed on some places div class generic-content-wrapper. And added...Jeroen2014-10-0921-29/+50
| * | | | | | | | OK this is important. So read it carefully.friendica2014-10-091-3/+33
| * | | | | | | | add site apps directory to .gitignorefriendica2014-10-091-0/+3
| * | | | | | | | allow a site to over-ride the system app list without causing git issuesfriendica2014-10-091-1/+4
| |/ / / / / / /
| * | | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-091-112/+0
| |\ \ \ \ \ \ \
| | * | | | | | | remove some cruft - revert if you find any regressionsmarijus2014-10-091-112/+0
| * | | | | | | | return of the missing diaspora wall-to-wall attributionfriendica2014-10-092-12/+12
| |/ / / / / / /
| * | | | | | | fix css for [code]marijus2014-10-093-8/+12
| * | | | | | | fix userinfo icon sizemarijus2014-10-091-1/+1
| * | | | | | | more css fixesmarijus2014-10-092-0/+5
| * | | | | | | css fixesmarijus2014-10-092-15/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote branch 'upstream/master'habeascodice2014-10-0922-3380/+3802
|\| | | | | |
| * | | | | | try to track down intermittent wall-to-wall attribution on Diaspora exported ...friendica2014-10-092-1/+5
| * | | | | | oembed issuesfriendica2014-10-082-9/+9
| * | | | | | change parent constructor per discussionfriendica2014-10-081-1/+1
| * | | | | | dav issuefriendica2014-10-082-2/+1
| * | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-085-3279/+3688
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #622 from solstag/masterRedMatrix2014-10-092-3276/+3679
| | |\ \ \ \ \ \
| | | * | | | | | update pt-br translationAlexandre Hannud Abdo2014-10-072-3276/+3679
| | * | | | | | | Merge pull request #627 from tuscanhobbit/devRedMatrix2014-10-091-1/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | it's probably better to return an int type in jsontuscanhobbit2014-10-081-1/+2
| | | * | | | | | | The simplest way to hide hubs in statisticstuscanhobbit2014-10-081-1/+2
| | |/ / / / / / /
| | * | | | | | | Small fix so search field and search buttons fit well.Jeroen2014-10-081-1/+5
| | * | | | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-082-1/+10
| | |\ \ \ \ \ \ \
| | * | | | | | | | css fixmarijus2014-10-081-1/+1
| * | | | | | | | | disable email notifications when bulk importing content.friendica2014-10-082-0/+37
| * | | | | | | | | don't double-encode hashtagsfriendica2014-10-081-4/+4
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | soundcloud using a slightly different oembed mechanism - react accordinglyfriendica2014-10-082-1/+10
| |/ / / / / / /
| * | | | | | | Merge pull request #626 from habeascodice/masterRedMatrix2014-10-081-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | make nav-pills a bit smaller in heightmarijus2014-10-082-3/+7
| * | | | | | | template for searchbox and some more work on saved searchesmarijus2014-10-086-67/+42
| * | | | | | | nav pills for apps asidemarijus2014-10-081-1/+1
| * | | | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-081-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #625 from letterbomber/masterRedMatrix2014-10-081-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | put back local file check so body is fetched from z_ functionsnostupidzone2014-10-071-1/+1
| | |/ / / / / / /
| * / / / / / / / make author link bold againmarijus2014-10-081-1/+1
| |/ / / / / / /
| * | | | | | / css fixesmarijus2014-10-083-20/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote branch 'upstream/master'habeascodice2014-10-075-18/+29
|\| | | | | |
| * | | | | | add imagick version check when guessing mimetype. It probably isn't important...friendica2014-10-071-10/+21