aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #172 from fabrixxm/masterfriendica2012-03-261-1/+1
|\ | | | | Rearrange theme tpls
| * diabook: small fix in theme_info arrayFabio Comuni2012-03-261-1/+1
| |
* | small fix in diabook :: add local friendica to right_asidetommy tomson2012-03-263-1/+2
| |
* | add screenshots to diabooktommy tomson2012-03-263-3/+8
|/
* small fixtommy tomson2012-03-262-7/+2
|
* screenshot galleryfriendica2012-03-251-0/+0
|
* small fixestommy tomson2012-03-251-4/+12
|
* move community_pages to right_aside, fixes in csstommy tomson2012-03-255-14/+70
|
* small fix in csstommy tomson2012-03-242-2/+2
|
* 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
| | | | | | | remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
* 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-235-10/+327
|
* add file_as-option to diabook-derivatestommy tomson2012-03-223-0/+5
|
* add icons to aside diabook, fixes in csstommy tomson2012-03-2210-25/+57
|
* added icons to profile_side, fixes in csstommy tomson2012-03-163-17/+8
|
* 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
| |\ | | | | | | fixes in diabook-derivates
| | * use fancybox instead of lightboxtommy tomson2012-03-1322-745/+1
| | |
| * | Merge pull request #126 from tomtom84/mastertomtom842012-03-122-1/+35
| |\| | | | | | | fixes in diabook-derivates
| | * fixestommy tomson2012-03-122-1/+35
| | |
| * | Merge pull request #125 from tomtom84/mastertomtom842012-03-1229-22/+838
| |\| | | | | | | fixes in diabook-derivates
| | * 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
|\| | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl
| * | Merge pull request #118 from tomtom84/mastertomtom842012-03-105-6/+20
| |\| | | | | | | fixes in diabook-derivates
| | * fixed login-fields, fixed. notofication.png, changed locationstommy tomson2012-03-105-6/+20
| | |
| * | Merge pull request #116 from tomtom84/mastertomtom842012-03-093-0/+68
| |\| | | | | | | fixes in diabook-derivates
| | * 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 diabook-derivates
| | * 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
|\| | | | | fixes in diabook-derivates
| * removed infotommy tomson2012-03-091-6/+0
| |
* | Merge pull request #111 from tomtom84/mastertomtom842012-03-081-0/+6
|\| | | | | fixes in diabook-derivates
| * add infotommy tomson2012-03-091-0/+6
| |
* | Merge pull request #110 from tomtom84/mastertomtom842012-03-085-19/+10
|\| | | | | fixes in diabook-derivates
| * 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
|\| | | | | fixes in theme diabook