aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | revert the temporary fix for the missing hdr.tpl and add the ability to provi...friendica2014-03-032-5/+2
|/ / /
* | | Merge https://github.com/friendica/red into zpullfriendica2014-03-031-0/+3
|\| |
| * | Partially revert 895c9411d93Thomas Willingham2014-03-031-0/+3
* | | missing filefriendica2014-03-032-1/+9
|/ /
* | some anomolies found when viewing connections in various cases.friendica2014-03-025-8/+78
* | disable the right_aside on choklet two-column layoutsfriendica2014-03-022-0/+8
* | add choklet to the comanche docsfriendica2014-03-022-3/+41
* | add choklet template with several defined flavours, two and three column flui...friendica2014-03-0210-48/+248
* | first cut at choklet templatefriendica2014-03-023-14/+105
* | Merge pull request #350 from git-marijus/masterfriendica2014-03-035-97/+118
|\ \
| * | make navbar themable againmarijus2014-03-025-97/+118
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-0212-300/+473
| |\ \ | |/ / |/| |
* | | allow templates to have multiple styles - this would be a bit like having a s...friendica2014-03-024-5/+16
* | | s/layout/template/g *.pdlfriendica2014-03-012-2/+2
* | | Merge https://github.com/friendica/red into zpullfriendica2014-03-016-293/+369
|\ \ \
| * \ \ Merge pull request #347 from solstag/masterfriendica2014-03-022-288/+354
| |\ \ \
| | * | | Update pt-br translation.Alexandre Hannud Abdo2014-03-012-288/+354
| * | | | Merge pull request #346 from git-marijus/masterfriendica2014-03-024-5/+15
| |\ \ \ \
* | | | | | change the docs for template tagfriendica2014-03-012-7/+7
* | | | | | it's unfortunate that we use the term "layout" to refer both to a template fi...friendica2014-03-011-0/+4
|/ / / / /
* | / / / first draft of creating templates documentationfriendica2014-03-013-1/+93
| |/ / / |/| | |
| | * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-011-1/+2
| |/| | | |/ / |/| |
* | | Merge https://github.com/friendica/red into zpullfriendica2014-02-281-1/+1
|\ \ \
* | | | allow one to ignore pending connectionsfriendica2014-02-281-1/+2
| | * | Revert "a little fix against bootstrap 3.1.1"marijus2014-02-282-5/+0
| | * | a little fix against bootstrap 3.1.1marijus2014-02-282-0/+5
| | * | add hover effect to usermenu caretmarijus2014-02-284-5/+15
| |/ /
| * | Merge pull request #345 from zzottel/masterzzottel2014-02-281-1/+1
|/| |
| * | correct bbcode link in German docszottel2014-02-281-1/+1
| * | trying to get back to upstream statezottel2014-02-281-0/+96
| * | Merge remote-tracking branch 'upstream/master'zottel2014-02-281-0/+2
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-2812-159/+132
| |\ \ \
| * | | | change page title for bbcode help fileszottel2014-02-271-1/+1
* | | | | It's no longer simply "Red" and the jury is still out on whether or not it's ...friendica2014-02-281-1/+1
* | | | | more docfriendica2014-02-289-0/+671
* | | | | dang - you really have to bludgeon this thing to get youtube to use httpsfriendica2014-02-281-1/+10
* | | | | try to fix youtube mixed content warningsfriendica2014-02-2899-878/+1352
* | | | | more to-tofriendica2014-02-271-0/+2
| |_|/ / |/| | |
* | | | more tasksfriendica2014-02-271-0/+2
| |/ / |/| |
* | | over-ride code tags within pre blocks as bootstrap which puts a border around...friendica2014-02-271-0/+4
* | | put schemas in Comanche (this requires theme support (!))friendica2014-02-276-62/+81
* | | minor fixes to suggested chatroomsfriendica2014-02-272-4/+2
* | | chatroom suggestionsfriendica2014-02-273-0/+48
* | | fix photos in private mailfriendica2014-02-272-2/+2
* | | Capitalise $a->page['title'] in doco pages.Thomas Willingham2014-02-271-3/+3
|/ /
* | Merge pull request #342 from zzottel/masterzzottel2014-02-275-0/+269
|\ \
| * | some new German fileszottel2014-02-273-59/+190
| * | convert existing German help files to BBCodezottel2014-02-273-0/+138
* | | Merge pull request #343 from beardy-unixer/masterThomas Willingham2014-02-274-15/+15
|\ \ \ | |/ / |/| |
| * | Can't type todayThomas Willingham2014-02-271-1/+1