aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-05890-5398/+45119
|\ | | | | | | | | | | Conflicts: include/config.php update.php
| * finish styling category tags and category inputSimon L'nu2012-04-052-0/+20
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * style categorytagsSimon L'nu2012-04-042-4/+4
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * update the dispy* templatesSimon L'nu2012-04-0419-131/+188
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * move alert box away from nav linksfriendica2012-04-041-1/+4
| |
| * latest changes are the popup menu for notifs, fixesSimon L'nu2012-04-042-20/+38
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'pull'friendica2012-04-0324-120/+313
| |\
| | * smal fixtommy tomson2012-04-031-1/+1
| | |
| | * german translation for right_asidetommy tomson2012-04-031-0/+8
| | |
| | * make right_aside translatable and provide german translation...tommy tomson2012-04-0323-119/+304
| | | | | | | | | | | | and some css-fixes
| * | remove loozah themes which fell too far behind to recoverfriendica2012-04-0339-3762/+0
| |/
| * diabook-themes: css-fixestommy tomson2012-04-0224-20/+125
| |
| * diabook-themes: fixes in jstommy tomson2012-04-024-112/+115
| |
| * diabook-themes: fixed pageheadertommy tomson2012-04-0217-68/+98
| |
| * diabook-themes: bugfixes / css-fixestommy tomson2012-04-0217-17/+30
| |
| * allow users to set categories on their postsMichael Johnston2012-04-014-11/+33
| |
| * diabook-themes: add link to global dir in "find friends" at right_asidetommy tomson2012-04-0212-12/+20
| |
| * css-fixestommy tomson2012-04-027-12/+13
| |
| * add new messages-layout in diabooktommy tomson2012-04-0125-8/+683
| |
| * fix the display of community-plugin in diabook-themestommy tomson2012-04-0116-222/+435
| |
| * various bugfixes and css-fixestommy tomson2012-04-0111-46/+69
| |
| * qcomment overflowfriendica2012-04-011-0/+8
| |
| * Merge branch 'pull'friendica2012-04-015-11/+31
| |\
| | * latest fixes for dispys. tweaking/repairingSimon L'nu2012-04-015-11/+31
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | send unverified private mail using zrlfriendica2012-04-015-0/+131
| |/
| * diabook-themes: move "common tabs" to left side on settings pagetommy tomson2012-03-3112-47/+31
| |
| * move the common tabs to right_aside in diabook-derivatestommy tomson2012-03-3112-0/+10514
| |
| * Merge branch 'pull'friendica2012-03-3125-116/+355
| |\
| | * bug fix in diabook-aerith and -redtommy tomson2012-03-316-22/+22
| | |
| | * bug-fixes in diabook-derivatestommy tomson2012-03-3117-40/+249
| | |
| | * forgot the css changes for last pushSimon L'nu2012-03-312-14/+2
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * theme fixes; fix qcomment (finally)Simon L'nu2012-03-314-44/+86
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | settings for unknown private mail acceptancefriendica2012-03-311-0/+4
| |/
| * quattro: move quattro-green inside quattro folder.Fabio Comuni2012-03-3016-72/+87
| | | | | | | | Add config option to select quattro color scheme.
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-306-14/+36
| |\
| | * css-fixes in diabook-derivatestommy tomson2012-03-306-14/+36
| | |
| * | quattro-green: remove settings codeFabio Comuni2012-03-301-29/+0
| | | | | | | | | | | | Use config.php from quattro
| * | quattro: add config.phpFabio Comuni2012-03-303-35/+35
| | |
| * | settings: add "display settings" tab, with UI-related settings.Fabio Comuni2012-03-302-4/+24
| |/ | | | | | | | | Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property.
| * css-fixes in diabook-derivatestommy tomson2012-03-308-32/+29
| |
| * css-fixes in diabook-derivatestommy tomson2012-03-306-9/+19
| |
| * quattro-green: added Description to the theme.phpTobias Diekershoff2012-03-301-0/+1
| |
| * quattro-green: adopted quattro option for centered displayTobias Diekershoff2012-03-302-1/+56
| |
| * add themes diabook-red & diabook-aerithtommy tomson2012-03-30170-6/+18107
| |
| * quattro-greey: apply theming to private mailTobias Diekershoff2012-03-302-29/+128
| |
| * tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵Simon L'nu2012-03-296-58/+44
| | | | | | | | | | | | b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * theme file_as combobox for 2.0friendica2012-03-292-1/+8
| |
| * css fixes in diabook-derivatestommy tomson2012-03-2916-23/+136
| |
| * Merge pull request #185 from fabrixxm/masterfabrixxm2012-03-2812-70/+439
| |\ | | | | | | Updated private message pages
| | * quattro: style pm pagesFabio Comuni2012-03-288-64/+405
| | |