aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-2613-36/+29
|\
| * minor css fixes in diabooktommy tomson2012-03-2612-36/+29
| * screenshot for darkzero-NS, same as darkzerofriendica2012-03-261-0/+0
* | marking quattro-green as extension of quattro and deleting the tpl filesTobias Diekershoff2012-03-2614-667/+11
|/
* added quaddro templates to quaddro-greenTobias Diekershoff2012-03-2613-0/+667
* Merge pull request #172 from fabrixxm/masterfriendica2012-03-2634-902/+902
|\
| * diabook: small fix in theme_info arrayFabio Comuni2012-03-261-1/+1
| * themes: use duepuntozero tpls as defaultFabio Comuni2012-03-2633-901/+901
* | small fix in diabook :: add local friendica to right_asidetommy tomson2012-03-264-1/+3
* | Merge branch 'pull'friendica2012-03-2612-22/+37
|\ \
| * | [fix] contact_edit.tpl syntax; reduce cols to fit betterSimon L'nu2012-03-261-1/+1
| * | add screenshots to diabooktommy tomson2012-03-264-3/+8
| |/
| * fix the search boxSimon L'nu2012-03-264-8/+22
| * small fixtommy tomson2012-03-264-11/+7
* | comix screenshotfriendica2012-03-261-0/+0
* | more theme screenshotsfriendica2012-03-267-0/+0
|/
* position the theme-preview on settings pagefriendica2012-03-251-0/+4
* screenshot galleryfriendica2012-03-2512-0/+0
* Merge branch 'pull'friendica2012-03-256-14/+44
|\
| * add in the search boxSimon L'nu2012-03-256-13/+43
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-252-0/+4
| |\
| * | minor fix to dispy theme.phpSimon L'nu2012-03-251-1/+1
* | | theme preview for end usersfriendica2012-03-252-1/+10
| |/ |/|
* | Merge branch 'pull'friendica2012-03-253-9/+17
|\|
| * urgent fix to dispy-dark theme.phpSimon L'nu2012-03-251-1/+1
| * small fixestommy tomson2012-03-252-8/+16
* | theme screenshotsfriendica2012-03-252-0/+4
|/
* dispy-dark not experimental. start implementing fpostitSimon L'nu2012-03-2519-16/+452
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2510-29/+135
|\
| * move community_pages to right_aside, fixes in csstommy tomson2012-03-2510-29/+135
* | increase version to 1.0 for dispys \o/Simon L'nu2012-03-252-2/+3
|/
* implement filer/file-asSimon L'nu2012-03-258-38/+105
* small fix in csstommy tomson2012-03-244-4/+4
* add right_aside to diabook-bluetommy tomson2012-03-2420-94/+5443
* add connectable services to right_asidetommy tomson2012-03-2410-3/+19
* add PostIt to right_aside, fixes in csstommy tomson2012-03-2410-17/+180
* diabook: theme.phpFabio Comuni2012-03-232-219/+62
* user settings: don't show emoticonsFabio Comuni2012-03-231-1/+1
* fix in css right_asidetommy tomson2012-03-235-34/+4953
* small fixtommy tomson2012-03-231-1/+1
* fix 1024resolutiontommy tomson2012-03-232-14/+15
* add right_aside to theme diabooktommy tomson2012-03-236-11/+329
* quattro(-green) styling the 'filed under: remove' textTobias Diekershoff2012-03-224-7/+52
* it's only item.filer ;-)Tobias Diekershoff2012-03-222-2/+2
* Merge branch 'quattrofiler'Tobias Diekershoff2012-03-222-0/+6
|\
| * non static filer textTobias Diekershoff2012-03-222-2/+2
| * adding filer functionality to quattro(-green)Tobias Diekershoff2012-03-222-0/+6
* | missing tooltip for "file as"friendica2012-03-226-6/+6
|/
* add file_as-option to diabook-derivatestommy tomson2012-03-226-0/+10
* add icons to aside diabook, fixes in csstommy tomson2012-03-2214-46/+65