| Commit message (Expand) | Author | Age | Files | Lines |
* | revert the temporary fix for the missing hdr.tpl and add the ability to provi... | friendica | 2014-03-03 | 2 | -5/+2 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-03 | 1 | -0/+3 |
|\ |
|
| * | Partially revert 895c9411d93 | Thomas Willingham | 2014-03-03 | 1 | -0/+3 |
* | | missing file | friendica | 2014-03-03 | 2 | -1/+9 |
|/ |
|
* | some anomolies found when viewing connections in various cases. | friendica | 2014-03-02 | 5 | -8/+78 |
* | disable the right_aside on choklet two-column layouts | friendica | 2014-03-02 | 2 | -0/+8 |
* | add choklet to the comanche docs | friendica | 2014-03-02 | 2 | -3/+41 |
* | add choklet template with several defined flavours, two and three column flui... | friendica | 2014-03-02 | 10 | -48/+248 |
* | first cut at choklet template | friendica | 2014-03-02 | 3 | -14/+105 |
* | Merge pull request #350 from git-marijus/master | friendica | 2014-03-03 | 5 | -97/+118 |
|\ |
|
| * | make navbar themable again | marijus | 2014-03-02 | 5 | -97/+118 |
| * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-03-02 | 12 | -300/+473 |
| |\
| |/
|/| |
|
* | | allow templates to have multiple styles - this would be a bit like having a s... | friendica | 2014-03-02 | 4 | -5/+16 |
* | | s/layout/template/g *.pdl | friendica | 2014-03-01 | 2 | -2/+2 |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-01 | 6 | -293/+369 |
|\ \ |
|
| * \ | Merge pull request #347 from solstag/master | friendica | 2014-03-02 | 2 | -288/+354 |
| |\ \ |
|
| | * | | Update pt-br translation. | Alexandre Hannud Abdo | 2014-03-01 | 2 | -288/+354 |
| * | | | Merge pull request #346 from git-marijus/master | friendica | 2014-03-02 | 4 | -5/+15 |
| |\ \ \ |
|
* | | | | | change the docs for template tag | friendica | 2014-03-01 | 2 | -7/+7 |
* | | | | | it's unfortunate that we use the term "layout" to refer both to a template fi... | friendica | 2014-03-01 | 1 | -0/+4 |
|/ / / / |
|
* | / / | first draft of creating templates documentation | friendica | 2014-03-01 | 3 | -1/+93 |
| |/ /
|/| | |
|
| | * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-03-01 | 1 | -1/+2 |
| |/|
| |/
|/| |
|
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-28 | 1 | -1/+1 |
|\ \ |
|
* | | | allow one to ignore pending connections | friendica | 2014-02-28 | 1 | -1/+2 |
| | * | Revert "a little fix against bootstrap 3.1.1" | marijus | 2014-02-28 | 2 | -5/+0 |
| | * | a little fix against bootstrap 3.1.1 | marijus | 2014-02-28 | 2 | -0/+5 |
| | * | add hover effect to usermenu caret | marijus | 2014-02-28 | 4 | -5/+15 |
| |/ |
|
| * | Merge pull request #345 from zzottel/master | zzottel | 2014-02-28 | 1 | -1/+1 |
|/| |
|
| * | correct bbcode link in German docs | zottel | 2014-02-28 | 1 | -1/+1 |
| * | trying to get back to upstream state | zottel | 2014-02-28 | 1 | -0/+96 |
| * | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-28 | 1 | -0/+2 |
| |\ |
|
| * \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-28 | 12 | -159/+132 |
| |\ \ |
|
| * | | | change page title for bbcode help files | zottel | 2014-02-27 | 1 | -1/+1 |
* | | | | It's no longer simply "Red" and the jury is still out on whether or not it's ... | friendica | 2014-02-28 | 1 | -1/+1 |
* | | | | more doc | friendica | 2014-02-28 | 9 | -0/+671 |
* | | | | dang - you really have to bludgeon this thing to get youtube to use https | friendica | 2014-02-28 | 1 | -1/+10 |
* | | | | try to fix youtube mixed content warnings | friendica | 2014-02-28 | 99 | -878/+1352 |
* | | | | more to-to | friendica | 2014-02-27 | 1 | -0/+2 |
| |_|/
|/| | |
|
* | | | more tasks | friendica | 2014-02-27 | 1 | -0/+2 |
| |/
|/| |
|
* | | over-ride code tags within pre blocks as bootstrap which puts a border around... | friendica | 2014-02-27 | 1 | -0/+4 |
* | | put schemas in Comanche (this requires theme support (!)) | friendica | 2014-02-27 | 6 | -62/+81 |
* | | minor fixes to suggested chatrooms | friendica | 2014-02-27 | 2 | -4/+2 |
* | | chatroom suggestions | friendica | 2014-02-27 | 3 | -0/+48 |
* | | fix photos in private mail | friendica | 2014-02-27 | 2 | -2/+2 |
* | | Capitalise $a->page['title'] in doco pages. | Thomas Willingham | 2014-02-27 | 1 | -3/+3 |
|/ |
|
* | Merge pull request #342 from zzottel/master | zzottel | 2014-02-27 | 5 | -0/+269 |
|\ |
|
| * | some new German files | zottel | 2014-02-27 | 3 | -59/+190 |
| * | convert existing German help files to BBCode | zottel | 2014-02-27 | 3 | -0/+138 |
* | | Merge pull request #343 from beardy-unixer/master | Thomas Willingham | 2014-02-27 | 4 | -15/+15 |
|\ \
| |/
|/| |
|
| * | Can't type today | Thomas Willingham | 2014-02-27 | 1 | -1/+1 |