aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-03-1513-37/+255
|\
| * add links to wall, photos, events, etc to aside on networkpage, fixes in csstommy tomson2012-03-155-12/+38
| * fix in navtommy tomson2012-03-141-4/+0
| * add links to home, profile, photos, events, notes to aside in network-streamtommy tomson2012-03-143-3/+93
| * Merge pull request #127 from tomtom84/mastertomtom842012-03-1222-745/+1
| |\
| | * use fancybox instead of lightboxtommy tomson2012-03-1322-745/+1
| * | Merge pull request #126 from tomtom84/mastertomtom842012-03-122-1/+35
| |\|
| | * fixestommy tomson2012-03-122-1/+35
| * | Merge pull request #125 from tomtom84/mastertomtom842012-03-1229-22/+838
| |\|
| | * add lightbox, fixex in csstommy tomson2012-03-1229-22/+838
* | | Removed changesMichael Vogel2012-03-112-19/+11
* | | Merge commit 'upstream/master'Michael Vogel2012-03-118-43/+105
|\| |
| * | Merge pull request #118 from tomtom84/mastertomtom842012-03-105-6/+20
| |\|
| | * fixed login-fields, fixed. notofication.png, changed locationstommy tomson2012-03-105-6/+20
| * | Merge pull request #116 from tomtom84/mastertomtom842012-03-093-0/+68
| |\|
| | * add js to hide nav-menus, when clicked outsidetommy tomson2012-03-093-0/+68
| * | Merge pull request #115 from tomtom84/mastertomtom842012-03-093-43/+11
| |\|
| | * fixes in csstommy tomson2012-03-093-43/+11
* | | Pages: Show every community page - even from foreign servers (with caching)Michael Vogel2012-03-111-0/+3
* | | Enabled Caching for items. Changed color of tags in diabook.Michael Vogel2012-03-101-2/+2
* | | diabook: Moving the location between the iconsMichael Vogel2012-03-103-5/+7
|/ /
* | Merge pull request #112 from tomtom84/mastertomtom842012-03-081-6/+0
|\|
| * removed infotommy tomson2012-03-091-6/+0
* | Merge pull request #111 from tomtom84/mastertomtom842012-03-081-0/+6
|\|
| * add infotommy tomson2012-03-091-0/+6
* | Merge pull request #110 from tomtom84/mastertomtom842012-03-085-19/+10
|\|
| * fixed star-bugtommy tomson2012-03-095-19/+10
* | Merge https://github.com/friendica/friendica into pullfriendica2012-03-086-11/+159
|\|
| * add theme diabook-blue, fix csstommy tomson2012-03-083-6/+59
| * add links to /profiles, add some icons to diabook/icons, fixes in csstommy tomson2012-03-085-6/+101
* | Merge pull request #103 from tomtom84/mastertomtom842012-03-062-3/+8
|\|
| * fix in navbartommy tomson2012-03-072-3/+8
* | fix in navbartommy tomson2012-03-071-0/+4
|/
* messages-menu translation, add scroll-to-top and theme-bug-report in themetommy tomson2012-03-074-21/+21
* fixes in diabooktommy tomson2012-03-066-4/+16
* fixestommy tomson2012-03-054-5/+26
* like dislike buttontommy tomson2012-03-052-0/+0
* fixes in diabooktommy tomson2012-03-053-21/+25
* style.css fixtommy tomson2012-03-041-10/+9
* some fixes in diabooktommy tomson2012-03-045-15/+137
* tag fixtommy tomson2012-03-041-1/+2
* fixtommy tomson2012-03-031-2/+2
* navbar fixtommy tomson2012-03-035-6/+18
* fixed apps csstommy tomson2012-03-032-1/+8
* fixed star/unstartommy tomson2012-03-035-10/+17
* fixed admintommy tomson2012-03-0311-2/+2
* fix editortommy tomson2012-03-032-14/+34
* fix text-editor in themetommy tomson2012-03-0310-7/+204
* small fix in style.csstommy tomson2012-03-031-1/+5
* fix star/unstartommy tomson2012-03-032-0/+0