strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8187 commits 2 branches 55 tags 148 MiB
Commit graph

288 commits

Author SHA1 Message Date
tommy tomson b2bd25a470 Merge remote-tracking branch 'origin/master' 2012-05-11 02:40:09 +02:00
tommy tomson ccc825ccbc diabook-theme: small fix 2012-05-11 02:39:54 +02:00
Thomas Willingham e7b8e839ae Diabook-dark. More touchups. 2012-05-10 17:14:27 +01:00
tommy tomson 3ac5d19b92 diabook-theme: some fixes 2012-05-10 12:19:51 +02:00
tommy tomson 69b43582d0 diabook-theme: some css/bug-fixes 2012-05-10 09:54:16 +02:00
Thomas Willingham 89d3ce7b5d Diabook-dark - do things the right way instead of the stupid way. 2012-05-09 04:54:17 +01:00
Thomas Willingham d2bbd92889 Fix TinyMCE, but needs adding to theme.php 2012-05-09 03:42:09 +01:00
Thomas Willingham 8a1f8515ca Fix jquery.fancybox, but still needs adding to theme.php 2012-05-09 03:31:56 +01:00
Thomas Willingham a0293ae442 Diabook-dark cleaned up a bit. 2012-05-09 03:21:26 +01:00
tommy tomson 88443ed3fb diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie. 2012-05-08 03:29:25 +02:00
tommy tomson e417f083b5 diabook-theme: small fix 2012-05-07 02:49:44 +02:00
tommy tomson 3d0a0b6abf diabook-theme: add "Earth Layers"-box at right_side 2012-05-07 02:24:43 +02:00
tommy tomson 66b9b60792 diabook-theme: twitterbox-bugfix 2012-05-06 23:26:44 +02:00
tommy tomson f09b3cfbf8 diabook: small fix 2012-05-06 12:25:09 +02:00
tommy tomson abbb4c2f36 diabook-theme: bugfix 2012-05-06 12:08:46 +02:00
tommy tomson e1ab3a93cc diabook-theme: small fix 2012-05-06 00:36:46 +02:00
tommy tomson c421f35da7 diabook-theme: twitter-box-update at right_aside 2012-05-06 00:10:35 +02:00
tommy tomson f297751437 diabook-theme: can now set the twitter search term in theme-settings & small fixes 2012-05-05 20:01:38 +02:00
Vasudev Kamath b5e857c0e7 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-05 20:48:16 +05:30
tommy tomson d72db2e1aa diabook-theme: small fix 2012-05-03 07:57:40 +02:00
tommy tomson ff2ddc319d diabook-theme: small fix 2012-05-03 06:25:23 +02:00
tommy tomson 3521e22333 diabook-theme: made boxes at right_aside sortable 2012-05-03 06:05:55 +02:00
Max Weller f0c11cac4a Moved Meta Viewport from global head.tpl to diabook's header 
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.

I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
 2012-05-02 16:59:58 +02:00
tommy tomson 6875f54647 diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box 2012-05-02 16:27:01 +02:00
tommy tomson 67471bb534 diabook-theme: tryied to improve performance a bit 2012-05-02 14:33:04 +02:00
tommy tomson 6a9cd8cd4b diabook-theme: fix footer/impressum 2012-05-02 12:40:51 +02:00
Thomas Willingham 671a10f5d4 More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway. 2012-05-01 21:37:49 +01:00
tommy tomson ab556857f0 diabook-themes: small fix at "community pages"-box 2012-05-01 16:46:08 +02:00
tommy tomson 2c577ed90f diabook-themes: add "community profiles"-box to right_column 2012-05-01 06:21:40 +02:00
tommy tomson f35ffa9b60 diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter 2012-05-01 02:33:55 +02:00
tommy tomson 920d40acf4 diabook-themes: small fix 2012-04-29 05:58:23 +02:00
tommy tomson 3d054341ef diabook-themes: bug/css-fixes 2012-04-29 04:12:04 +02:00
Thomas Willingham 4b553de79f Diabook-dark update, it's almost useable now (if you're lenient). 2012-04-28 03:01:27 +01:00
Vasudev Kamath 214ec91a3f Merge branch 'master' of git://github.com/friendica/friendica 2012-04-27 22:43:26 +05:30
tommy tomson 328568943e diabook-themes: small-fix 2012-04-26 21:07:46 +02:00
Thomas Willingham 20a9cdfc90 Diabook-dark more CSS fixes. 
Slowly getting there.
 2012-04-25 23:40:40 +01:00
tommy tomson 9fe6333fd4 diabook-themes: fix css to login.tpl 2012-04-25 03:38:21 +02:00
tommy tomson 08b990a314 diabook-themes: small fix 2012-04-25 00:19:57 +02:00
Thomas Willingham a28fea987e Diabook-dark css fix 2012-04-24 20:07:08 +01:00
Thomas Willingham fade45ca76 Diabook-dark, couple of new icons, and another css fix. 2012-04-24 20:00:49 +01:00
Thomas Willingham 9443248fad Improvements to diabook-dark 
Still a long way to go, but some icons and a few CSS fixes
 2012-04-24 04:55:39 +01:00
tommy tomson a305cf9f5c diabok-themes: fixed bug in green-wide and dark-wide 2012-04-23 18:42:37 +02:00
tommy tomson c5c419a785 diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders 2012-04-23 17:22:22 +02:00
tommy tomson d072c12e7d diabook-themes: bugfix in admin-section 2012-04-23 15:47:18 +02:00
tommy tomson e74ae8b031 diabook-themes: bugfix 2012-04-22 23:58:34 +02:00
tommy tomson d6c8a14fb0 diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer 2012-04-22 22:31:44 +02:00
tommy tomson c0a377e0de diabook-themes: comment-bbcode-bugfix 2012-04-22 12:59:00 +02:00
Vasudev Kamath f1d84c1045 Merge branch 'master' of git://github.com/friendica/friendica 2012-04-22 12:08:05 +05:30
tommy tomson fe6567cb88 diabook-themes: deleted obsolete diabook-folder & minor bug-fixes 2012-04-22 03:15:06 +02:00
tommy tomson 8809e96310 diabook-themes: add diabook-dark 2012-04-21 01:06:17 +02:00
Vasudev Kamath 8465ad6e1e Few more files with unnecessary executable permissions 2012-04-21 00:22:48 +05:30
tommy tomson e052be606c diabook-themes: add diabook-green and some minor css/bug-fixes 2012-04-20 17:16:42 +02:00
Fabio Comuni 3bb785fdad Merge remote-tracking branch 'CatoTH/master' into req245 2012-04-20 09:25:51 +02:00
tommy tomson f5f1956e8b diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes 2012-04-20 01:44:21 +02:00
Tobias Hößl d7e750ad74 XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:24:47 +00:00
tommy tomson 1b6c84d8f4 diabook-themes: some css/bug-fixes 2012-04-18 02:36:30 +02:00
tommy tomson 5b407b5ee7 diabook-themes: theme-settings: "wide"-option and new screenshots 2012-04-17 19:45:53 +02:00
tommy tomson b30c761aae diabook-themes: removed fpostit due to security issues and small fix in german translation 2012-04-17 16:15:49 +02:00
tommy tomson f08844a8a5 diabook-themes: bugfix (sry, necessary) 2012-04-16 19:23:11 +02:00
tommy tomson 15dc8f4b21 diabook-themes: small bug/css-fixes ---> ver. 1.019 2012-04-16 18:51:08 +02:00
tommy tomson b32a731517 diabook-themes: bug-fixes 2012-04-16 17:12:08 +02:00
tommy tomson 947b6073b1 diabook-themes: minor bugfixes 2012-04-16 16:05:29 +02:00
tommy tomson b5c164bf2f diabook-themes: css-fixes 2012-04-15 19:58:26 +02:00
tommy tomson dddf3307af diabook-themes: added js for auto-growing comment-textareas 2012-04-15 04:39:33 +02:00
tommy tomson 170c15ceb9 diabook: theme-settings: add a wide-option 2012-04-15 02:50:16 +02:00
Vasudev Kamath 41d74c0868 Another bunch of executable permission removal 2012-04-14 20:16:06 +05:30
Vasudev Kamath 626bb57e1d Removed execution permission: lintian warning in Debian packaging 2012-04-14 20:04:54 +05:30
tommy tomson a300616bcb diabook-themes: theme-settings: users can set font-size and line-height for posts and comments 2012-04-13 22:08:13 +02:00
tommy tomson 2c843466a9 diabook: theme-settings: users can set font-size and line-height for posts and comments 2012-04-13 21:34:21 +02:00
tommy tomson 615cd53e51 diabook-themes: small fixes 2012-04-13 18:28:11 +02:00
tommy tomson e3af552bbf diabook-themes: fixed css for settings aside-links 2012-04-12 22:00:18 +02:00
tommy tomson 39009b5ac9 diabook-themes: css-fixes in aside 2012-04-12 20:23:03 +02:00
tommy tomson 3a8e6cbacb fix css in aside 2012-04-12 17:37:55 +02:00
tommy tomson a1d5026abf diabook-themes: small fix 2012-04-11 18:49:07 +02:00
tommy tomson 6db33fc513 diabook-themes: smal fix in bbcode-js 2012-04-10 15:13:34 +02:00
tommy tomson b3f18945ba diabook-themes: added url and quote to bbcode toolbar under comment box 2012-04-10 14:38:59 +02:00
tommy tomson 0d4fab4ee3 bbcode toolbar attached to the comment text field 
minor css-fixes
 2012-04-10 00:55:39 +02:00
tommy tomson d25a9df996 diabook-themes: small icon fix 2012-04-09 19:56:53 +02:00
tommy tomson c27c340de1 diabook-nav-icons with gradient 2012-04-09 16:41:23 +02:00
tommy tomson 7d018f651d fixed z-index of youtube-vids 
fixed bug to hide right_side
 2012-04-09 00:02:48 +02:00
Michael Vogel ce0eac44b5 Merge commit 'upstream/master' 2012-04-08 10:07:39 +02:00
tommy tomson f931d5c918 diabook-themes: small fix 2012-04-07 19:56:00 +02:00
Michael Vogel cb05801a90 Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
tommy tomson 1c0700f371 changelog 1.014 : 
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section

css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
 2012-04-07 16:39:43 +02:00
tommy tomson f980b79edc new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... 
profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox...
 2012-04-06 11:19:12 +02:00
Michael Vogel 34d268544e Merge commit 'upstream/master' 2012-04-06 00:00:46 +02:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
tommy tomson 8a71191d6d make right_aside translatable and provide german translation... 
and some css-fixes
 2012-04-03 20:59:00 +02:00
Michael Vogel 3dc317dcc6 Merge commit 'upstream/master' 2012-04-02 22:00:22 +02:00
tommy tomson 6dfd55668f diabook-themes: css-fixes 2012-04-02 20:30:27 +02:00
tommy tomson 076b1b374b diabook-themes: fixes in js 2012-04-02 18:16:58 +02:00
tommy tomson b5d57d5313 diabook-themes: fixed pageheader 2012-04-02 17:17:14 +02:00
tommy tomson 9faa940f04 diabook-themes: bugfixes / css-fixes 2012-04-02 15:06:55 +02:00
tommy tomson 23dc376364 diabook-themes: add link to global dir in "find friends" at right_aside 2012-04-02 01:29:20 +02:00
Michael Vogel a39d8d3f02 The "vier"-theme is now working again. But there is still work needed 2012-04-02 00:08:49 +02:00
tommy tomson 408de09f72 css-fixes 2012-04-02 00:05:49 +02:00
tommy tomson f075e977fe add new messages-layout in diabook 2012-04-01 18:12:20 +02:00
tommy tomson ff12637ceb fix the display of community-plugin in diabook-themes 2012-04-01 16:34:31 +02:00
tommy tomson 15ba0ef5d0 various bugfixes and css-fixes 2012-04-01 13:12:15 +02:00
tommy tomson 36545e554b diabook-themes: move "common tabs" to left side on settings page 2012-03-31 18:42:11 +02:00
tommy tomson 13ded12ffb move the common tabs to right_aside in diabook-derivates 2012-03-31 16:58:02 +02:00
tommy tomson 0b41654935 bug-fixes in diabook-derivates 2012-03-31 11:09:57 +02:00
tommy tomson 5ced7f2bc5 add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
tommy tomson 339c8a4b56 css fixes in diabook-derivates 2012-03-29 11:02:59 +02:00
tommy tomson aa26517cdc add a searchbox to "find friends" for global search 2012-03-28 23:07:34 +02:00
tommy tomson 1a9bbac0be bugfix in diabook 2012-03-28 20:45:39 +02:00
tommy tomson f30471df4f small fix in diabook 2012-03-27 23:41:19 +02:00
tommy tomson 211d00a1f5 fixes in diabook 2012-03-27 23:27:43 +02:00
tommy tomson 31fbc3fde3 provide a close-option for boxes in right_aside and store info via js and cookies 2012-03-27 19:02:07 +02:00
tommy tomson e7bc3f2bd0 add "find friends" to right_aside to diabook, fixes in css in diabook 2012-03-27 08:28:47 +02:00
tommy tomson aaddee0d94 minor css fixes in diabook 2012-03-26 13:52:44 +02:00
friendica 63fa5f6c77 Merge pull request #172 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 #127 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 #126 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 #125 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 #118 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 #116 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 #115 from tomtom84/master 
fixes in diabook-derivates
 2012-03-09 04:24:59 -08:00