clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,154 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

1100 Commits

Author SHA1 Message Date
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
Simon L'nu 96cda3136b lighten wrapper shadow a bit on dispy 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-13 20:14:09 -04:00
Simon L'nu 6b46fe3dfe neat little changes. hopefully the shadow will be well recieved 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-13 19:30:07 -04:00
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
Fabio Comuni f6e1ddf7fb Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
Fabio Comuni 469710893d quattro: language icon in navbar 2012-04-13 11:56:56 +02:00
Fabio Comuni 7aa3b92f4c quattro: add admin theme settigs. darker items background with a bottom border. 2012-04-13 11:21:15 +02:00
Fabio Comuni 8be7b5c65b quattro: work on 
"like" activitiy items less visible
    fixes to widths
    popup notification out of navbar
    category input in jot
 2012-04-13 09:43:38 +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
Fabio Comuni 309f2bfa5f quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu 2012-04-12 09:17:35 +02:00
Fabio Comuni 6c50eba206 quattro: move center css to style.php. add tpl for generic_links_widget 2012-04-12 08:40:17 +02:00
Simon L'nu c21244f679 fix the icons a bit 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-12 01:08:02 -04:00
tommy tomson a1d5026abf diabook-themes: small fix 2012-04-11 18:49:07 +02:00
Simon L'nu c79d1deb92 major refactor. step 1 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-11 01:59:33 -04: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
Simon L'nu 707a5dbae7 aaah, nice asides ;). we'll be updating these soon 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-10 05:48:42 -04: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
friendica 741a5dba57 provide theme_init() functions 2012-04-08 05:52:00 -07:00
Michael Vogel ce0eac44b5 Merge commit 'upstream/master' 2012-04-08 10:07:39 +02:00
Simon L'nu 01961f7caa minor dispy* fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-07 23:46:47 -04:00
tommy tomson f931d5c918 diabook-themes: small fix 2012-04-07 19:56:00 +02:00
Michael Vogel 17d097124c "vier": Some design stuff 2012-04-07 18:35:37 +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
Michael Vogel 7308dbae28 "vier": Bookmarks now look better. 2012-04-07 01:19:07 +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
Simon L'nu df82affe2f finish styling category tags and category input 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-05 00:04:23 -04:00
Simon L'nu 9ee424c1e3 style categorytags 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-04 23:47:35 -04:00
Simon L'nu 8e5489846d update the dispy* templates 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-04 23:35:07 -04:00
friendica c4ca21a762 move alert box away from nav links 2012-04-04 19:13:41 -07:00
Simon L'nu 922d690d1e latest changes are the popup menu for notifs, fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-04 02:19:39 -04:00
friendica 1e02fd8a72 Merge branch 'pull' 2012-04-03 19:16:59 -07:00
friendica 3db2cf76b9 remove loozah themes which fell too far behind to recover 2012-04-03 16:40:25 -07:00
tommy tomson f0a8ef64fe smal fix 2012-04-03 21:45:58 +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
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04: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
friendica bc283f7c5d qcomment overflow 2012-04-01 03:37:41 -07:00
friendica ae5e5bf1e4 Merge branch 'pull' 2012-04-01 01:03:05 -07:00
friendica 5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
Simon L'nu db7f7e4237 latest fixes for dispys. tweaking/repairing 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-01 03:57:05 -04: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 893ece9066 bug fix in diabook-aerith and -red 2012-03-31 11:50:33 +02:00
tommy tomson 0b41654935 bug-fixes in diabook-derivates 2012-03-31 11:09:57 +02:00
Simon L'nu f5e3ec9a56 forgot the css changes for last push 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-31 04:02:51 -04:00
Simon L'nu b88a452c6b theme fixes; fix qcomment (finally) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-31 03:56:06 -04:00
Fabio Comuni be2005f146 quattro: move quattro-green inside quattro folder. 
Add config option to select quattro color scheme.
 2012-03-30 21:21:14 +02:00
Fabio Comuni 77f57e1b13 Merge remote-tracking branch 'friendica/master' 2012-03-30 19:37:43 +02:00
tommy tomson f50fb7d6ca css-fixes in diabook-derivates 2012-03-30 17:52:29 +02:00
tommy tomson 6d3d882f9b css-fixes in diabook-derivates 2012-03-30 16:33:34 +02:00
Fabio Comuni 24e7a3413c quattro-green: remove settings code 
Use config.php from quattro
 2012-03-30 15:46:14 +02:00
Fabio Comuni db59a45030 quattro: add config.php 2012-03-30 15:45:23 +02:00
tommy tomson 5b4bb347a6 css-fixes in diabook-derivates 2012-03-30 14:38:21 +02:00
Tobias Diekershoff 8685a91742 quattro-green: added Description to the theme.php 2012-03-30 14:24:45 +02:00
Tobias Diekershoff b5e292509e quattro-green: adopted quattro option for centered display 2012-03-30 14:03:33 +02:00
tommy tomson 5ced7f2bc5 add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
Tobias Diekershoff e2370b56bf quattro-greey: apply theming to private mail 2012-03-30 08:10:49 +02:00
Simon L'nu 3b4016168d tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-29 20:19:43 -04:00
friendica e935b3a225 theme file_as combobox for 2.0 2012-03-29 04:07:16 -07:00
tommy tomson 339c8a4b56 css fixes in diabook-derivates 2012-03-29 11:02:59 +02:00
fabrixxm 3ee529d095 Merge pull request #185 from fabrixxm/master 
Updated private message pages
 2012-03-28 23:47:23 -07: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
Fabio Comuni 011a96d960 quattro: style pm pages 2012-03-28 15:34:02 +02:00
Fabio Comuni f86e909a82 Merge remote-tracking branch 'friendica/master' 2012-03-28 15:21:01 +02:00
friendica e894775a39 Merge branch 'pull' 2012-03-28 05:16:25 -07:00
Fabio Comuni 0f2a34c23b quattro: tpl for "file as" 2012-03-28 13:37:04 +02:00
Simon L'nu 4a75ea2f42 really fix it this time... 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 06:47:38 -04:00
Simon L'nu 3d5e711780 WITH is going on? 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 06:20:13 -04:00
friendica b58dc43148 Merge branch 'pull' 2012-03-28 03:19:42 -07:00
friendica b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
Simon c32ee4d226 Merge pull request #180 from simonlnu/master 
duh...
 2012-03-28 03:03:47 -07:00
Simon L'nu 356e654521 doh fix 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 06:03:04 -04:00
fabrixxm 768326e484 Merge pull request #179 from fabrixxm/master 
new field_combobox template and some eyecandy to "file as" function
 2012-03-28 03:00:24 -07:00
Simon L'nu bcf8a571f9 add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 05:52:28 -04:00
Fabio Comuni 0a2675d8b6 filer: replace "file as" prompt with combobox opened in fancybox 2012-03-28 10:49:34 +02:00
friendica f95fb2667a vier navbar messed up after default theme template move 2012-03-28 00:16:22 -07: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 9fd54de691 provide a close-option for boxes in right_aside and store info via js and cookies 2012-03-27 15:29:46 +02:00
Simon L'nu c3388ad813 more fixes for dispys 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-27 04:40:31 -04:00
Simon L'nu 6cd56e0f33 add dispy-dark snapshot; fix toolbar 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-27 03:57:47 -04: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
friendica 5275b5d049 qcomment enhancements 2012-03-26 20:13:03 -07:00
Simon L'nu 3b9f0fd801 fix dispy's nav element; fix colours in #search-text 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-26 14:19:59 -04:00
tommy tomson 2d834d0f45 add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css 2012-03-26 18:54:57 +02:00
Tobias Diekershoff f1d15d8884 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-26 14:49:15 +02:00
Tobias Diekershoff 37f10a6d4f marking quattro-green as extension of quattro and deleting the tpl files 2012-03-26 14:48:01 +02:00
tommy tomson aaddee0d94 minor css fixes in diabook 2012-03-26 13:52:44 +02:00
friendica 0164da4fb9 screenshot for darkzero-NS, same as darkzero 2012-03-26 04:25:20 -07:00
Tobias Diekershoff 8ded404aaa added quaddro templates to quaddro-green 2012-03-26 11:28:38 +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
friendica ca31aed490 Merge branch 'pull' 2012-03-26 00:53:32 -07:00
friendica 2820dba1e7 comix screenshot 2012-03-26 00:52:54 -07:00
Fabio Comuni 579c4f3079 diabook: small fix in theme_info array 2012-03-26 09:48:38 +02:00
friendica 109e8d4f05 more theme screenshots 2012-03-26 00:47:52 -07:00
tommy tomson c4c69959e2 add screenshots to diabook 2012-03-26 09:37:14 +02:00
Fabio Comuni 51d419e159 themes: use duepuntozero tpls as default 2012-03-26 09:09:14 +02:00
Simon L'nu 7de8e15ca4 fix the search box 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-26 03:01:13 -04:00
tommy tomson 37f02424f8 small fix 2012-03-26 07:02:27 +02:00
friendica ba28362242 position the theme-preview on settings page 2012-03-25 21:12:10 -07:00
friendica a06185e87c screenshot gallery 2012-03-25 20:08:28 -07:00
Simon L'nu 3d11c22b01 add in the search box 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 22:45:44 -04:00
Simon L'nu 758e1b7424 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  theme screenshots

* master:
 2012-03-25 22:40:24 -04:00
friendica 7ab117fd31 Merge branch 'pull' 2012-03-25 18:19:58 -07:00
friendica 7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
Simon L'nu 3d62cb9782 minor fix to dispy theme.php 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 17:13:24 -04:00
Simon L'nu aa33815d3c urgent fix to dispy-dark theme.php 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 17:06:38 -04:00
tommy tomson baeb735315 small fixes 2012-03-25 19:43:42 +02:00
Simon L'nu 2c43120129 dispy-dark not experimental. start implementing fpostit 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 03:22:16 -04:00
Simon L'nu 84686a2698 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:
 2012-03-25 03:18:21 -04:00
tommy tomson 329a26d62e move community_pages to right_aside, fixes in css 2012-03-25 08:47:17 +02:00
Simon L'nu 1d56224b08 increase version to 1.0 for dispys \o/ 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 01:12:28 -04:00
Simon L'nu 8fe77e5b86 implement filer/file-as 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 01:01:59 -04:00
tommy tomson 8451b22d42 small fix in css 2012-03-24 08:56:26 +01:00
tommy tomson ba027f174d add right_aside to diabook-blue 2012-03-24 08:13:48 +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
Tobias Diekershoff 07c5b0af5a quattro(-green) styling the 'filed under: remove' text 2012-03-22 14:09:21 +01:00
friendica 808180ce5f missing tooltip for "file as" 2012-03-22 04:07:37 -07: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
friendica 89028f2e2f add comix-plain 2012-03-21 13:55:37 -07:00
friendica 56495e04b2 smooth the comix comment box 2012-03-21 06:48:04 -07:00
friendica adcf52d02d facepark is unsupported ATM 2012-03-21 00:08:06 -07:00
friendica efd7c14c24 Merge pull request #154 from tonybaldwin/master 
added theme
 2012-03-20 23:31:12 -07:00
friendica 0dc4c3f484 add comix theme 2012-03-20 22:54:20 -07:00
tony baldwin e5c29fcc78 Merge remote branch 'upstream/master' 2012-03-21 01:36:23 -04:00
tony baldwin cf17606d0f added Vijay's theme from facepark.in 2012-03-21 01:33:48 -04:00
Simon L'nu de0298e67e some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-20 11:37:51 -04:00
Simon L'nu e84095182f fix the comment box being too wide and looking off-kilter 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-18 18:33:38 -04:00
Simon L'nu 87fdae2dd8 [fix] whitespace in photo_view and like_noshare. dispy-dark clean up 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-17 01:55:40 -04:00
Simon L'nu 75883b196e remove auto-complete from darkzero-NS, dispys, since the comment one is now global 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 21:23:24 -04:00
Simon L'nu 368d93625d make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 20:29:02 -04:00
Simon L'nu 91fee866b7 make profiles-menu disappear when clicked outside it 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 16:43:34 -04:00
Simon L'nu 7b15f27ba4 weee, dispys get another update 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 13:31:59 -04:00
Simon L'nu 6bdb71f01c more changes in dispy-dark 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 01:55:34 -04:00
friendica 33e03a8df0 Merge branch 'pull' 2012-03-15 19:56:32 -07:00
friendica 5a12383b78 undo git stuffup 2012-03-15 19:55:58 -07:00
tommy tomson 02395c8af5 added icons to profile_side, fixes in css 2012-03-16 03:49:43 +01:00
friendica 5d2c590fa9 Merge pull request #136 from annando/master 
Mail improvements, item caching and so on
 2012-03-15 15:30:52 -07:00
Simon L'nu 5c75d40c0b fixed the sidebar edit thingy. haven't synced dispy yet. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-15 17:27:06 -04:00
Michael Vogel 9243c9fc14 Merge commit 'upstream/master' 2012-03-15 21:11:58 +01:00
Simon L'nu 5b757e4e0e commit latest to dispy-dark. fixes in html css and js 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-15 15:07:17 -04:00
friendica 4cd3d5cd02 Merge https://github.com/friendica/friendica into pull 2012-03-15 01:48:07 -07: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
friendica 959aa13de0 Merge pull request #133 from tonybaldwin/master 
slack-NS
 2012-03-14 15:15:34 -07:00
friendica 2dc527609e Merge https://github.com/friendica/friendica into pull 2012-03-14 14:34:48 -07:00
Simon c95deb4839 Merge pull request #134 from simonlnu/master 
PHP Fatal error:  Call-time pass-by-reference has been removed in mod/item.php on line 630
 2012-03-14 08:02:04 -07: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
Simon fb77bfa648 Merge pull request #131 from simonlnu/master 
massive work done to both dispys, mostly -dark
 2012-03-13 22:10:02 -07:00
Simon L'nu 975781d3e2 massive work done to both dispys, mostly -dark 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-14 01:05:08 -04:00
friendica 4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
Tony Baldwin 1ae740535d added slack-NS, non-scrolly, slackr-based theme. 2012-03-13 23:05:04 -04:00
friendica be48fff157 file as widget and basic filing implementation for duepuntozero,slackr 
much more work needed - this is just for test/evaluation currently
 2012-03-13 18:13:03 -07:00
friendica bf7425c591 click anywhere to close notifications -> zeros and bubbles 2012-03-12 20:21:32 -07:00
tommy tomson 8358b9247f fix css 2012-03-13 00:38:38 +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
Simon L'nu 9f52e3df8d fix dispy-dark photo album stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-11 21:34:51 -04:00
Simon L'nu e9b82bb5ee fix dispys' css and layout 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-11 20:36:16 -04: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
Simon L'nu 258a8c0871 screwed up on the font-size for screen last push 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-11 10:29:12 -04:00
Simon L'nu fa0cb8514d add some '@media handheld' types for dispys 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-11 10:24:49 -04:00
Simon L'nu 62fe48f064 fix more stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-11 10:14:31 -04:00
Simon L'nu 57d8370376 fix some stuff right away 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-11 09:12:31 -04:00
Simon L'nu f7ade749b8 preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-11 01:32:11 -05: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
tommy tomson 9f441731af fixes in css 2012-03-09 13:23:38 +01:00
Simon L'nu 81f5b0e2df [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-09 00:26:54 -05:00
Simon L'nu dc8d060d4d i consider dispy pretty stable at this point, so i'm removing the experimental file 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-09 00:00:56 -05:00
Simon L'nu 20b2090182 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  removed info
  add info
  fixed star-bug
  More improved transparency for smilies
  removed dolphin file (wtf?)
  .

* master:
 2012-03-08 23:59:43 -05:00
tomtom84 e25fb2b2f9 Merge pull request #112 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 #111 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 #110 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
Simon L'nu 8d19baadff Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  theme info file for testbubble
  catalan translation
  revup
  add theme diabook-blue, fix css

* master:
 2012-03-08 20:38:54 -05:00
friendica b86a08166c theme info file for testbubble 2012-03-08 16:30:45 -08: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
Simon L'nu 5fe8952c29 make svg from notifications.svg to ease future editing. more dispy tweaks 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-08 13:37:45 -05:00
tomtom84 08b5ede5a1 Merge pull request #107 from tomtom84/master 
fixes in theme diabook
 2012-03-08 05:52:14 -08: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
Simon L'nu 15d310e4c3 fix jot.tpl buttons. fix up subsequent styling breakage 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-07 12:35:04 -05:00
Simon L'nu 66d2c52b5f push fix for funky menu action. the overflow-x might break again for some people 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-07 10:07:36 -05:00
tomtom84 dd2ff7c796 Merge pull request #103 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
tomtom84 05a52b2660 Merge pull request #101 from tomtom84/master 
fixes in theme diabook
 2012-03-06 15:49:32 -08:00
tommy tomson 49b5a1bf20 fix in navbar 2012-03-07 00:47:43 +01:00
Simon decc9e5798 Merge pull request #99 from tomtom84/master 
fixes in theme diabook
 2012-03-06 15:22:55 -08: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
Simon L'nu edd450cf06 dispy, dispy, oh what a little lispy 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-06 17:55:05 -05:00
Simon L'nu bc8b014906 styling fixes in dispy. fix typos in settings.tpl 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-06 16:18:26 -05:00
Fabio Comuni 607ee1ff9c quattro: theme settings (a bit hackish) 2012-03-06 09:50:18 +01:00
tommy tomson eaaf030c18 Merge remote-tracking branch 'origin/master' 2012-03-06 08:28:21 +01:00
tommy tomson b64b1d13a4 fixes in diabook 2012-03-06 08:27:20 +01:00
friendica 321b651635 Merge branch 'pull' 2012-03-05 18:52:15 -08:00
friendica 23460302f5 some admin page fixes and cleanup 2012-03-05 18:51:21 -08:00
Michael Johnston 9f44dbbb48 changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero) 2012-03-05 21:10:01 -05:00
friendica e5de03040e Merge branch 'pull' 2012-03-05 15:59:28 -08:00
friendica 7b3349f38a some testbubble stuff 2012-03-05 15:58:26 -08:00
Simon L'nu 190650060a forgot a small change in .field_help 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 18:16:51 -05:00
Simon L'nu 50824bddd0 implement more of the changes requested 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 17:57:04 -05:00
tommy tomson a406c16581 fixes 2012-03-05 22:31:03 +01:00
Simon L'nu 9d461846e2 multiple fixes; the jot-header works as standalone, not sure what's up. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 15:55:17 -05:00
Simon L'nu 02f825ca3c tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 13:16:28 -05:00
Simon L'nu ef1d02e7bd still working on jot-header. amending <aside> and other elements 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 12:21:57 -05:00
Simon L'nu 65b6ec79ed hopefully fix the overflow issue everywhere this time 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 10:55:26 -05:00
friendica 965e657c20 $name appearing on testbubble items 2012-03-05 03:10:45 -08:00
friendica 31f192bb57 Merge branch 'pull' 2012-03-05 00:54:25 -08:00
friendica 0d97799324 testbubble notifications 2012-03-05 00:53:42 -08:00
Simon L'nu 7de79a8c49 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  like dislike button
  fixes in diabook

* master:
 2012-03-05 01:08:54 -05:00
Simon L'nu fe7a6b070d yet more ui things, and bug fixing 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 01:08:45 -05:00
tomtom84 9c541dbd67 Merge pull request #83 from tomtom84/master 
fixes in diabook theme
 2012-03-04 20:15:26 -08:00
tommy tomson fe614b4e7c like dislike button 2012-03-05 05:14:08 +01:00
Simon 04527bd0b1 Merge pull request #80 from unary/darkzero 
improved contrast in acl selector, and preview (darkzero)
 2012-03-04 19:19:45 -08:00
Simon 3b95171824 Merge pull request #82 from simonlnu/master 
say hello to dispy's younger brother
 2012-03-04 19:19:08 -08:00
Simon L'nu 58cdf776b6 more ui thingies with dispy - we'll get you well dispy, we promise 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 22:16:10 -05:00
friendica b57247d6a6 Merge branch 'pull' 2012-03-04 19:15:42 -08:00
friendica b9bea3a549 wrap title and text for editplain in zero and TB themes 2012-03-04 19:14:03 -08:00
friendica fba089012a correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode 2012-03-04 18:50:32 -08:00
tommy tomson e52891d8ab fixes in diabook 2012-03-05 03:08:58 +01:00
tomtom84 d369fcc994 Merge pull request #81 from tomtom84/master 
fixes in diabook theme
 2012-03-04 17:46:48 -08:00
tommy tomson 1653e5a615 fixes in diabook 2012-03-05 02:45:24 +01:00
Michael Johnston b2035ae0c6 improved contrast in acl selector, and preview (darkzero) 2012-03-04 17:29:00 -05:00
Simon L'nu 2441babbe9 removed extra padding/border on tread-wrapper (heh, tea read :P) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 15:52:50 -05:00
Simon L'nu 25510453bf fix up toolbar so the notifications line up better together 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 14:55:09 -05:00
Simon L'nu 5f77aff486 more tweakage. stylesheet and jot-header 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 12:21:08 -05:00
tommy tomson 8e49b4332c style.css fix 2012-03-04 14:19:53 +01:00
Simon L'nu cb57a0ebfd soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 05:19:49 -05:00
Simon L'nu c28ce8a79c tweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars and fails :P 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 05:00:35 -05:00
tomtom84 dfa056bb1b Merge pull request #74 from tomtom84/master 
fixes in diabook theme
 2012-03-03 20:49:09 -08:00
tommy tomson e0e0224fa6 some fixes in diabook 2012-03-04 05:48:06 +01:00
Simon f3c1e2c546 Merge pull request #73 from simonlnu/master 
dispy! (and minor formatting)
 2012-03-03 16:23:07 -08:00
Simon L'nu 09c2f81cb3 these are more finessing on formatting again 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-03 19:20:23 -05:00
Simon L'nu 64400e8d59 first commit for dispy New Edition 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-03 19:19:35 -05:00
tomtom84 74866a96de Merge pull request #72 from tomtom84/master 
fixes in diabook theme
 2012-03-03 15:10:54 -08:00
tommy tomson 25d6ca3b73 tag fix 2012-03-04 00:10:03 +01:00
tomtom84 f4b9c405da Merge pull request #71 from tomtom84/master 
fixes in diabook theme
 2012-03-03 14:45:03 -08:00
tommy tomson b3eeb22401 fix 2012-03-03 23:43:15 +01:00
tomtom84 77db5becb6 Merge pull request #70 from tomtom84/master 
fixes in diabook theme
 2012-03-03 14:13:14 -08:00
tommy tomson 173fb983c5 navbar fix 2012-03-03 23:12:03 +01:00
tomtom84 7230fa5a94 Merge pull request #68 from tomtom84/master 
fixes in diabook theme
 2012-03-03 12:48:34 -08:00
tommy tomson 42b9887693 fixed apps css 2012-03-03 21:45:59 +01:00
tomtom84 1dfd5c4f85 Merge pull request #67 from tomtom84/master 
fixes in diabook theme
 2012-03-03 10:09:28 -08:00
tommy tomson d4ac1f2a9c fixed star/unstar 2012-03-03 19:07:55 +01:00
tomtom84 e84e684fdc Merge pull request #66 from tomtom84/master 
fixed editor and admin-sec in theme diabook
 2012-03-03 07:54:21 -08:00
tommy tomson 83e9f57459 fixed admin 
fixed editor
 2012-03-03 16:49:48 +01:00
tomtom84 792031c36e Merge pull request #65 from tomtom84/master 
fix editor in theme diabook
 2012-03-03 06:03:34 -08:00
tommy tomson b3ba2eb4d0 fix editor 2012-03-03 15:01:25 +01:00
tomtom84 8ffe15fbb1 Merge pull request #64 from tomtom84/master 
fix editor in theme diabook
 2012-03-03 04:30:31 -08:00
tommy tomson 60adef2463 fix text-editor in theme 2012-03-03 13:27:39 +01:00
tomtom84 b4361e37e0 Merge pull request #63 from tomtom84/master 
fixes in diabook theme
 2012-03-02 21:02:55 -08: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
friendica 2ae82ae3c2 Merge pull request #62 from tomtom84/master 
fixes in diabook theme
 2012-03-02 19:32:34 -08:00