aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | +1Jeroen2014-10-111-1/+2
* | | | Unbreak webpagesThomas Willingham2014-10-112-3/+2
|/ / /
* | | Doco: Hidden configs - you won't believe what happens next!Thomas Willingham2014-10-111-0/+58
* | | fix diaspora reshare tagsfriendica2014-10-102-1/+3
* | | ah yes, the redundant relay run was for the benefit of wall-to-wall posts iss...friendica2014-10-101-2/+1
* | | missing source route after editfriendica2014-10-102-1/+3
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-10151-8229/+6920
|\ \ \
| * | | and more missing wrappersmarijus2014-10-1018-20/+28
| * | | found more missing wrappersmarijus2014-10-102-2/+3
| * | | one more oups...marijus2014-10-101-2/+2
| * | | oups... that was weired...marijus2014-10-101-2/+1
| * | | This is a fix to not interfere the ongoing adding of .generic-content-wrapper...marijus2014-10-1018-19/+25
| * | | Merge branch 'master' of https://github.com/friendica/redJeroen2014-10-10258-11145/+11812
| |\ \ \
| | * \ \ Merge pull request #632 from zzottel/masterzzottel2014-10-108-1321/+1385
| | |\ \ \
| | | * | | more updates to German strings plus email templateszottel2014-10-108-1321/+1385
| | |/ / /
| | * | | Merge pull request #631 from zzottel/masterzzottel2014-10-10102-1885/+0
| | |\ \ \
| | | * | | remove unused email template fileszottel2014-10-10102-1885/+0
| | |/ / /
| | * | | Merge pull request #630 from zzottel/masterzzottel2014-10-102-6172/+6675
| | |\ \ \
| | | * | | update to German stringszottel2014-10-102-6172/+6675
| | |/ / /
| * | | | Good compromise I think. Remove display setting . Set the default (light) sch...Jeroen2014-10-104-10/+5
* | | | | remove remnants of old signing structure - now using diaspora_metafriendica2014-10-101-7/+0
* | | | | reset route to parent route on Diaspora comments flowing upstream so they won...friendica2014-10-101-3/+5
* | | | | make sure diaspora comments get the correct routefriendica2014-10-101-0/+4
| |/ / / |/| | |
* | | | improvement in source route checking when handling complex *upstream* deliver...friendica2014-10-103-1056/+1095
* | | | doc updatesfriendica2014-10-10140-1903/+3809
* | | | allow (our own) ajax urls to pass through bbcode intact.friendica2014-10-094-7/+11
* | | | 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
* | | 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