aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Fix webpages. Sycning between too many codebases...Thomas Willingham2014-10-111-1/+3
| * | | Also that doesn't work anymore - prettyPhoto relicThomas Willingham2014-10-111-1/+1
| * | | Give Redbasic the -styled backThomas Willingham2014-10-111-1/+1
| * | | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-10-111-1/+2
| |\ \ \
| | * | | +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
* | | | Revert "x"habeascodice2014-10-111-1/+0
* | | | Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-10-11301-11204/+11847
|\ \ \ \
| * | | | Merge remote branch 'upstream/master'habeascodice2014-10-11311-11353/+11964
| |\| | |
| | * | | 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 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