Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix webpages. Sycning between too many codebases... | Thomas Willingham | 2014-10-11 | 1 | -1/+3 | |
| * | | | Also that doesn't work anymore - prettyPhoto relic | Thomas Willingham | 2014-10-11 | 1 | -1/+1 | |
| * | | | Give Redbasic the -styled back | Thomas Willingham | 2014-10-11 | 1 | -1/+1 | |
| * | | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-10-11 | 1 | -1/+2 | |
| |\ \ \ | ||||||
| | * | | | +1 | Jeroen | 2014-10-11 | 1 | -1/+2 | |
| * | | | | Unbreak webpages | Thomas Willingham | 2014-10-11 | 2 | -3/+2 | |
| |/ / / | ||||||
| * | | | Doco: Hidden configs - you won't believe what happens next! | Thomas Willingham | 2014-10-11 | 1 | -0/+58 | |
* | | | | Revert "x" | habeascodice | 2014-10-11 | 1 | -1/+0 | |
* | | | | Merge branch 'master' of https://github.com/habeascodice/red | habeascodice | 2014-10-11 | 301 | -11204/+11847 | |
|\ \ \ \ | ||||||
| * | | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-11 | 311 | -11353/+11964 | |
| |\| | | | ||||||
| | * | | | fix diaspora reshare tags | friendica | 2014-10-10 | 2 | -1/+3 | |
| | * | | | ah yes, the redundant relay run was for the benefit of wall-to-wall posts iss... | friendica | 2014-10-10 | 1 | -2/+1 | |
| | * | | | missing source route after edit | friendica | 2014-10-10 | 2 | -1/+3 | |
| | * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-10 | 151 | -8229/+6920 | |
| | |\ \ \ | ||||||
| | | * | | | and more missing wrappers | marijus | 2014-10-10 | 18 | -20/+28 | |
| | | * | | | found more missing wrappers | marijus | 2014-10-10 | 2 | -2/+3 | |
| | | * | | | one more oups... | marijus | 2014-10-10 | 1 | -2/+2 | |
| | | * | | | oups... that was weired... | marijus | 2014-10-10 | 1 | -2/+1 | |
| | | * | | | This is a fix to not interfere the ongoing adding of .generic-content-wrapper... | marijus | 2014-10-10 | 18 | -19/+25 | |
| | | * | | | Merge branch 'master' of https://github.com/friendica/red | Jeroen | 2014-10-10 | 258 | -11145/+11812 | |
| | | |\ \ \ | ||||||
| | | | * \ \ | Merge pull request #632 from zzottel/master | zzottel | 2014-10-10 | 8 | -1321/+1385 | |
| | | | |\ \ \ | ||||||
| | | | | * | | | more updates to German strings plus email templates | zottel | 2014-10-10 | 8 | -1321/+1385 | |
| | | | |/ / / | ||||||
| | | | * | | | Merge pull request #631 from zzottel/master | zzottel | 2014-10-10 | 102 | -1885/+0 | |
| | | | |\ \ \ | ||||||
| | | | | * | | | remove unused email template files | zottel | 2014-10-10 | 102 | -1885/+0 | |
| | | | |/ / / | ||||||
| | | | * | | | Merge pull request #630 from zzottel/master | zzottel | 2014-10-10 | 2 | -6172/+6675 | |
| | | | |\ \ \ | ||||||
| | | | | * | | | update to German strings | zottel | 2014-10-10 | 2 | -6172/+6675 | |
| | | | |/ / / | ||||||
| | | * | | | | Good compromise I think. Remove display setting . Set the default (light) sch... | Jeroen | 2014-10-10 | 4 | -10/+5 | |
| | * | | | | | remove remnants of old signing structure - now using diaspora_meta | friendica | 2014-10-10 | 1 | -7/+0 | |
| | * | | | | | reset route to parent route on Diaspora comments flowing upstream so they won... | friendica | 2014-10-10 | 1 | -3/+5 | |
| | * | | | | | make sure diaspora comments get the correct route | friendica | 2014-10-10 | 1 | -0/+4 | |
| | | |/ / / | | |/| | | | ||||||
| | * | | | | improvement in source route checking when handling complex *upstream* deliver... | friendica | 2014-10-10 | 3 | -1056/+1095 | |
| | * | | | | 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 |