Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #172 from fabrixxm/master | friendica | 2012-03-26 | 1 | -1/+1 |
|\ | | | | | Rearrange theme tpls | ||||
| * | diabook: small fix in theme_info array | Fabio Comuni | 2012-03-26 | 1 | -1/+1 |
| | | |||||
* | | small fix in diabook :: add local friendica to right_aside | tommy tomson | 2012-03-26 | 3 | -1/+2 |
| | | |||||
* | | add screenshots to diabook | tommy tomson | 2012-03-26 | 3 | -3/+8 |
|/ | |||||
* | small fix | tommy tomson | 2012-03-26 | 2 | -7/+2 |
| | |||||
* | screenshot gallery | friendica | 2012-03-25 | 1 | -0/+0 |
| | |||||
* | small fixes | tommy tomson | 2012-03-25 | 1 | -4/+12 |
| | |||||
* | move community_pages to right_aside, fixes in css | tommy tomson | 2012-03-25 | 5 | -14/+70 |
| | |||||
* | small fix in css | tommy tomson | 2012-03-24 | 2 | -2/+2 |
| | |||||
* | add connectable services to right_aside | tommy tomson | 2012-03-24 | 10 | -3/+19 |
| | |||||
* | add PostIt to right_aside, fixes in css | tommy tomson | 2012-03-24 | 10 | -17/+180 |
| | |||||
* | diabook: theme.php | Fabio Comuni | 2012-03-23 | 2 | -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_aside | tommy tomson | 2012-03-23 | 5 | -34/+4953 |
| | |||||
* | small fix | tommy tomson | 2012-03-23 | 1 | -1/+1 |
| | |||||
* | fix 1024resolution | tommy tomson | 2012-03-23 | 2 | -14/+15 |
| | |||||
* | add right_aside to theme diabook | tommy tomson | 2012-03-23 | 5 | -10/+327 |
| | |||||
* | add file_as-option to diabook-derivates | tommy tomson | 2012-03-22 | 3 | -0/+5 |
| | |||||
* | add icons to aside diabook, fixes in css | tommy tomson | 2012-03-22 | 10 | -25/+57 |
| | |||||
* | added icons to profile_side, fixes in css | tommy tomson | 2012-03-16 | 3 | -17/+8 |
| | |||||
* | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 13 | -37/+255 |
|\ | |||||
| * | add links to wall, photos, events, etc to aside on networkpage, fixes in css | tommy tomson | 2012-03-15 | 5 | -12/+38 |
| | | |||||
| * | fix in nav | tommy tomson | 2012-03-14 | 1 | -4/+0 |
| | | |||||
| * | add links to home, profile, photos, events, notes to aside in network-stream | tommy tomson | 2012-03-14 | 3 | -3/+93 |
| | | |||||
| * | Merge pull request #127 from tomtom84/master | tomtom84 | 2012-03-12 | 22 | -745/+1 |
| |\ | | | | | | | fixes in diabook-derivates | ||||
| | * | use fancybox instead of lightbox | tommy tomson | 2012-03-13 | 22 | -745/+1 |
| | | | |||||
| * | | Merge pull request #126 from tomtom84/master | tomtom84 | 2012-03-12 | 2 | -1/+35 |
| |\| | | | | | | | fixes in diabook-derivates | ||||
| | * | fixes | tommy tomson | 2012-03-12 | 2 | -1/+35 |
| | | | |||||
| * | | Merge pull request #125 from tomtom84/master | tomtom84 | 2012-03-12 | 29 | -22/+838 |
| |\| | | | | | | | fixes in diabook-derivates | ||||
| | * | add lightbox, fixex in css | tommy tomson | 2012-03-12 | 29 | -22/+838 |
| | | | |||||
* | | | Removed changes | Michael Vogel | 2012-03-11 | 2 | -19/+11 |
| | | | |||||
* | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 8 | -43/+105 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl | ||||
| * | | Merge pull request #118 from tomtom84/master | tomtom84 | 2012-03-10 | 5 | -6/+20 |
| |\| | | | | | | | fixes in diabook-derivates | ||||
| | * | fixed login-fields, fixed. notofication.png, changed locations | tommy tomson | 2012-03-10 | 5 | -6/+20 |
| | | | |||||
| * | | Merge pull request #116 from tomtom84/master | tomtom84 | 2012-03-09 | 3 | -0/+68 |
| |\| | | | | | | | fixes in diabook-derivates | ||||
| | * | add js to hide nav-menus, when clicked outside | tommy tomson | 2012-03-09 | 3 | -0/+68 |
| | | | |||||
| * | | Merge pull request #115 from tomtom84/master | tomtom84 | 2012-03-09 | 3 | -43/+11 |
| |\| | | | | | | | fixes in diabook-derivates | ||||
| | * | fixes in css | tommy tomson | 2012-03-09 | 3 | -43/+11 |
| | | | |||||
* | | | Pages: Show every community page - even from foreign servers (with caching) | Michael Vogel | 2012-03-11 | 1 | -0/+3 |
| | | | |||||
* | | | Enabled Caching for items. Changed color of tags in diabook. | Michael Vogel | 2012-03-10 | 1 | -2/+2 |
| | | | |||||
* | | | diabook: Moving the location between the icons | Michael Vogel | 2012-03-10 | 3 | -5/+7 |
|/ / | |||||
* | | Merge pull request #112 from tomtom84/master | tomtom84 | 2012-03-08 | 1 | -6/+0 |
|\| | | | | | fixes in diabook-derivates | ||||
| * | removed info | tommy tomson | 2012-03-09 | 1 | -6/+0 |
| | | |||||
* | | Merge pull request #111 from tomtom84/master | tomtom84 | 2012-03-08 | 1 | -0/+6 |
|\| | | | | | fixes in diabook-derivates | ||||
| * | add info | tommy tomson | 2012-03-09 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #110 from tomtom84/master | tomtom84 | 2012-03-08 | 5 | -19/+10 |
|\| | | | | | fixes in diabook-derivates | ||||
| * | fixed star-bug | tommy tomson | 2012-03-09 | 5 | -19/+10 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-08 | 6 | -11/+159 |
|\| | |||||
| * | add theme diabook-blue, fix css | tommy tomson | 2012-03-08 | 3 | -6/+59 |
| | | |||||
| * | add links to /profiles, add some icons to diabook/icons, fixes in css | tommy tomson | 2012-03-08 | 5 | -6/+101 |
| | | |||||
* | | Merge pull request #103 from tomtom84/master | tomtom84 | 2012-03-06 | 2 | -3/+8 |
|\| | | | | | fixes in theme diabook |