aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-0712-47/+392
|\
| * changelog 1.014 :tommy tomson2012-04-0710-38/+366
| * new-contacts-introductions in contacts-drop-down and new-messages in messages...tommy tomson2012-04-0643-13/+30
| * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-0571-136/+8733
| |\
* | \ Merge commit 'upstream/master'Michael Vogel2012-04-067-42/+115
|\ \ \ | | |/ | |/|
| * | make right_aside translatable and provide german translation...tommy tomson2012-04-037-42/+115
* | | Merge commit 'upstream/master'Michael Vogel2012-04-0215-69/+379
|\| |
| * | diabook-themes: css-fixestommy tomson2012-04-026-5/+31
| * | diabook-themes: fixes in jstommy tomson2012-04-021-1/+1
| * | diabook-themes: fixed pageheadertommy tomson2012-04-025-43/+50
| * | diabook-themes: bugfixes / css-fixestommy tomson2012-04-025-5/+12
| * | diabook-themes: add link to global dir in "find friends" at right_asidetommy tomson2012-04-023-3/+5
| * | css-fixestommy tomson2012-04-021-0/+1
| * | add new messages-layout in diabooktommy tomson2012-04-016-4/+171
| * | fix the display of community-plugin in diabook-themestommy tomson2012-04-014-9/+109
* | | The "vier"-theme is now working again. But there is still work neededMichael Vogel2012-04-024-4/+4
|/ /
* | various bugfixes and css-fixestommy tomson2012-04-014-12/+20
* | diabook-themes: move "common tabs" to left side on settings pagetommy tomson2012-03-313-11/+8
* | move the common tabs to right_aside in diabook-derivatestommy tomson2012-03-313-0/+2575
* | bug-fixes in diabook-derivatestommy tomson2012-03-313-6/+8
* | add themes diabook-red & diabook-aerithtommy tomson2012-03-302-2/+3
* | css fixes in diabook-derivatestommy tomson2012-03-296-11/+28
* | add a searchbox to "find friends" for global searchtommy tomson2012-03-288-9/+70
* | bugfix in diabooktommy tomson2012-03-281-2/+3
* | small fix in diabooktommy tomson2012-03-273-3/+3
* | fixes in diabooktommy tomson2012-03-276-13/+49
* | provide a close-option for boxes in right_aside and store info via js and coo...tommy tomson2012-03-279-27/+198
* | add "find friends" to right_aside to diabook, fixes in css in diabooktommy tomson2012-03-276-0/+24
* | minor css fixes in diabooktommy tomson2012-03-264-16/+13
* | Merge pull request #172 from fabrixxm/masterfriendica2012-03-261-1/+1
|\ \
| * | 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
* | 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