aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-1469-689/+7698
|\ | | | | | | | | Conflicts: view/de/strings.php
| * add links to home, profile, photos, events, notes to aside in network-streamtommy tomson2012-03-146-3/+189
| |
| * fix csstommy tomson2012-03-131-1/+1
| |
| * Merge pull request #127 from tomtom84/mastertomtom842012-03-1244-1490/+2
| |\ | | | | | | fixes in diabook-derivates
| | * use fancybox instead of lightboxtommy tomson2012-03-1344-1490/+2
| | |
| * | Merge pull request #126 from tomtom84/mastertomtom842012-03-126-4/+72
| |\| | | | | | | fixes in diabook-derivates
| | * fixestommy tomson2012-03-126-4/+72
| | |
| * | Merge pull request #125 from tomtom84/mastertomtom842012-03-1259-45/+1667
| |\| | | | | | | fixes in diabook-derivates
| | * add lightbox, fixex in csstommy tomson2012-03-1259-45/+1667
| | |
| * | fix dispy-dark photo album stuffSimon L'nu2012-03-111-17/+18
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | fix dispys' css and layoutSimon L'nu2012-03-117-130/+147
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | screwed up on the font-size for screen last pushSimon L'nu2012-03-111-1/+1
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | add some '@media handheld' types for dispysSimon L'nu2012-03-112-1/+14
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | fix more stuffSimon L'nu2012-03-111-5/+9
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | fix some stuff right awaySimon L'nu2012-03-111-2/+7
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!Simon L'nu2012-03-1133-13/+6144
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | bug #327 - composed private message is lost if no recip specified.friendica2012-03-101-1/+1
| | |
| * | 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 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0988-190/+11452
|\| |
| * | 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 branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0721-133/+238
|\| |
| * | Merge pull request #103 from tomtom84/mastertomtom842012-03-062-3/+8
| |\| | | | | | | fixes in theme diabook
| | * fix in navbartommy tomson2012-03-072-3/+8
| | |