aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-0528-59/+340
|\
| * add clock widget and correct some docofriendica2014-03-054-8/+68
| * move language selector to a modulefriendica2014-03-056-11/+10
| * add Comanche help link to pdleditfriendica2014-03-042-0/+8
| * add pdl editor to settings/displayfriendica2014-03-042-0/+5
| * basic widget referencefriendica2014-03-042-0/+70
| * Red API: /api/red/item/new ; which is like /api/statuses/update except it use...friendica2014-03-043-3/+51
| * stopgap solution until somebody implements endless scroll on the directoryfriendica2014-03-041-1/+1
| * spacing issue after template workfriendica2014-03-041-2/+2
| * add system PDL editor (lets you change/personalise the layout for any module ...friendica2014-03-042-0/+75
| * undofriendica2014-03-041-2/+2
| * Merge https://github.com/friendica/red into zpullfriendica2014-03-041-3/+3
| |\
| | * Make zid() work for observers as well as local usersThomas Willingham2014-03-041-3/+3
| * | fix third-party zid'sfriendica2014-03-042-0/+3
| |/
| * Merge https://github.com/friendica/red into zpullfriendica2014-03-042-1001/+1114
| |\
| * | change flags for one-way connections from hidden to unconnected so we can sti...friendica2014-03-045-33/+46
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-0423-1072/+1289
|\ \ \ | | |/ | |/|
| * | Merge pull request #354 from tuscanhobbit/masterPaolo T2014-03-042-1001/+1114
| |\ \ | | |/ | |/|
| | * IT: strings updatedPaolo Tacconi2014-03-042-1001/+1114
| * | minor template and doc fixesfriendica2014-03-043-0/+27
| * | !@#$% pay~!@#$palfriendica2014-03-042-19/+1
| * | directory sync issuesfriendica2014-03-035-14/+28
| * | layout export to filefriendica2014-03-033-3/+38
| * | enable network/matrix expiration, this should be functional but the options h...friendica2014-03-033-29/+32
| * | item widget - displays one (webpage) item by mid. This is how you could put m...friendica2014-03-031-0/+27
| * | remove test menufriendica2014-03-031-1/+0
| * | implement horizontal menu class in redbasicfriendica2014-03-033-1/+21
| * | Merge https://github.com/friendica/red into zpullfriendica2014-03-033-5/+15
| |\ \
| | * \ Merge pull request #353 from git-marijus/masterfriendica2014-03-043-5/+15
| | |\ \
| * | | | revert the temporary fix for the missing hdr.tpl and add the ability to provi...friendica2014-03-032-5/+2
| |/ / /
* | / / Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-032-1/+9
|\| | | | |/ / |/| |
| * | Merge https://github.com/friendica/red into zpullfriendica2014-03-031-0/+3
| |\ \
| * | | missing filefriendica2014-03-032-1/+9
* | | | var updatemarijus2014-03-031-1/+1
* | | | one got lost and a typomarijus2014-03-031-1/+3
* | | | little css fixesmarijus2014-03-032-3/+11
| |/ / |/| |
* | | Partially revert 895c9411d93Thomas Willingham2014-03-031-0/+3
|/ /
* | 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