Commit graph

2591 commits

Author SHA1 Message Date
Thomas Willingham 589f3603ae Diabook - grep replace missed this 2012-11-18 21:27:02 +00:00
Tobias Diekershoff f9fbab948e ZH-CN: initial pieces of the Chinese (China) translation. Thx to matthew_exon 2012-11-18 20:10:05 +01:00
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
Tobias Diekershoff 94a16f23c4 DE: update to the strings 2012-11-16 09:58:00 +01: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 4c6401cfb0 Merge branch 'master' of https://github.com/friendica/friendica 2012-11-13 15:52:16 +00:00
Tobias Diekershoff 4b5dea5c89 Update view/pl/strings.php 2012-11-13 16:52:18 +01: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 ce12b3d2f0 Merge pull request #535 from fabrixxm/master
fix \"" issue in util/po2php.php
2012-11-13 07:16:22 -08:00
Fabrixxm 7093c1b9f6 update all languages strings.php 2012-11-13 10:13:28 -05:00
Tobias Diekershoff 9886139d71 PL: update to the strings 2012-11-13 15:39:07 +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 d40099e97c add $item.shiny to default template 2012-11-12 12:55:18 -05: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
Tobias Diekershoff f28b49e6d8 PL: update to the strings 2012-11-11 10:56:07 +01:00
Tobias Diekershoff c88e7d75c0 CS: update to the strings 2012-11-11 10:55:47 +01: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
Tobias Diekershoff 7187107034 glitch with DE, PL strings 2012-11-10 08:50:26 +01:00
Tobias Diekershoff 286578542f DE: update to the strings 2012-11-10 08:37:21 +01:00
Tobias Diekershoff 85feaa1a8d PL: update to the strings 2012-11-10 08:36:43 +01:00
Michael Vogel 71e43e68d4 Merge remote-tracking branch 'upstream/master' 2012-11-09 23:40:17 +01:00
Fabrixxm ff659a822b add apple/gnome web app tags 2012-11-09 13:23:47 -05: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 225fd777fd PL: added Polish localization. Tha to Adam Jurkiewicz and the rest of the translation team :-) 2012-11-08 18:54:42 +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
Fabrixxm 5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
Fabrixxm aa20042bec moveme: fix contact photos 2012-11-05 09:18:55 +01:00
Tobias Diekershoff 2093fa8b3f DE: update to the strings 2012-11-05 07:29:55 +01: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
Tobias Diekershoff 9086641fd1 ES: update to the strings 2012-11-01 13:12:54 +01:00
Tobias Diekershoff 4832bc74f5 FR: update to the strings 2012-11-01 13:03:25 +01:00
Fabrixxm 1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01:00
Tobias Diekershoff 70f8a69ef3 IT: update to the strings 2012-10-31 07:42:23 +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
Fabrixxm dbc6cbe024 moveme: send and receive DFRN "relocate" message (WIP) 2012-10-29 17:50:55 +01:00
Fabrixxm c51e057fe6 Merge remote branch 'friendica/master' into moveme 2012-10-29 05:57:58 -04: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