Commit graph

127 commits

Author SHA1 Message Date
friendica
63fa5f6c77 Merge pull request from fabrixxm/master
Rearrange theme tpls
2012-03-26 02:00:14 -07:00
tommy tomson
876aa0c752 small fix in diabook :: add local friendica to right_aside 2012-03-26 10:33:28 +02:00
Fabio Comuni
579c4f3079 diabook: small fix in theme_info array 2012-03-26 09:48:38 +02:00
tommy tomson
c4c69959e2 add screenshots to diabook 2012-03-26 09:37:14 +02:00
tommy tomson
37f02424f8 small fix 2012-03-26 07:02:27 +02:00
friendica
a06185e87c screenshot gallery 2012-03-25 20:08:28 -07:00
tommy tomson
baeb735315 small fixes 2012-03-25 19:43:42 +02:00
tommy tomson
329a26d62e move community_pages to right_aside, fixes in css 2012-03-25 08:47:17 +02:00
tommy tomson
8451b22d42 small fix in css 2012-03-24 08:56:26 +01:00
tommy tomson
378762fed2 add connectable services to right_aside 2012-03-24 06:17:14 +01:00
tommy tomson
d76b052f90 add PostIt to right_aside, fixes in css 2012-03-24 04:05:21 +01:00
Fabio Comuni
1780fff161 diabook: theme.php
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)
2012-03-23 14:09:06 +01:00
tommy tomson
c35b9ec24f fix in css right_aside 2012-03-23 10:16:11 +01:00
tommy tomson
7706a8f9d8 small fix 2012-03-23 07:28:48 +01:00
tommy tomson
687fa80094 fix 1024resolution 2012-03-23 07:02:21 +01:00
tommy tomson
bf4dd8ad17 add right_aside to theme diabook 2012-03-23 02:36:34 +01:00
tommy tomson
e37c4f69b4 add file_as-option to diabook-derivates 2012-03-22 06:54:18 +01:00
tommy tomson
72d0756fa6 add icons to aside diabook, fixes in css 2012-03-22 04:33:21 +01:00
tommy tomson
02395c8af5 added icons to profile_side, fixes in css 2012-03-16 03:49:43 +01:00
Michael Vogel
9243c9fc14 Merge commit 'upstream/master' 2012-03-15 21:11:58 +01:00
tommy tomson
6dbee45d92 add links to wall, photos, events, etc to aside on networkpage, fixes in css 2012-03-15 08:29:39 +01:00
tommy tomson
f03c57007a fix in nav 2012-03-14 12:56:59 +01:00
tommy tomson
42462cc1f0 add links to home, profile, photos, events, notes to aside in network-stream 2012-03-14 12:50:11 +01:00
tomtom84
ecc9f4ba70 Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-12 16:06:15 -07:00
tommy tomson
27bc8052d0 use fancybox instead of lightbox 2012-03-13 00:04:19 +01:00
tomtom84
8a85914e1d Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-12 15:33:29 -07:00
tommy tomson
caffb217c1 fixes 2012-03-12 23:31:54 +01:00
tomtom84
a1305433b8 Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-12 13:11:19 -07:00
tommy tomson
9436175746 add lightbox, fixex in css 2012-03-12 21:09:16 +01:00
Michael Vogel
7235d5466a Removed changes 2012-03-11 20:24:55 +01:00
Michael Vogel
d653e27e2d Merge commit 'upstream/master'
Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel
b879a1ddf1 Pages: Show every community page - even from foreign servers (with caching) 2012-03-11 17:45:12 +01:00
Michael Vogel
74b3e9f273 Enabled Caching for items. Changed color of tags in diabook. 2012-03-10 15:50:35 +01:00
tomtom84
c79cb57e1e Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-10 04:24:49 -08:00
tommy tomson
0f3255467e fixed login-fields, fixed. notofication.png, changed locations 2012-03-10 13:22:41 +01:00
Michael Vogel
cb1ecf2c5a diabook: Moving the location between the icons 2012-03-10 00:15:27 +01:00
tomtom84
68ca29719e Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-09 09:17:01 -08:00
tommy tomson
8fe4645a5d add js to hide nav-menus, when clicked outside 2012-03-09 18:15:27 +01:00
tomtom84
68541b5dd2 Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-09 04:24:59 -08:00
tommy tomson
9f441731af fixes in css 2012-03-09 13:23:38 +01:00
tomtom84
e25fb2b2f9 Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-08 19:39:39 -08:00
tommy tomson
e06b941307 removed info 2012-03-09 04:38:20 +01:00
tomtom84
92ab98f8d8 Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-08 19:16:01 -08:00
tommy tomson
722f631d15 add info 2012-03-09 04:14:24 +01:00
tomtom84
05561bd905 Merge pull request from tomtom84/master
fixes in diabook-derivates
2012-03-08 18:02:25 -08:00
tommy tomson
feda3cfc96 fixed star-bug 2012-03-09 02:59:13 +01:00
friendica
3b47626c15 Merge https://github.com/friendica/friendica into pull 2012-03-08 14:35:47 -08:00
tommy tomson
b9dda93f0c add theme diabook-blue, fix css 2012-03-08 23:22:26 +01:00
tommy tomson
1fcbc7aa5a add links to /profiles, add some icons to diabook/icons, fixes in css 2012-03-08 14:49:07 +01:00
tomtom84
dd2ff7c796 Merge pull request from tomtom84/master
fixes in theme diabook
2012-03-06 23:44:18 -08:00
tommy tomson
ec3ce05357 fix in navbar 2012-03-07 08:42:19 +01:00
tommy tomson
49b5a1bf20 fix in navbar 2012-03-07 00:47:43 +01:00
tommy tomson
6a5c4bab9c messages-menu translation, add scroll-to-top and theme-bug-report in theme 2012-03-07 00:07:27 +01:00
tommy tomson
b64b1d13a4 fixes in diabook 2012-03-06 08:27:20 +01:00
tommy tomson
a406c16581 fixes 2012-03-05 22:31:03 +01:00
tommy tomson
fe614b4e7c like dislike button 2012-03-05 05:14:08 +01:00
tommy tomson
e52891d8ab fixes in diabook 2012-03-05 03:08:58 +01:00
tommy tomson
8e49b4332c style.css fix 2012-03-04 14:19:53 +01:00
tommy tomson
e0e0224fa6 some fixes in diabook 2012-03-04 05:48:06 +01:00
tommy tomson
25d6ca3b73 tag fix 2012-03-04 00:10:03 +01:00
tommy tomson
b3eeb22401 fix 2012-03-03 23:43:15 +01:00
tommy tomson
173fb983c5 navbar fix 2012-03-03 23:12:03 +01:00
tommy tomson
42b9887693 fixed apps css 2012-03-03 21:45:59 +01:00
tommy tomson
d4ac1f2a9c fixed star/unstar 2012-03-03 19:07:55 +01:00
tommy tomson
83e9f57459 fixed admin
fixed editor
2012-03-03 16:49:48 +01:00
tommy tomson
b3ba2eb4d0 fix editor 2012-03-03 15:01:25 +01:00
tommy tomson
60adef2463 fix text-editor in theme 2012-03-03 13:27:39 +01:00
tommy tomson
83c25b4386 small fix in style.css 2012-03-03 06:00:46 +01:00
tommy tomson
89f667ff76 fix star/unstar 2012-03-03 04:45:34 +01:00
tommy tomson
d138d07c05 fixes in wall_item.tpl and style.css in theme diabook 2012-03-03 04:27:06 +01:00
tommy tomson
8f72d95b0e fix in wall_item.tpl
new icon link.png
2012-03-03 01:52:53 +01:00
tommy tomson
d3f83c9375 fixed broken tags and notifications in theme 2012-03-03 00:41:02 +01:00
tommy tomson
64a85b2507 deleted readme.txt from folder diabook 2012-03-02 18:01:21 +01:00
tommy tomson
ac1d758f6e github finally working 2012-03-02 17:47:45 +01:00
tommy tomson
d72520f5f1 adjust3 2012-03-02 17:45:21 +01:00
tommy tomson
e2798cee16 adjust 2012-03-02 16:01:20 +01:00
tommy tomson
5183e737d0 diabook commit 2012-03-02 02:05:35 +01:00