aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #118 from tomtom84/mastertomtom842012-03-109-11/+52
|\ | | | | fixes in diabook-derivates
| * fixed login-fields, fixed. notofication.png, changed locationstommy tomson2012-03-109-11/+52
| |
* | German translationTobias Diekershoff2012-03-102-473/+810
| |
* | allow user to set number of items to show on network pageMichael Johnston2012-03-091-0/+1
| |
* | Merge pull request #116 from tomtom84/mastertomtom842012-03-095-0/+134
|\| | | | | fixes in diabook-derivates
| * add js to hide nav-menus, when clicked outsidetommy tomson2012-03-095-0/+134
| |
* | Merge pull request #115 from tomtom84/mastertomtom842012-03-096-86/+23
|\| | | | | fixes in diabook-derivates
| * fixes in csstommy tomson2012-03-096-86/+23
| |
* | Merge branch 'pull'friendica2012-03-097-5/+25
|\ \
| * | [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style ↵Simon L'nu2012-03-097-5/+25
| | | | | | | | | | | | | | | | | | label elemnts. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | bug #324 - tinymce used for mail even if editplain being used.friendica2012-03-091-48/+31
|/ /
* | i consider dispy pretty stable at this point, so i'm removing the ↵Simon L'nu2012-03-091-0/+0
| | | | | | | | | | | | experimental file Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0810-37/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: removed info add info fixed star-bug More improved transparency for smilies removed dolphin file (wtf?) . * master:
| * | Merge pull request #112 from tomtom84/mastertomtom842012-03-082-14/+0
| |\| | | | | | | fixes in diabook-derivates
| | * removed infotommy tomson2012-03-092-14/+0
| | |
| * | Merge pull request #111 from tomtom84/mastertomtom842012-03-082-0/+14
| |\| | | | | | | fixes in diabook-derivates
| | * add infotommy tomson2012-03-092-0/+14
| | |
| * | Merge pull request #110 from tomtom84/mastertomtom842012-03-0810-37/+19
| |\| | | | | | | fixes in diabook-derivates
| | * fixed star-bugtommy tomson2012-03-0910-37/+19
| | |
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0867-6/+10830
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme info file for testbubble catalan translation revup add theme diabook-blue, fix css * master:
| * | theme info file for testbubblefriendica2012-03-081-0/+9
| | |
| * | catalan translationfriendica2012-03-0815-0/+7854
| | |
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-03-0854-11/+3067
| |\|
| | * add theme diabook-blue, fix csstommy tomson2012-03-0851-6/+2967
| | |
* | | make svg from notifications.svg to ease future editing. more dispy tweaksSimon L'nu2012-03-086-10/+358
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | Merge pull request #107 from tomtom84/mastertomtom842012-03-085-6/+101
|\ \ \ | |/ / |/| / | |/ fixes in theme diabook
| * add links to /profiles, add some icons to diabook/icons, fixes in csstommy tomson2012-03-085-6/+101
| |
* | fix jot.tpl buttons. fix up subsequent styling breakageSimon L'nu2012-03-072-56/+75
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | push fix for funky menu action. the overflow-x might break again for some peopleSimon L'nu2012-03-073-44/+35
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Merge pull request #103 from tomtom84/mastertomtom842012-03-062-3/+8
|\| | | | | fixes in theme diabook
| * fix in navbartommy tomson2012-03-072-3/+8
| |
* | Merge pull request #101 from tomtom84/mastertomtom842012-03-061-0/+4
|\ \ | | | | | | fixes in theme diabook
| * | fix in navbartommy tomson2012-03-071-0/+4
| |/
* | Merge pull request #99 from tomtom84/masterSimon2012-03-064-21/+21
|\| | | | | fixes in theme diabook
| * messages-menu translation, add scroll-to-top and theme-bug-report in themetommy tomson2012-03-074-21/+21
| |
* | dispy, dispy, oh what a little lispySimon L'nu2012-03-061-19/+18
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | bugs #312, #313friendica2012-03-061-1/+1
|/
* styling fixes in dispy. fix typos in settings.tplSimon L'nu2012-03-062-38/+37
| | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* quattro: theme settings (a bit hackish)Fabio Comuni2012-03-062-0/+57
|
* Merge remote-tracking branch 'origin/master'tommy tomson2012-03-068-58/+66
|\
| * Merge branch 'pull'friendica2012-03-051-1/+2
| |\
| | * changed bg color around comment box from white to match page background, ↵Michael Johnston2012-03-051-1/+2
| | | | | | | | | | | | improved contrast on comment preview (darkzero)
| * | some admin page fixes and cleanupfriendica2012-03-053-3/+10
| |/
| * Merge branch 'pull'friendica2012-03-051-2/+2
| |\
| | * forgot a small change in .field_helpSimon L'nu2012-03-051-2/+2
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | some testbubble stufffriendica2012-03-053-31/+37
| |/
| * implement more of the changes requestedSimon L'nu2012-03-051-22/+16
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | fixes in diabooktommy tomson2012-03-066-4/+16
| |
* | fixestommy tomson2012-03-054-5/+26
|/
* multiple fixes; the jot-header works as standalone, not sure what's up.Simon L'nu2012-03-054-37/+49
| | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>