friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
7524 commits 1 branch 22 tags 59 MiB
Commit graph

1540 commits

Author SHA1 Message Date
Michael Vogel c0376339e0 Merge remote-tracking branch 'upstream/master' 2012-11-17 14:29:09 +01:00
Michael Vogel f17377e6de New cache system with subdirectories 2012-11-17 00:50:39 +01:00
Thomas Willingham 3f9eef1ef6 Diabook - some more heavy lifting. 2012-11-16 22:29:39 +00:00
Thomas Willingham c12a27c73c More diabook... 2012-11-16 02:49:05 +00:00
Thomas Willingham da2aabd61d Diabook - couple of fixes. 2012-11-16 01:58:28 +00:00
Thomas Willingham bb86214698 Add the event/birthday thing from Andreas. 2012-11-16 01:44:09 +00:00
Thomas Willingham da1b4939f0 Merge branch 'master' of https://github.com/friendica/friendica 2012-11-16 00:37:53 +00:00
Thomas Willingham b19c832381 Diabook. Get the paths right. There seems to be something in the PHP putting us in unexpected directories...but it works now. 2012-11-16 00:36:52 +00:00
Thomas Willingham 09150cb5dc Diabook - some heavy lifting. Lots more still to do. 2012-11-15 23:54:13 +00:00
Michael Vogel e67062d9cf Merge remote-tracking branch 'upstream/master' 2012-11-15 21:52:35 +01:00
Michael Vogel fce18fd223 Vier: New Icon set 2012-11-15 21:47:36 +01:00
Michael Vogel ff5ab7e9c6 Vier: Further improvements. 2012-11-15 08:18:25 +01:00
pixelroot a00723fb9c modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_thread.tpl
 2012-11-14 20:10:08 +01:00
pixelroot 7c4e3984be new file: view/theme/smoothly/search_item.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_thread.tpl
 2012-11-14 11:43:26 +01:00
Thomas Willingham 6fd47ba78e Even shinier Dispy. 2012-11-14 03:01:15 +00:00
Thomas Willingham 79f35d01a7 "Everything" now includes Vier 2012-11-13 16:21:03 +00:00
Thomas Willingham 13ffe6274c Everything is shiny (except frost and smoothly). 2012-11-13 15:50:48 +00:00
pixelroot 7e16909d0e deleted: view/theme/smoothly/events_reminder.tpl 2012-11-13 16:37:53 +01:00
pixelroot 0e2fdee20e modified: view/theme/smoothly/jot-header.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-11-13 16:36:36 +01:00
fabrixxm 5a2c01d572 Merge pull request #532 from fabrixxm/quattrofixs 
template: new $item.shiny; some fix to quattro
 2012-11-13 03:08:26 -08:00
Fabrixxm f3716d51ef quattro: fix tag item template 
add correct initial and final divs
 2012-11-12 12:45:49 -05:00
pixelroot 9f09955925 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
 2012-11-12 15:35:16 +01:00
pixelroot 8395966cf2 modified: view/theme/smoothly/css/typography.css 
new file:   view/theme/smoothly/screenshot.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-11-12 15:01:19 +01:00
Michael Vogel 30e429e6ce Vier: Changed the color of links and notification counter. 2012-11-12 08:22:49 +01:00
Michael Vogel b6b85b9773 Vier: Colors of links changed 2012-11-12 00:38:45 +01:00
Thomas Willingham 4c3e9fde28 Diabook - move pause icon. 2012-11-11 18:44:13 +00:00
Thomas Willingham fccc76371f Move the language selector. 2012-11-11 18:42:35 +00:00
Thomas Willingham 1a884e4065 Diabook - an out of date buglink probably shouldn't be in the navigation. 2012-11-11 18:39:16 +00:00
Thomas Willingham 9ea96c74a2 Diabook - remove jquery that seems to do nothing except break ACL in 90% of all browsers. 2012-11-11 18:31:11 +00:00
Thomas Willingham 8b961b0a39 Diabook - yeah, we're supposed to *stop* duplicating code... 2012-11-11 17:49:41 +00:00
Thomas Willingham 4bd70c15db Merge branch 'master' of https://github.com/friendica/friendica 2012-11-11 15:46:04 +00:00
Thomas Willingham 10e84c548c Diabook threaded comments. 2012-11-11 15:44:36 +00:00
Michael Vogel 197a12adb5 Vier: Further design improvements 2012-11-11 00:39:08 +01:00
Michael Vogel b875191237 Diaspora: Avatars of repeated items weren't found 
Vier: Complete redesign of the navigation header
 2012-11-10 23:19:32 +01:00
Michael Vogel 71e43e68d4 Merge remote-tracking branch 'upstream/master' 2012-11-09 23:40:17 +01:00
Fabrixxm b15352f650 quattro: collapse threaded comment box 2012-11-09 11:58:35 -05:00
Fabrixxm c8b4ce9cca quattro: fix shiny items with threads. fix 'tagged' template 2012-11-09 11:24:49 -05:00
Michael Vogel fb02d72a35 vier: toggle comments only with threaded comments 2012-11-09 08:01:16 +01:00
friendica f71db67a36 Merge https://github.com/friendica/friendica into pull 2012-11-08 20:47:04 -08:00
friendica 4199f49b54 remember me to base theme 2012-11-08 20:46:44 -08:00
fermionic a6c05b5186 Merge pull request #530 from fermionic/20121108-dispy-menu-fix 
fix help button position in dispy
 2012-11-08 18:16:01 -08:00
Michael Vogel b41687e209 "vier": Button for show/hide of text area for comments 2012-11-09 01:56:51 +01:00
Zach Prezkuta 36a9b2ed9a fix help button position 2012-11-08 17:50:37 -07:00
friendica 824dcb8e76 Merge pull request #529 from fermionic/20121107-remember-me 
add ability to remember logged in user after browser closes
 2012-11-08 16:29:02 -08:00
Michael Vogel b14e557575 Vier: Fixing "vier" so that it looks again like it was intended. 2012-11-09 01:19:24 +01:00
Michael Vogel 4196b6a96c Merge remote-tracking branch 'upstream/master' 2012-11-08 21:44:17 +01:00
Tobias Diekershoff 815d48e5e4 frost-mobile: on subdirectory installs the login screen image was not found 2012-11-08 06:48:49 +01:00
Zach Prezkuta e116712bf5 add ability to remember logged in user after browser closes 2012-11-07 18:59:30 -07:00
Zach Prezkuta bff31a49eb leaked local change 2012-11-06 08:49:03 -07:00
Zach Prezkuta 999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
Michael ff40442768 Restoring the community pages in diabook 2012-11-05 00:20:32 +01:00
Zach Prezkuta c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -06:00
Zach Prezkuta 6effdd570c add a confirm dialog and a busy rotator for delete selected 2012-11-01 17:42:40 -06:00
Zach Prezkuta e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Tobias Diekershoff c177a5e5b2 vier: threads 2012-11-01 15:05:31 +01:00
Zach Prezkuta 2bfacda2df missed quattro threaded_conversation live update field 2012-10-29 13:04:59 -06:00
Zach Prezkuta 4fa5b76167 delete template files that are identical to the defaults 2012-10-29 12:56:17 -06:00
pixelroot c1299bc689 view/theme/smoothly/screenshot.png 2012-10-25 13:50:26 +02:00
pixelroot 8e9c9992b0 new file: view/theme/smoothly/images/arrow.png 
new file:   view/theme/smoothly/images/calendar.png
	new file:   view/theme/smoothly/images/connect.png
	new file:   view/theme/smoothly/images/dot.png
	new file:   view/theme/smoothly/images/down.png
	new file:   view/theme/smoothly/images/file.gif
	new file:   view/theme/smoothly/images/groups.png
	new file:   view/theme/smoothly/images/icons.png
	new file:   view/theme/smoothly/images/icons.svg
	new file:   view/theme/smoothly/images/login-bg.gif
	new file:   view/theme/smoothly/images/lrarrow.gif
	new file:   view/theme/smoothly/images/menu-user-pin.jpg
	new file:   view/theme/smoothly/images/menu-user-pin.png
	new file:   view/theme/smoothly/images/nav-bg.png
	new file:   view/theme/smoothly/images/next.png
	new file:   view/theme/smoothly/images/notifications.png
	new file:   view/theme/smoothly/images/photo-menu.jpg
	new file:   view/theme/smoothly/images/photography.png
	new file:   view/theme/smoothly/images/premium.png
	new file:   view/theme/smoothly/images/prev.png
	new file:   view/theme/smoothly/images/search.png
	new file:   view/theme/smoothly/images/shiny.png
	new file:   view/theme/smoothly/images/star.png
	new file:   view/theme/smoothly/images/tobottom.png
	new file:   view/theme/smoothly/images/totop.png
	new file:   view/theme/smoothly/images/user.png
 2012-10-25 12:27:05 +02:00
pixelroot 272cccb47f deleted: view/theme/smoothly/arrow.png 
deleted:    view/theme/smoothly/calendar.png
	deleted:    view/theme/smoothly/connect.png
	modified:   view/theme/smoothly/css/typography.css
	deleted:    view/theme/smoothly/dot.png
	deleted:    view/theme/smoothly/down.png
	deleted:    view/theme/smoothly/file.gif
	deleted:    view/theme/smoothly/groups.png
	deleted:    view/theme/smoothly/icons.png
	deleted:    view/theme/smoothly/icons.svg
	deleted:    view/theme/smoothly/login-bg.gif
	deleted:    view/theme/smoothly/lrarrow.gif
	deleted:    view/theme/smoothly/menu-user-pin.jpg
	deleted:    view/theme/smoothly/menu-user-pin.png
	deleted:    view/theme/smoothly/nav-bg.png
	modified:   view/theme/smoothly/nav.tpl
	deleted:    view/theme/smoothly/nets.tpl
	deleted:    view/theme/smoothly/next.png
	deleted:    view/theme/smoothly/notifications.png
	deleted:    view/theme/smoothly/photo-menu.jpg
	deleted:    view/theme/smoothly/photo_album.tpl
	deleted:    view/theme/smoothly/photo_top.tpl
	deleted:    view/theme/smoothly/photo_view.tpl
	deleted:    view/theme/smoothly/photography.png
	deleted:    view/theme/smoothly/premium.png
	deleted:    view/theme/smoothly/prev.png
	deleted:    view/theme/smoothly/profile_entry.tpl
	deleted:    view/theme/smoothly/profile_vcard.tpl
	deleted:    view/theme/smoothly/saved_searches_aside.tpl
	deleted:    view/theme/smoothly/screenshot.png
	deleted:    view/theme/smoothly/search.png
	deleted:    view/theme/smoothly/search_item.tpl
	deleted:    view/theme/smoothly/shiny.png
	deleted:    view/theme/smoothly/star.png
 2012-10-25 12:26:09 +02:00
Simon L'nu 00ee068b65 fix for preview post thingy blocking the posting buttons 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-10-25 02:59:49 -04:00
Simon L'nu 1d9633b0cc Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  Friendicaland - remove states no longer flying the Friendica banner.
  deleted:    view/theme/smoothly/categories_widget.tpl 	deleted:    view/theme/smoothly/contact_template.tpl 	deleted:    view/theme/smoothly/footer.tpl 	deleted:    view/theme/smoothly/generic_links_widget.tpl 	deleted:    view/theme/smoothly/group_drop.tpl 	deleted:    view/theme/smoothly/group_side.tpl 	deleted:    view/theme/smoothly/header.tpl 	deleted:    view/theme/smoothly/mail_head.tpl 	deleted:    view/theme/smoothly/message_side.tpl 	deleted:    view/theme/smoothly/peoplefind.tpl 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/login.tpl 	modified:   view/theme/smoothly/style.css
 2012-10-25 02:11:38 -04:00
pixelroot fa7157492a deleted: view/theme/smoothly/categories_widget.tpl 
deleted:    view/theme/smoothly/contact_template.tpl
	deleted:    view/theme/smoothly/footer.tpl
	deleted:    view/theme/smoothly/generic_links_widget.tpl
	deleted:    view/theme/smoothly/group_drop.tpl
	deleted:    view/theme/smoothly/group_side.tpl
	deleted:    view/theme/smoothly/header.tpl
	deleted:    view/theme/smoothly/mail_head.tpl
	deleted:    view/theme/smoothly/message_side.tpl
	deleted:    view/theme/smoothly/peoplefind.tpl
	modified:   view/theme/smoothly/style.css
 2012-10-24 16:41:56 +02:00
pixelroot c92e7a3521 modified: view/theme/smoothly/style.css 2012-10-24 14:04:57 +02:00
pixelroot 6d1614e8fa modified: view/theme/smoothly/login.tpl 
modified:   view/theme/smoothly/style.css
 2012-10-24 12:24:12 +02:00
Simon L'nu cf42b6f78d Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master: (23 commits)
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/css/typography.css 	modified:   view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php
  Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).
  Diabook - first part of clean-up to make the theme maintainable.
  modified:   view/theme/smoothly/css/typography.css 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/profile_vcard.tpl 	modified:   view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php 	new file:   view/theme/smoothly/vcard-widget.tpl
  rev update
  modified:   view/theme/smoothly/css/typography.css 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/default.php 	modified:   view/theme/smoothly/nav.tpl 	modified:   view/theme/smoothly/style.css 	new file:   view/theme/smoothly/tobottom.png
  modified:   view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php
  IT: update to the strings
  DE: update to the strings
  new file:   view/theme/smoothly/css/typography.css 	modified:   view/theme/smoothly/style.css 	modified:   view/theme/smoothly/theme.php
  DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.
  Friendicaland
  undefined fn: init_groups_visitor in mod_profile, rev update
  Diabook - remove redundant TPL to bring back all admin settings
  CS: update to the strings
  ES: update to the strings
  FR: update to the strings
  ...
 2012-10-24 05:41:11 -04:00
pixelroot cc59cb2755 modified: view/theme/smoothly/style.css 2012-10-24 11:13:12 +02:00
pixelroot fe4e6f05d7 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-10-24 10:33:39 +02:00
Thomas Willingham a8084fa540 Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break). 2012-10-23 20:05:55 +01:00
Thomas Willingham 35a44d8d27 Diabook - first part of clean-up to make the theme maintainable. 2012-10-23 19:20:49 +01:00
pixelroot e43097dbc1 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
 2012-10-23 15:47:48 +02:00
pixelroot 136175047d modified: view/theme/smoothly/profile_vcard.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	new file:   view/theme/smoothly/vcard-widget.tpl
 2012-10-23 14:23:28 +02:00
pixelroot 5f61290811 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
 2012-10-23 10:58:50 +02:00
pixelroot f8787b6762 modified: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/nav.tpl
	modified:   view/theme/smoothly/style.css
	new file:   view/theme/smoothly/tobottom.png
 2012-10-23 10:22:39 +02:00
pixelroot 215f084a2e modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-10-23 09:24:19 +02:00
pixelroot e4ab5dd32f new file: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-10-22 16:53:56 +02:00
Thomas Willingham 05bfd3bbf7 DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me. 2012-10-22 01:49:35 +01:00
Thomas Willingham 1b9438120c Diabook - remove redundant TPL to bring back all admin settings 2012-10-21 18:44:23 +01:00
pixelroot 5016a589fb modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-10-19 11:53:22 +02:00
friendica 2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
Simon L'nu 6ee4e4a93d Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  imagick exception
  rev update
  diabook: use proper defaults in popup sidebar config
  diabook boxes: use a common hide/show form entry definition
  remove lots of duplicated code in diabook config handling
 2012-10-18 11:30:58 -04:00
Thomas Willingham 2940f25df9 Merge pull request #514 from hmeine/master 
Cleanups in diabook theme code
 2012-10-16 09:05:50 -07:00
Hans Meine ba503b9927 diabook: use proper defaults in popup sidebar config 2012-10-16 13:44:27 +02:00
Hans Meine d0775be2e2 diabook boxes: use a common hide/show form entry definition 2012-10-16 13:42:18 +02:00
Hans Meine 2d614b6700 remove lots of duplicated code in diabook config handling 2012-10-16 13:33:53 +02:00
Simon L'nu 2c15bdd99e merge HEAD 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-10-15 22:48:25 -04:00
fermionic 2f3d118e77 Merge pull request #508 from fermionic/no-theme-control-of-live-update-location 
allow themes to decide where live updates appear
 2012-10-10 17:34:28 -07:00
Zach Prezkuta 0d56f82efa frost style improvements; various tweaks 2012-10-09 09:44:56 -06:00
Zach Prezkuta 0ea89852d2 allow themes to decide where live updates appear 2012-10-09 09:41:33 -06:00
Thomas Willingham ffe7209114 Darkzero - make "visible to" legible. 2012-10-06 01:18:03 +01:00
Zach Prezkuta 5f2826f84e update themes for new All Networks option 2012-10-04 19:59:30 -06:00
Thomas Willingham d33abe2de9 Dispy - selecting any network and then switching back to "all networks" 
didn't work.  Remove nets.tpl to make it use the default one.
 2012-10-04 23:19:50 +01:00
pixelroot ceb8b8b77f new file: view/theme/smoothly/file.gif 
modified:   view/theme/smoothly/search_item.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-10-04 16:37:02 +02:00
Christian Vogeley 44acbb25e4 Bring back BB-Code in comments 2012-10-02 21:29:00 +02:00
Zach Prezkuta e850e0c6d5 frost suport for categories and folder updates 2012-10-01 14:22:32 -06:00
fabrixxm 9d4fdee65d Merge pull request #500 from fabrixxm/quattro-fontsoptions 
Quattro fixes
 2012-10-01 07:05:58 -07:00
Fabrixxm c7a4c08081 quattro: fix jot "video link" tooltip 2012-10-01 09:59:55 -04:00
Fabrixxm 871f182414 quattro: add quattro-lilac to theme Makefile 2012-10-01 09:53:02 -04:00
Fabrixxm ca34d89482 quattro: fix post tags style, add icons for mentions, folders and categories 2012-10-01 09:38:25 -04:00
Fabrixxm 9d738570ee quattro: options for posts and textareas font size 2012-10-01 08:58:05 -04:00
Zach Prezkuta cee50502d3 toggle mobile on all themes; Frost updates 2012-09-29 17:47:47 -06:00
Fabrixxm de076afd6b quattro: update wall_thread.tpl to separate tags/mentions/folder/category display 2012-09-28 10:17:26 -04:00
Fabrixxm 574631c17a Merge remote branch 'friendica/master' into quattro-fontsoptions 2012-09-28 10:06:00 -04:00
friendica 9337441491 class not id 2012-09-27 02:54:14 -07:00
friendica d615f0b563 forumlist changes 2012-09-27 02:47:50 -07:00
friendica 4a8100a409 frost-mobile - everything is walltowall 2012-09-25 21:55:53 -07:00
friendica 2cacbdb9e7 Merge https://github.com/friendica/friendica into pull 2012-09-25 19:11:58 -07:00
friendica e433f20cd8 sort out the 'delete selected' mess 2012-09-25 19:10:46 -07:00
pixelroot 75d65db785 Merge remote branch 'upstream/master' 2012-09-25 12:00:29 +02:00
pixelroot 0bf9ff5821 modified: view/theme/smoothly/events_reminder.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-25 11:59:58 +02:00
friendica 245d9f0aca one template to rule them all 2012-09-25 01:31:48 -07:00
pixelroot 0592a9e3ca modified: view/theme/smoothly/login.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-24 16:07:41 +02:00
friendica 8df6f249fd Merge https://github.com/friendica/friendica into pull 2012-09-24 01:31:23 -07:00
pixelroot 0834779405 Merge remote branch 'upstream/master' 2012-09-24 10:16:05 +02:00
pixelroot 05223cc325 modified: view/theme/smoothly/search_item.tpl 
modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_item.tpl
	modified:   view/theme/smoothly/wall_thread.tpl
	modified:   view/theme/smoothly/wallwall_item.tpl
	modified:   view/theme/smoothly/wallwall_thread.tpl
 2012-09-24 10:15:31 +02:00
friendica 94f3aef1ea allow a bit more height 2012-09-24 00:46:00 -07:00
friendica 316014e4ea restore category/file display on dispy/diabook 2012-09-24 00:35:19 -07:00
pixelroot 57849ff959 modified: view/theme/smoothly/style.css 2012-09-21 08:57:22 +02:00
pixelroot fa2156a9c1 modified: view/theme/smoothly/style.css 2012-09-20 13:26:53 +02:00
pixelroot 8a8fe725af modified: view/theme/smoothly/style.css 2012-09-20 13:25:12 +02:00
pixelroot 85c0260f33 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-09-20 13:15:01 +02:00
pixelroot 12f7c32f9b modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2012-09-20 11:32:55 +02:00
pixelroot 49098ed11d deleted: view/theme/smoothly/match.tpl 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-20 09:25:53 +02:00
Zach Prezkuta 1aa111387a -- Fix Diaspora profile update avatar bugs 
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
 2012-09-19 20:35:39 -06:00
friendica c11aa30ef4 this is not the best solution, but don't close the comment-bb buttons when you click outside the comment, because the comment-bb buttons are outside the comment and if you click one on an empty comment box the comment goes away completely and the bbcode doesn't get inserted. 2012-09-19 18:24:20 -07:00
friendica 51bee79b21 Merge https://github.com/friendica/friendica into pull 
Conflicts:
	view/theme/smoothly/follow.tpl
 2012-09-19 15:39:19 -07:00
friendica 09a00a9a07 html tag completed early 2012-09-19 15:34:21 -07:00
pixelroot 31064a15ec modified: view/theme/smoothly/theme.php 2012-09-19 16:16:58 +02:00
pixelroot a4f25f6eaa modified: view/theme/smoothly/style.css 2012-09-19 16:14:45 +02:00
pixelroot 05a61b80e2 modified: view/theme/smoothly/follow.tpl 
modified:   view/theme/smoothly/jot.tpl
	modified:   view/theme/smoothly/peoplefind.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_item.tpl
	modified:   view/theme/smoothly/wall_thread.tpl
	modified:   view/theme/smoothly/wallwall_item.tpl
	modified:   view/theme/smoothly/wallwall_thread.tpl
 2012-09-19 15:53:37 +02:00
Thomas Willingham 96d6d6b988 Pull request #487 2012-09-18 16:15:36 +01:00
Alex 61eb884a20 Update view/theme/smoothly/bottom.tpl 2012-09-18 13:13:05 +03:00
Christian Vogeley c024ed601e Remove and ignore .DS_Store 2012-09-17 23:03:34 +02:00
Christian Vogeley 318bc23e8a Add notifications in title 2012-09-17 20:39:34 +02:00
Thomas Willingham e34b8e6d46 Pull request #484 (Smoothly) 2012-09-17 18:37:44 +01:00
tomtom84 68c2316ce3 Corrected titlebar notifications in Diabook 2012-09-17 17:54:07 +02:00
Thomas Willingham 11eebf7091 Add titlebar notifications to Dispy. 2012-09-17 14:54:40 +01:00
Thomas Willingham 9cabcad36c Add title bar notifications to Smoothly 2012-09-17 14:53:17 +01:00
Alex f558a1fe8d Merge pull request #482 from pixelroot/master 
bug fix
 2012-09-17 05:12:53 -07:00
pixelroot ede6b4ad12 modified: view/theme/smoothly/style.css 2012-09-17 14:16:13 +02:00
pixelroot 176fe0351a new file: view/theme/smoothly/shiny.png 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-17 13:49:09 +02:00
Alex 01daaafc92 Merge pull request #481 from pixelroot/master 
Better mark new posts
 2012-09-17 04:46:00 -07:00
pixelroot cd3938dfda new file: view/theme/smoothly/default.php 
new file:   view/theme/smoothly/footer.tpl
	new file:   view/theme/smoothly/header.tpl
	modified:   view/theme/smoothly/nav.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-17 11:22:12 +02:00
Alex 06c9330c5e Merge pull request #480 from pixelroot/master 
Bug fixes
 2012-09-17 02:20:07 -07:00
Fabrixxm 6deb070890 quattro: first work on font size options 2012-09-17 03:29:58 -04:00
Zach Prezkuta ab10a7b56b missed one 2012-09-16 18:57:04 -06:00
Zach Prezkuta 3c7419ec57 various bug fixes 2012-09-16 18:56:31 -06:00
Tobias Diekershoff d29da99dbd frost: added some missing baseurls to nav.tpl 2012-09-16 18:33:55 +02:00
friendica 2abbd1dc19 permissions selector showing up for guests, testbubble and smoothly 2012-09-15 20:21:17 -07:00
pixelroot 816680ca85 new file: view/theme/smoothly/bottom.tpl 
new file:   view/theme/smoothly/js/jquery.autogrow.textarea.js
	new file:   view/theme/smoothly/js/modernizr.custom.2.5.3.js
	new file:   view/theme/smoothly/js/modernizr.custom.2.5.3.min.js
 2012-09-14 19:08:39 +02:00