aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Tony Baldwin2014-03-0963-6934/+12051
|\
| * update cacert.pem , don't hide url link for rmagicfriendica2014-03-091-1/+1
| * collapse the advanced directory search so that folks who think they're advanc...friendica2014-03-081-1/+5
| * advanced search front-endfriendica2014-03-081-0/+4
| * style fixesmarijus2014-03-083-3/+19
| * showwarning when manually changing alsofriendica2014-03-071-0/+7
| * notify when permissions change and haven't been saved.friendica2014-03-074-1/+15
| * start new connections out with even more sane defaults than before by pre-fil...friendica2014-03-071-0/+3
| * When approving a connection automatically select Full Sharing.friendica2014-03-071-0/+6
| * fix of fixmarijus2014-03-071-1/+1
| * fixmarijus2014-03-071-2/+1
| * thats bettermarijus2014-03-071-1/+1
| * probably should indicate the appearence of aside visualy somehowmarijus2014-03-072-5/+10
| * might be needed by not local users aswellmarijus2014-03-071-2/+0
| * remove aside on navbar collapse and add button to toggle visibilitymarijus2014-03-076-35/+49
| * Merge https://github.com/friendica/red into zpullfriendica2014-03-052-8/+12
| |\
| | * improve navbar collapsed state a littlemarijus2014-03-052-8/+12
| * | add new templatefriendica2014-03-051-0/+18
| |/
| * move language selector to a modulefriendica2014-03-053-9/+3
| * add Comanche help link to pdleditfriendica2014-03-041-0/+7
| * add pdl editor to settings/displayfriendica2014-03-041-0/+4
| * add system PDL editor (lets you change/personalise the layout for any module ...friendica2014-03-041-0/+14
| * 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-042-0/+15
| * | layout export to filefriendica2014-03-032-0/+20
| * | remove test menufriendica2014-03-031-1/+0
| * | implement horizontal menu class in redbasicfriendica2014-03-032-0/+20
| * | Merge https://github.com/friendica/red into zpullfriendica2014-03-033-5/+15
| |\ \
| | * \ Merge pull request #353 from git-marijus/masterfriendica2014-03-043-5/+15
| | |\ \
| | | * | var updatemarijus2014-03-031-1/+1
| | | * | one got lost and a typomarijus2014-03-031-1/+3
| | | * | little css fixesmarijus2014-03-032-3/+11
| * | | | revert the temporary fix for the missing hdr.tpl and add the ability to provi...friendica2014-03-031-4/+1
| |/ / /
| * | | Merge https://github.com/friendica/red into zpullfriendica2014-03-031-0/+3
| |\| |
| | * | Partially revert 895c9411d93Thomas Willingham2014-03-031-0/+3
| * | | missing filefriendica2014-03-031-0/+8
| |/ /
| * | some anomolies found when viewing connections in various cases.friendica2014-03-021-0/+33
| * | disable the right_aside on choklet two-column layoutsfriendica2014-03-022-0/+8
| * | add choklet template with several defined flavours, two and three column flui...friendica2014-03-029-31/+226
| * | first cut at choklet templatefriendica2014-03-022-0/+72
| * | make navbar themable againmarijus2014-03-025-97/+118
| * | allow templates to have multiple styles - this would be a bit like having a s...friendica2014-03-021-1/+2
| * | s/layout/template/g *.pdlfriendica2014-03-012-2/+2
| * | Merge pull request #347 from solstag/masterfriendica2014-03-022-288/+354
| |\ \
| | * | Update pt-br translation.Alexandre Hannud Abdo2014-03-012-288/+354
| * | | 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
| |/ /
| * | over-ride code tags within pre blocks as bootstrap which puts a border around...friendica2014-02-271-0/+4