From 4954e46bb2ba36c749b638111dc90500e12cedf7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 15 Aug 2012 17:38:55 +0200
Subject: Use core routes in js too

---
 core/js/js.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 7bded8e1414..6881090f62e 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -54,9 +54,9 @@ OC={
 		var isCore=OC.coreApps.indexOf(app)!=-1;
 		var link=OC.webroot;
 		if((file.substring(file.length-3) == 'php' || file.substring(file.length-3) == 'css') && !isCore){
-			link+='/?app=' + app;
+			link+='/index.php/apps/' + app;
 			if (file != 'index.php') {
-				link+='&getfile=';
+				link+='/';
 				if(type){
 					link+=encodeURI(type + '/');
 				}
-- 
cgit v1.2.3


From bb136b9adf021cb154ff05222d3439373312bbc5 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 29 Sep 2012 18:08:54 +0200
Subject: Make the settings ajax calls use the router

---
 core/js/js.js                     |  7 ++++-
 core/routes.php                   | 14 +--------
 settings/ajax/apps/ocs.php        |  3 --
 settings/ajax/changepassword.php  |  2 --
 settings/ajax/creategroup.php     |  2 --
 settings/ajax/createuser.php      |  2 --
 settings/ajax/disableapp.php      |  2 --
 settings/ajax/enableapp.php       |  2 --
 settings/ajax/getlog.php          |  3 --
 settings/ajax/lostpassword.php    |  2 --
 settings/ajax/openid.php          |  3 --
 settings/ajax/removegroup.php     |  3 --
 settings/ajax/removeuser.php      |  3 --
 settings/ajax/setlanguage.php     |  3 --
 settings/ajax/setloglevel.php     |  1 -
 settings/ajax/setquota.php        |  3 --
 settings/ajax/togglegroups.php    |  3 --
 settings/ajax/togglesubadmins.php |  5 +---
 settings/ajax/userlist.php        |  4 +--
 settings/js/users.js              |  2 +-
 settings/routes.php               | 62 +++++++++++++++++++++++++++++++++++++++
 21 files changed, 72 insertions(+), 59 deletions(-)
 create mode 100644 settings/routes.php

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 39a58a24599..ffe3507a4eb 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -88,7 +88,12 @@ var OC={
 			}
 			link+=file;
 		}else{
-			link+='/';
+			if (app == 'settings' && type == 'ajax') {
+				link+='/index.php/';
+			}
+			else {
+				link+='/';
+			}
 			if(!isCore){
 				link+='apps/';
 			}
diff --git a/core/routes.php b/core/routes.php
index 9a84eb64a3b..b0f41dd2861 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -6,19 +6,7 @@
  * See the COPYING-README file.
  */
 
-// Core settings pages
-$this->create('settings_help', '/settings/help')
-	->actionInclude('settings/help.php');
-$this->create('settings_personal', '/settings/personal')
-	->actionInclude('settings/personal.php');
-$this->create('settings_settings', '/settings')
-	->actionInclude('settings/settings.php');
-$this->create('settings_users', '/settings/users')
-	->actionInclude('settings/users.php');
-$this->create('settings_apps', '/settings/apps')
-	->actionInclude('settings/apps.php');
-$this->create('settings_admin', '/settings/admin')
-	->actionInclude('settings/admin.php');
+require_once('settings/routes.php');
 
 // Not specifically routed
 $this->create('app_css', '/apps/{app}/{file}')
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index fb78cc89248..4d6f1116e7d 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -6,9 +6,6 @@
  * See the COPYING-README file.
  */
 
-// Init owncloud
-require_once '../../../lib/base.php';
-
 OC_JSON::checkAdminUser();
 
 $l = OC_L10N::get('settings');
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index b251fea504b..200fdec26de 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OCP\JSON::callCheck();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 83733ac4d2d..bb3b0620e8a 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OCP\JSON::callCheck();
 
 // Check if we are a user
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index bdf7e4983ac..49fc0e0f53b 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OCP\JSON::callCheck();
 
 // Check if we are a user
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index 977a536af21..a39b06b9c7d 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -1,6 +1,4 @@
 <?php
-// Init owncloud
-require_once '../../lib/base.php';
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index c3b3491db93..f4d5c53adef 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index 9b9240f8253..22128ef57b5 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -5,9 +5,6 @@
  * See the COPYING-README file.
  */
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkAdminUser();
 
 $count=(isset($_GET['count']))?$_GET['count']:50;
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 2a40ba09a8a..b5f47bbceab 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index ecec085383c..23c43c3c48e 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 $l=OC_L10N::get('settings');
 
 OC_JSON::checkLoggedIn();
diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index 33e1a514c88..798d7916e61 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 6b11fa5c4fb..a10dc29321d 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index 42eea7a96fd..aebb1b31b6f 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 $l=OC_L10N::get('settings');
 
 OC_JSON::checkLoggedIn();
diff --git a/settings/ajax/setloglevel.php b/settings/ajax/setloglevel.php
index 982899e106a..542219f86c6 100644
--- a/settings/ajax/setloglevel.php
+++ b/settings/ajax/setloglevel.php
@@ -5,7 +5,6 @@
  * See the COPYING-README file.
  */
 
-require_once '../../lib/base.php';
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 2352ae9e427..4b32585b306 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -5,9 +5,6 @@
  * See the COPYING-README file.
  */
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 65747968c17..de941f99132 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 5f7126dca34..7aaa90aad5f 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
@@ -16,4 +13,4 @@ if(OC_SubAdmin::isSubAdminofGroup($username, $group)) {
 	OC_SubAdmin::createSubAdmin($username, $group);
 }
 
-OC_JSON::success();
\ No newline at end of file
+OC_JSON::success();
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 840b6d72dc7..61b1a388fc3 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -20,8 +20,6 @@
  *
  */
 
-require_once '../../lib/base.php';
-
 OC_JSON::callCheck();
 OC_JSON::checkSubAdminUser();
 if (isset($_GET['offset'])) {
@@ -49,4 +47,4 @@ if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
 }
-OC_JSON::success(array('data' => $users));
\ No newline at end of file
+OC_JSON::success(array('data' => $users));
diff --git a/settings/js/users.js b/settings/js/users.js
index 20bd94993bc..81a3181ba59 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -130,7 +130,7 @@ var UserList={
 		if (typeof UserList.offset === 'undefined') {
 			UserList.offset = $('tbody tr').length;
 		}
-		$.get(OC.filePath('settings', 'ajax', 'userlist.php'), { offset: UserList.offset }, function(result) {
+		$.get(OC.filePath('settings', 'ajax', 'userlist'), { offset: UserList.offset }, function(result) {
 			if (result.status === 'success') {
 				$.each(result.data, function(index, user) {
 					var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
diff --git a/settings/routes.php b/settings/routes.php
new file mode 100644
index 00000000000..b64a357be0e
--- /dev/null
+++ b/settings/routes.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Settings pages
+$this->create('settings_help', '/settings/help')
+	->actionInclude('settings/help.php');
+$this->create('settings_personal', '/settings/personal')
+	->actionInclude('settings/personal.php');
+$this->create('settings_settings', '/settings')
+	->actionInclude('settings/settings.php');
+$this->create('settings_users', '/settings/users')
+	->actionInclude('settings/users.php');
+$this->create('settings_apps', '/settings/apps')
+	->actionInclude('settings/apps.php');
+$this->create('settings_admin', '/settings/admin')
+	->actionInclude('settings/admin.php');
+// Settings ajax actions
+// users
+$this->create('settings_admin', '/settings/ajax/userlist')
+	->actionInclude('settings/ajax/userlist.php');
+$this->create('settings_ajax_createuser', '/settings/ajax/createuser.php')
+	->actionInclude('settings_ajax_createuser');
+$this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php')
+	->actionInclude('settings/ajax/removeuser.php');
+$this->create('settings_ajax_setquota', '/settings/ajax/setquota.php')
+	->actionInclude('settings/ajax/setquota.php');
+$this->create('settings_ajax_creategroup', '/settings/ajax/creategroup.php')
+	->actionInclude('settings_ajax_creategroup');
+$this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php')
+	->actionInclude('settings/ajax/togglegroups.php');
+$this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php')
+	->actionInclude('settings/ajax/togglesubadmins.php');
+$this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
+	->actionInclude('settings/ajax/removegroup.php');
+$this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php')
+	->actionInclude('settings/ajax/changepassword.php');
+// personel
+$this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
+	->actionInclude('settings/ajax/lostpassword.php');
+$this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
+	->actionInclude('settings/ajax/setlanguage.php');
+// apps
+$this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
+	->actionInclude('settings/ajax/apps/ocs.php');
+$this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
+	->actionInclude('settings/ajax/enableapp.php');
+$this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php')
+	->actionInclude('settings/ajax/disableapp.php');
+// admin
+$this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
+	->actionInclude('settings/ajax/getlog.php');
+$this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
+	->actionInclude('settings/ajax/setloglevel.php');
+
+// apps/user_openid
+$this->create('settings_ajax_openid', '/settings/ajax/openid.php')
+	->actionInclude('settings/ajax/openid.php');
-- 
cgit v1.2.3


From de1bfe9d6b50c37c6999ff652a31535b0a2faf41 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 2 Oct 2012 21:57:51 +0200
Subject: Make the core ajax calls use the router

---
 core/ajax/appconfig.php          |  1 -
 core/ajax/requesttoken.php       |  1 -
 core/ajax/share.php              |  1 -
 core/ajax/translations.php       |  3 ---
 core/ajax/vcategories/add.php    |  1 -
 core/ajax/vcategories/delete.php |  1 -
 core/ajax/vcategories/edit.php   |  1 -
 core/js/js.js                    |  2 +-
 core/routes.php                  | 21 +++++++++++++++++++++
 9 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 1b43afa74fb..4f26dedc797 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -5,7 +5,6 @@
  * See the COPYING-README file.
  */
 
-require_once "../../lib/base.php";
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php
index 96d5402e621..84089de8b9d 100644
--- a/core/ajax/requesttoken.php
+++ b/core/ajax/requesttoken.php
@@ -26,7 +26,6 @@
  * @return json: success/error state indicator including a fresh request token
  * @author Christian Reiner
  */
-require_once '../../lib/base.php';
 
 // don't load apps or filesystem for this task
 $RUNTIME_NOAPPS    = TRUE;
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 446d4cc32ec..b6f96bfd340 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -18,7 +18,6 @@
 * You should have received a copy of the GNU Affero General Public
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
-require_once '../../lib/base.php';
 
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index 75679da2c04..e22cbad4708 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -21,9 +21,6 @@
 *
 */
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 $app = $_POST["app"];
 
 $l = OC_L10N::get( $app );
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index 81fa06dbf19..8d31275dbfb 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -14,7 +14,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 $category = isset($_GET['category'])?strip_tags($_GET['category']):null;
 $app = isset($_GET['app'])?$_GET['app']:null;
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index cd46a25b79d..74b0220870c 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -15,7 +15,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 $app = isset($_POST['app'])?$_POST['app']:null;
 $categories = isset($_POST['categories'])?$_POST['categories']:null;
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index a0e67841c55..caeebcaa940 100644
--- a/core/ajax/vcategories/edit.php
+++ b/core/ajax/vcategories/edit.php
@@ -15,7 +15,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 $app = isset($_GET['app'])?$_GET['app']:null;
 
diff --git a/core/js/js.js b/core/js/js.js
index ffe3507a4eb..8f3b5a6af1e 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -88,7 +88,7 @@ var OC={
 			}
 			link+=file;
 		}else{
-			if (app == 'settings' && type == 'ajax') {
+			if ((app == 'settings' || app == 'core') && type == 'ajax') {
 				link+='/index.php/';
 			}
 			else {
diff --git a/core/routes.php b/core/routes.php
index b0f41dd2861..d396ddd6473 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -8,6 +8,27 @@
 
 require_once('settings/routes.php');
 
+// Core ajax actions
+// AppConfig
+$this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
+	->actionInclude('core/ajax/appconfig.php');
+// RequestToken
+$this->create('core_ajax_requesttoken', '/core/ajax/requesttoken.php')
+	->actionInclude('core/ajax/requesttoken.php');
+// Share
+$this->create('core_ajax_share', '/core/ajax/share.php')
+	->actionInclude('core/ajax/share.php');
+// Translations
+$this->create('core_ajax_translations', '/core/ajax/translations.php')
+	->actionInclude('core/ajax/translations.php');
+// VCategories
+$this->create('core_ajax_vcategories_add', '/core/ajax/vcategories/add.php')
+	->actionInclude('core/ajax/vcategories/add.php');
+$this->create('core_ajax_vcategories_delete', '/core/ajax/vcategories/delete.php')
+	->actionInclude('core/ajax/vcategories/delete.php');
+$this->create('core_ajax_vcategories_edit', '/core/ajax/vcategories/edit.php')
+	->actionInclude('core/ajax/vcategories/edit.php');
+
 // Not specifically routed
 $this->create('app_css', '/apps/{app}/{file}')
 	->requirements(array('file' => '.*.css'))
-- 
cgit v1.2.3


From 41b597e179a694973c709613cdf41e2b379c8df9 Mon Sep 17 00:00:00 2001
From: scambra <sergio@entrecables.com>
Date: Fri, 21 Sep 2012 08:33:26 +0200
Subject: Translate formatDate using jquery datepicker

---
 core/js/js.js                  | 4 +---
 core/l10n/l10n-de.php          | 1 +
 core/l10n/l10n-en.php          | 1 +
 core/l10n/l10n-es.php          | 1 +
 core/templates/layout.user.php | 1 +
 lib/l10n.php                   | 2 ++
 6 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index ba8020c89ed..c5e32f3c278 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -667,9 +667,7 @@ function formatDate(date){
 	if(typeof date=='number'){
 		date=new Date(date);
 	}
-	var monthNames = [ t('files','January'), t('files','February'), t('files','March'), t('files','April'), t('files','May'), t('files','June'),
-	t('files','July'), t('files','August'), t('files','September'), t('files','October'), t('files','November'), t('files','December') ];
-	return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
+	return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
 }
 
 /**
diff --git a/core/l10n/l10n-de.php b/core/l10n/l10n-de.php
index d80c3beb2ba..77d35af4936 100644
--- a/core/l10n/l10n-de.php
+++ b/core/l10n/l10n-de.php
@@ -1,5 +1,6 @@
 <?php
 $LOCALIZATIONS = array(
+	'jsdate' => 'dd.mm.yy',
 	'date' => '%d.%m.%Y',
 	'datetime' => '%d.%m.%Y %H:%M:%S',
 	'time' => '%H:%M:%S',
diff --git a/core/l10n/l10n-en.php b/core/l10n/l10n-en.php
index 6268214b503..9ee748bee23 100644
--- a/core/l10n/l10n-en.php
+++ b/core/l10n/l10n-en.php
@@ -1,5 +1,6 @@
 <?php
 $LOCALIZATIONS = array(
+	'jsdate' => 'MM d, yy',
 	'date' => '%B %e, %Y',
 	'datetime' => '%B %e, %Y %H:%M',
 	'time' => '%H:%M:%S',
diff --git a/core/l10n/l10n-es.php b/core/l10n/l10n-es.php
index 8798b24d62f..13db2ec5d4c 100644
--- a/core/l10n/l10n-es.php
+++ b/core/l10n/l10n-es.php
@@ -1,5 +1,6 @@
 <?php
 $LOCALIZATIONS = array(
+	'jsdate' => "d 'de' MM 'de' yy",
 	'date' => '%e de %B de %Y',
 	'datetime' => '%e de %B de %Y %H:%M',
 	'time' => '%H:%M:%S',
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 92d47cc51f8..1f16fdf7c6c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -13,6 +13,7 @@
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
 			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
+			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate')) ?>;
 			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
 			var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
 			var firstDay = <?php echo json_encode($l->l('firstday')) ?>;
diff --git a/lib/l10n.php b/lib/l10n.php
index 72ac9e353d8..18706e4b4a5 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -58,6 +58,7 @@ class OC_L10N{
 	 * Localization
 	 */
 	private $localizations = array(
+		'jsdate' => 'dd.mm.yy',
 		'date' => '%d.%m.%Y',
 		'datetime' => '%d.%m.%Y %H:%M:%S',
 		'time' => '%H:%M:%S',
@@ -223,6 +224,7 @@ class OC_L10N{
 				return strftime($this->localizations[$type], $data);
 				break;
 			case 'firstday':
+			case 'jsdate':
 				return $this->localizations[$type];
 			default:
 				return false;
-- 
cgit v1.2.3


From 939b51e46f23fe6f5991a05862da94bb3adff1ab Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 27 Oct 2012 15:10:21 +0200
Subject: Fix download url generation

---
 apps/files/js/fileactions.js | 2 +-
 core/js/js.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 0cf4a052225..1cf80352bef 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -157,7 +157,7 @@ $(document).ready(function(){
 		var downloadScope = 'file';
 	}
 	FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download');},function(filename){
-		window.location=OC.filePath('files', 'ajax', 'download.php') + '&files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val());
+		window.location=OC.filePath('files', 'ajax', 'download.php') + '?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val());
 	});
 });
 
diff --git a/core/js/js.js b/core/js/js.js
index 130d413296e..6ed50b42bd5 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -62,7 +62,7 @@ function escapeHTML(s) {
 * @return string
 */
 function fileDownloadPath(dir, file) {
-	return OC.filePath('files', 'ajax', 'download.php')+'&files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
+	return OC.filePath('files', 'ajax', 'download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
 }
 
 var OC={
-- 
cgit v1.2.3


From a6f3a570c68440eeb51d8b25cf7a1cef0f723a15 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Sat, 27 Oct 2012 19:42:25 +0200
Subject: dont resize content div with javascript but use css box-sizing to do
 it

---
 core/css/styles.css |  9 ++++++++-
 core/js/js.js       | 36 ------------------------------------
 2 files changed, 8 insertions(+), 37 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/css/styles.css b/core/css/styles.css
index 677d44658e8..1fc958940cc 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -56,7 +56,14 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
 /* CONTENT ------------------------------------------------------------------ */
 #controls { padding: 0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
 #controls .button { display:inline-block; }
-#content { top:3.5em; left:64px; position: absolute; }
+#content { 
+	height: 100%; 
+	width: 100%;
+	padding-top: 3.5em;
+	padding-left: 64px;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+}
 #leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
 #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
 #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
diff --git a/core/js/js.js b/core/js/js.js
index c5e32f3c278..3bc988a2b6e 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -464,44 +464,8 @@ function object(o) {
 }
 
 
-/**
- * Fills height of window. (more precise than height: 100%;)
- */
-function fillHeight(selector) {
-	if (selector.length === 0) {
-		return;
-	}
-	var height = parseFloat($(window).height())-selector.offset().top;
-	selector.css('height', height + 'px');
-	if(selector.outerHeight() > selector.height()){
-		selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
-	}
-}
-
-/**
- * Fills height and width of window. (more precise than height: 100%; or width: 100%;)
- */
-function fillWindow(selector) {
-	if (selector.length === 0) {
-		return;
-	}
-	fillHeight(selector);
-	var width = parseFloat($(window).width())-selector.offset().left;
-	selector.css('width', width + 'px');
-	if(selector.outerWidth() > selector.width()){
-		selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
-	}
-}
-
 $(document).ready(function(){
 
-	$(window).resize(function () {
-		fillHeight($('#leftcontent'));
-		fillWindow($('#content'));
-		fillWindow($('#rightcontent'));
-	});
-	$(window).trigger('resize');
-
 	if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
 		replaceSVG();
 	}else{
-- 
cgit v1.2.3


From 71435ac1ccdceb75342202c86a763b4f3f7c8b0e Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Sun, 28 Oct 2012 16:47:25 +0100
Subject: improve user menu

---
 core/css/styles.css | 7 ++++---
 core/js/js.js       | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/css/styles.css b/core/css/styles.css
index 677d44658e8..bacb6367e86 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -106,9 +106,10 @@ label.infield { cursor: text !important; }
 #expand:hover, #expand:focus, #expand:active { color:#fff; }
 #expand img { opacity:.5; margin-bottom:-2px; }
 #expand:hover img, #expand:focus img, #expand:active img { opacity:1; }
-#expanddiv { position:absolute; right:0; background-color:rgb(29, 45, 68); }
-#expanddiv a { color:#ccc; padding:5px 8px; }
-#expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { color:#fff; }
+#expanddiv { position:absolute; right:0; top:45px; background-color:#eee; border-bottom-left-radius:7px; box-shadow: 0 0 20px #888888; z-index:76; }
+#expanddiv a { display:block; color:#222; text-shadow:0 1px 0 #fff; padding:0 8px; }
+#expanddiv a img { margin-bottom:-3px; }
+#expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { color:#555; background-color:#ddd; }
 
 /* VARIOUS REUSABLE SELECTORS */
 .hidden { display:none; }
diff --git a/core/js/js.js b/core/js/js.js
index 6ed50b42bd5..d0399063cfc 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -590,9 +590,7 @@ $(document).ready(function(){
 		event.stopPropagation();
 	});
 	$(window).click(function(){//hide the settings menu when clicking outside it
-		if($('body').attr("id")==="body-user"){
-			$('#settings #expanddiv').slideUp();
-		}
+		$('#settings #expanddiv').slideUp();
 	});
 
 	// all the tipsy stuff needs to be here (in reverse order) to work
-- 
cgit v1.2.3


From c4b8bb10411a4d601b7f4c8758980005f14850ab Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Mon, 29 Oct 2012 01:14:07 +0100
Subject: added old functions again to not break apps, but show a deprecation
 warning

---
 core/js/js.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index ee8bdea7255..a30d66c00b8 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -468,6 +468,36 @@ function object(o) {
 	return new F();
 }
 
+/**
+ * Fills height of window. (more precise than height: 100%;)
+ */
+function fillHeight(selector) {
+	if (selector.length === 0) {
+		return;
+	}
+	var height = parseFloat($(window).height())-selector.offset().top;
+	selector.css('height', height + 'px');
+	if(selector.outerHeight() > selector.height()){
+		selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
+	}
+	console.warn("This function is deprecated! Use CSS instead");
+}
+
+/**
+ * Fills height and width of window. (more precise than height: 100%; or width: 100%;)
+ */
+function fillWindow(selector) {
+	if (selector.length === 0) {
+		return;
+	}
+	fillHeight(selector);
+	var width = parseFloat($(window).width())-selector.offset().left;
+	selector.css('width', width + 'px');
+	if(selector.outerWidth() > selector.width()){
+		selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
+	}
+	console.warn("This function is deprecated! Use CSS instead");
+}
 
 $(document).ready(function(){
 
-- 
cgit v1.2.3


From ed7accd237bae2bd76df5e6256d8ee2ce2f14308 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 28 Oct 2012 19:28:44 +0100
Subject: Change search to use routing

---
 core/js/js.js          | 2 +-
 core/routes.php        | 3 +++
 search/ajax/search.php | 8 +++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 6ed50b42bd5..2073fc4d4b7 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -113,7 +113,7 @@ var OC={
 			}
 			link+=file;
 		}else{
-			if ((app == 'settings' || app == 'core') && type == 'ajax') {
+			if ((app == 'settings' || app == 'core' || app == 'search') && type == 'ajax') {
 				link+='/index.php/';
 			}
 			else {
diff --git a/core/routes.php b/core/routes.php
index 186fa8ae562..5c99c542d48 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -9,6 +9,9 @@
 require_once 'settings/routes.php';
 
 // Core ajax actions
+// Search
+$this->create('search_ajax_search', '/search/ajax/search.php')
+	->actionInclude('search/ajax/search.php');
 // AppConfig
 $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
 	->actionInclude('core/ajax/appconfig.php');
diff --git a/search/ajax/search.php b/search/ajax/search.php
index 41ee9ad5aba..f0ca5752b9a 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -21,17 +21,15 @@
 *
 */
 
-
-// Init owncloud
-require_once '../../lib/base.php';
-
 // Check if we are a user
 OC_JSON::checkLoggedIn();
+OC_App::loadApps();
 
 $query=(isset($_GET['query']))?$_GET['query']:'';
 if($query) {
 	$result=OC_Search::search($query);
 	OC_JSON::encodedPrint($result);
-}else{
+}
+else {
 	echo 'false';
 }
-- 
cgit v1.2.3


From c2d6ac53b2cbfb59bb9b34025ee1348c67340c39 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Tue, 6 Nov 2012 11:01:02 +0100
Subject: fix human filesize column header

---
 core/js/js.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 2073fc4d4b7..87d0a172082 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -649,7 +649,7 @@ $.fn.filterAttr = function(attr_name, attr_value) {
 function humanFileSize(size) {
 	var humanList = ['B', 'kB', 'MB', 'GB', 'TB'];
 	// Calculate Log with base 1024: size = 1024 ** order
-	var order = Math.floor(Math.log(size) / Math.log(1024));
+	var order = size?Math.floor(Math.log(size) / Math.log(1024)):0;
 	// Stay in range of the byte sizes that are defined
 	order = Math.min(humanList.length - 1, order);
 	var readableFormat = humanList[order];
-- 
cgit v1.2.3


From 50dbb30eb9968cd328915c4632f2742e6e41ad66 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Tue, 6 Nov 2012 10:56:42 -0500
Subject: Moved relative_modified_date from file/js to core/js

---
 apps/files/js/files.js | 21 ---------------------
 core/js/js.js          | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 21 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 2d9ccba424a..7506000d216 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -829,27 +829,6 @@ function getSelectedFiles(property){
 	return files;
 }
 
-function relative_modified_date(timestamp) {
-	var timediff = Math.round((new Date()).getTime() / 1000) - timestamp;
-	var diffminutes = Math.round(timediff/60);
-	var diffhours = Math.round(diffminutes/60);
-	var diffdays = Math.round(diffhours/24);
-	var diffmonths = Math.round(diffdays/31);
-	if(timediff < 60) { return t('files','seconds ago'); }
-	else if(timediff < 120) { return t('files','1 minute ago'); }
-	else if(timediff < 3600) { return t('files','{minutes} minutes ago',{minutes: diffminutes}); }
-	//else if($timediff < 7200) { return '1 hour ago'; }
-	//else if($timediff < 86400) { return $diffhours.' hours ago'; }
-	else if(timediff < 86400) { return t('files','today'); }
-	else if(timediff < 172800) { return t('files','yesterday'); }
-	else if(timediff < 2678400) { return t('files','{days} days ago',{days: diffdays}); }
-	else if(timediff < 5184000) { return t('files','last month'); }
-	//else if($timediff < 31556926) { return $diffmonths.' months ago'; }
-	else if(timediff < 31556926) { return t('files','months ago'); }
-	else if(timediff < 63113852) { return t('files','last year'); }
-	else { return t('files','years ago'); }
-}
-
 function getMimeIcon(mime, ready){
 	if(getMimeIcon.cache[mime]){
 		ready(getMimeIcon.cache[mime]);
diff --git a/core/js/js.js b/core/js/js.js
index 87d0a172082..2b2a64d25f9 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -675,6 +675,30 @@ function formatDate(date){
 	return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
 }
 
+/* takes an absolute timestamp and return a string with a human-friendly relative date
+ * @param int a Unix timestamp
+ */
+function relative_modified_date(timestamp) {
+	var timediff = Math.round((new Date()).getTime() / 1000) - timestamp;
+	var diffminutes = Math.round(timediff/60);
+	var diffhours = Math.round(diffminutes/60);
+	var diffdays = Math.round(diffhours/24);
+	var diffmonths = Math.round(diffdays/31);
+	if(timediff < 60) { return t('core','seconds ago'); }
+	else if(timediff < 120) { return t('core','1 minute ago'); }
+	else if(timediff < 3600) { return t('core','{minutes} minutes ago',{minutes: diffminutes}); }
+	//else if($timediff < 7200) { return '1 hour ago'; }
+	//else if($timediff < 86400) { return $diffhours.' hours ago'; }
+	else if(timediff < 86400) { return t('core','today'); }
+	else if(timediff < 172800) { return t('core','yesterday'); }
+	else if(timediff < 2678400) { return t('core','{days} days ago',{days: diffdays}); }
+	else if(timediff < 5184000) { return t('core','last month'); }
+	//else if($timediff < 31556926) { return $diffmonths.' months ago'; }
+	else if(timediff < 31556926) { return t('core','months ago'); }
+	else if(timediff < 63113852) { return t('core','last year'); }
+	else { return t('core','years ago'); }
+}
+
 /**
  * get a variable by name
  * @param string name
-- 
cgit v1.2.3


From aa917cfb1872e77970ffed5571b5a96dc1387525 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Tue, 13 Nov 2012 19:18:26 -0500
Subject: uncomment hours entries in relative date functions

---
 core/js/js.js    | 13 +++++++------
 lib/template.php |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 2b2a64d25f9..cb6b48b095e 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -641,7 +641,7 @@ if (!Array.prototype.map){
 
 /**
  * Filter Jquery selector by attribute value
- **/
+ */
 $.fn.filterAttr = function(attr_name, attr_value) {
 	return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
 };
@@ -675,7 +675,8 @@ function formatDate(date){
 	return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
 }
 
-/* takes an absolute timestamp and return a string with a human-friendly relative date
+/**
+ * takes an absolute timestamp and return a string with a human-friendly relative date
  * @param int a Unix timestamp
  */
 function relative_modified_date(timestamp) {
@@ -687,14 +688,14 @@ function relative_modified_date(timestamp) {
 	if(timediff < 60) { return t('core','seconds ago'); }
 	else if(timediff < 120) { return t('core','1 minute ago'); }
 	else if(timediff < 3600) { return t('core','{minutes} minutes ago',{minutes: diffminutes}); }
-	//else if($timediff < 7200) { return '1 hour ago'; }
-	//else if($timediff < 86400) { return $diffhours.' hours ago'; }
+	else if($timediff < 7200) { return '1 hour ago'; }
+	else if($timediff < 86400) { return $diffhours.' hours ago'; }
 	else if(timediff < 86400) { return t('core','today'); }
 	else if(timediff < 172800) { return t('core','yesterday'); }
 	else if(timediff < 2678400) { return t('core','{days} days ago',{days: diffdays}); }
 	else if(timediff < 5184000) { return t('core','last month'); }
-	//else if($timediff < 31556926) { return $diffmonths.' months ago'; }
-	else if(timediff < 31556926) { return t('core','months ago'); }
+	else if($timediff < 31556926) { return $diffmonths.' months ago'; }
+	//else if(timediff < 31556926) { return t('core','months ago'); }
 	else if(timediff < 63113852) { return t('core','last year'); }
 	else { return t('core','years ago'); }
 }
diff --git a/lib/template.php b/lib/template.php
index 3d3589abd1e..48224130fa8 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -103,8 +103,8 @@ function relative_modified_date($timestamp) {
 	if($timediff < 60) { return $l->t('seconds ago'); }
 	else if($timediff < 120) { return $l->t('1 minute ago'); }
 	else if($timediff < 3600) { return $l->t('%d minutes ago', $diffminutes); }
-	//else if($timediff < 7200) { return '1 hour ago'; }
-	//else if($timediff < 86400) { return $diffhours.' hours ago'; }
+	else if($timediff < 7200) { return '1 hour ago'; }
+	else if($timediff < 86400) { return $diffhours.' hours ago'; }
 	else if((date('G')-$diffhours) > 0) { return $l->t('today'); }
 	else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); }
 	else if($timediff < 2678400) { return $l->t('%d days ago', $diffdays); }
-- 
cgit v1.2.3


From 7d01342babcd3ce699d05bcceac2690ced110562 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Tue, 13 Nov 2012 19:32:26 -0500
Subject: fix translation issues with previous commit

---
 core/js/js.js    | 6 +++---
 lib/template.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index cb6b48b095e..164fab80ed4 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -688,13 +688,13 @@ function relative_modified_date(timestamp) {
 	if(timediff < 60) { return t('core','seconds ago'); }
 	else if(timediff < 120) { return t('core','1 minute ago'); }
 	else if(timediff < 3600) { return t('core','{minutes} minutes ago',{minutes: diffminutes}); }
-	else if($timediff < 7200) { return '1 hour ago'; }
-	else if($timediff < 86400) { return $diffhours.' hours ago'; }
+	else if(timediff < 7200) { return t('core','1 hour ago'); }
+	else if(timediff < 86400) { return t('core','{hours} hours ago',{hours: diffhours}); }
 	else if(timediff < 86400) { return t('core','today'); }
 	else if(timediff < 172800) { return t('core','yesterday'); }
 	else if(timediff < 2678400) { return t('core','{days} days ago',{days: diffdays}); }
 	else if(timediff < 5184000) { return t('core','last month'); }
-	else if($timediff < 31556926) { return $diffmonths.' months ago'; }
+	else if(timediff < 31556926) { return t('core','{months} months ago',{months: diffmonths}); }
 	//else if(timediff < 31556926) { return t('core','months ago'); }
 	else if(timediff < 63113852) { return t('core','last year'); }
 	else { return t('core','years ago'); }
diff --git a/lib/template.php b/lib/template.php
index 48224130fa8..a10cabf5931 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -103,13 +103,13 @@ function relative_modified_date($timestamp) {
 	if($timediff < 60) { return $l->t('seconds ago'); }
 	else if($timediff < 120) { return $l->t('1 minute ago'); }
 	else if($timediff < 3600) { return $l->t('%d minutes ago', $diffminutes); }
-	else if($timediff < 7200) { return '1 hour ago'; }
-	else if($timediff < 86400) { return $diffhours.' hours ago'; }
+	else if($timediff < 7200) { return $l->t('1 hour ago'); }
+	else if($timediff < 86400) { return $l->t('%d hours ago', $diffhours); }
 	else if((date('G')-$diffhours) > 0) { return $l->t('today'); }
 	else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); }
 	else if($timediff < 2678400) { return $l->t('%d days ago', $diffdays); }
 	else if($timediff < 5184000) { return $l->t('last month'); }
-	else if((date('n')-$diffmonths) > 0) { return $l->t('months ago'); }
+	else if((date('n')-$diffmonths) > 0) { return $l->t('%d months ago', $diffmonths); }
 	else if($timediff < 63113852) { return $l->t('last year'); }
 	else { return $l->t('years ago'); }
 }
-- 
cgit v1.2.3


From b51b9539d074222d01bd4a9836be6fe2f191a31e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 15 Nov 2012 19:43:10 +0100
Subject: Very simple js console switcher.

---
 core/js/js.js                   | 16 ++++++++++++++++
 core/templates/layout.base.php  |  1 +
 core/templates/layout.guest.php |  1 +
 core/templates/layout.user.php  |  1 +
 4 files changed, 19 insertions(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 164fab80ed4..3b4cabe710b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1,3 +1,19 @@
+/**
+ * Disable console output unless DEBUG mode is enabled.
+ * Add 
+ *     define('DEBUG', true);
+ * To the end of config/config.php to enable debug mode.
+ */
+if (oc_debug !== true) {
+	if (!window.console) {
+		window.console = {};
+	}
+	var methods = ['log', 'debug', 'warn', 'info', 'error', 'assert'];
+	for (var i = 0; i < methods.length; i++) {
+	console[methods[i]] = function () { };
+	}
+}
+
 /**
  * translate a string
  * @param app the id of the app for which to translate the string
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index d8f83058775..47f4b423b3e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -8,6 +8,7 @@
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<script type="text/javascript">
+			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 2eaa517b324..e83d9e1a682 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -8,6 +8,7 @@
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<script type="text/javascript">
+			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 451a4685e82..ba5053edecf 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -8,6 +8,7 @@
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<script type="text/javascript">
+			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
-- 
cgit v1.2.3


From 80d8ca24ec5d8b0071c0c901dfe042d99a46fcd7 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Fri, 7 Dec 2012 12:12:40 +0100
Subject: fix svg -> png replacement for android, cleanup and remove obsolete
 css

---
 apps/files/css/files.css       | 61 +++++++++++++++++++++++-------------------
 apps/files/js/files.js         |  8 +-----
 apps/files/templates/index.php |  8 +++---
 core/js/js.js                  |  2 +-
 4 files changed, 39 insertions(+), 40 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 89427124f86..b56d3e29d77 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -5,43 +5,46 @@
 /* FILE MENU */
 .actions { padding:.3em; float:left; height:2em; }
 .actions input, .actions button, .actions .button { margin:0; float:left; }
-#file_menu { right:0; position:absolute; top:0; }
-#file_menu a { display:block; float:left; background-image:none; text-decoration:none; }
-.file_upload_form, #file_newfolder_form { display:inline; float: left; margin:0; padding:0; }
-#fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
-.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
-.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:block; float:left; padding-left:0; overflow:hidden; position:relative; margin:0; margin-left:2px; }
-.file_upload_button_wrapper { position:relative; display:block; width:100%; height:27px; cursor:pointer; z-index:1000; }
-#new { background-color:#5bb75b; float:left; margin:0 0 0 1em; z-index:1010; height:17px; }
+
+#new {
+	height:17px;  margin:0 0 0 1em; z-index:1010; float:left;
+	background-color:#5bb75b;
+	border:1px solid; border-color:#51a351 #419341 #387038;
+	-moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset;
+	-webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset;
+	box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset;
+}
 #new:hover, #upload:hover { background-color:#4b964b; }
 #new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; }
 #new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; }
-#new>ul { display:none; position:fixed; text-align:left; padding:.5em; background:#f8f8f8; margin-top:0.075em; border:1px solid #ddd; min-width:7em; margin-left:-.5em; z-index:-1; }
+#new>ul {
+	display:none; position:fixed; min-width:7em; z-index:-1;
+	padding:.5em; margin-top:0.075em; margin-left:-.5em; 
+	text-align:left;
+	background:#f8f8f8; border:1px solid #ddd;
+}
 #new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em;
 		background-repeat:no-repeat; cursor:pointer; }
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#new { border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; }
 #new .popup { border-top-left-radius:0; z-index:10; }
-#upload { background-image: url('%webroot%/core/img/actions/upload-white.svg');
-	background-repeat: no-repeat;
-	background-position: 7px 6px;
-	padding:0;
-	color:#fff;
-	text-shadow:0 1px 0 #51a351;
+
+#upload { 
+	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
+	color:#fff; text-shadow:0 1px 0 #51a351;
 	border-color:#51a351 #419341 #387038;
 	box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset;
 	background-color:#5bb75b;
-	margin-left:0.2em;
-	height:27px;
-	overflow:hidden;
 }
-
-#file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; }
-
-#file_newfolder_submit, #file_upload_submit { width:3em; }
+#upload a {
+	position:relative; display:block; width:100%; height:27px;
+	cursor:pointer; z-index:1000;
+	background-image: url('%webroot%/core/img/actions/upload-white.svg');
+	background-repeat: no-repeat;
+	background-position: 7px 6px;
+}
 .file_upload_target { display:none; }
-
+.file_upload_form { display:inline; float: left; margin:0; padding:0; cursor:pointer; overflow: visible; }
 #file_upload_start { 
 	left:0; top:0; width:28px; height:27px; padding:0;
 	font-size:1em; 
@@ -51,10 +54,14 @@
 #uploadprogresswrapper { position:absolute; right:13.5em; top:0em; }
 #uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
 
-.file_upload_form, .file_upload_wrapper, #file_upload_start, #file_upload_submit { cursor:pointer; overflow: visible; }
 
 /* FILE TABLE */
-#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
+
+#emptyfolder {
+	position: absolute;
+	margin: 10em 0 0 10em;
+	font-size: 1.5em; font-weight: bold;
+	color: #888; text-shadow: #fff 0 1px 0; }
 table { position:relative; top:37px; width:100%; }
 tbody tr { background-color:#fff; height:2.5em; }
 tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
@@ -78,7 +85,7 @@ table td.filename input.filename { width:100%; cursor:text; }
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
 table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
 /* TODO fix usability bug (accidental file/folder selection) */
-table td.filename .nametext { width:40em; overflow:hidden; text-overflow:ellipsis; }
+table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; }
 table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 7e1a90f45bd..ece0b29ae16 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -66,7 +66,7 @@ $(document).ready(function() {
 	}
 
 	// Triggers invisible file input
-	$('.file_upload_button_wrapper').live('click', function() {
+	$('#upload a').live('click', function() {
 		$(this).parent().children('#file_upload_start').trigger('click');
 		return false;
 	});
@@ -168,12 +168,6 @@ $(document).ready(function() {
 		procesSelection();
 	});
 
-	$('#file_newfolder_name').click(function(){
-		if($('#file_newfolder_name').val() == 'New Folder'){
-			$('#file_newfolder_name').val('');
-		}
-	});
-
 	$('.download').click('click',function(event) {
 		var files=getSelectedFiles('name').join(';');
 		var dir=$('#dir').val()||'/';
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 82dc96d6435..bd34c9a76d9 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -15,7 +15,6 @@
 				</ul>
 			</div>
 			<div id="upload" class="button">
-			<!--div class="file_upload_wrapper"-->
 				<form data-upload-id='1'
 					  id="data-upload-form"
 					  class="file_upload_form"
@@ -31,13 +30,12 @@
 					<input type="hidden" class="max_human_file_size"
 						   value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-					<input  type="file" id="file_upload_start" name='files[]'/>
-					<a href="#" class="file_upload_button_wrapper" onclick="return false;"
+					<input type="file" id="file_upload_start" name='files[]'/>
+					<a href="#" class="svg" onclick="return false;"
 					   title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
 					
-					<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
+					<iframe name="file_upload_target_1" class="file_upload_target" src=""></iframe>
 				</form>
-			<!--/div-->
 			</div>
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar"></div>
diff --git a/core/js/js.js b/core/js/js.js
index 3b4cabe710b..7d967321d93 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -615,7 +615,7 @@ $(document).ready(function(){
 	$('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
 	$('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
 	$('.password .action').tipsy({gravity:'se', fade:true, live:true});
-	$('.file_upload_button_wrapper').tipsy({gravity:'w', fade:true});
+	$('#upload a').tipsy({gravity:'w', fade:true});
 	$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
 	$('a.delete').tipsy({gravity: 'e', fade:true, live:true});
 	$('a.action').tipsy({gravity:'s', fade:true, live:true});
-- 
cgit v1.2.3


From e998da06d1950b5c85205e035a86e7175819a05c Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Tue, 18 Dec 2012 21:38:01 +0100
Subject: fix broken console.log in ie8

---
 core/js/js.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 7d967321d93..503684b8747 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -13,7 +13,13 @@ if (oc_debug !== true) {
 	console[methods[i]] = function () { };
 	}
 }
-
+/**
+ * fix broken console log in ie8
+ */
+if (typeof console === "undefined" || typeof console.log === "undefined") {
+	console = {};
+	console.log = function() {};
+}
 /**
  * translate a string
  * @param app the id of the app for which to translate the string
-- 
cgit v1.2.3


From 5b07e722cbee3582fd461c83f5978001d94da7f8 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Wed, 2 Jan 2013 12:21:30 +0100
Subject: combine ie8 fix with debug check

---
 core/js/js.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 503684b8747..610950995db 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -3,30 +3,24 @@
  * Add 
  *     define('DEBUG', true);
  * To the end of config/config.php to enable debug mode.
+ * The undefined checks fix the broken ie8 console
  */
-if (oc_debug !== true) {
+if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
 	if (!window.console) {
 		window.console = {};
 	}
 	var methods = ['log', 'debug', 'warn', 'info', 'error', 'assert'];
 	for (var i = 0; i < methods.length; i++) {
-	console[methods[i]] = function () { };
+		console[methods[i]] = function () { };
 	}
 }
-/**
- * fix broken console log in ie8
- */
-if (typeof console === "undefined" || typeof console.log === "undefined") {
-	console = {};
-	console.log = function() {};
-}
+
 /**
  * translate a string
  * @param app the id of the app for which to translate the string
  * @param text the string to translate
  * @return string
  */
-
 function t(app,text, vars){
 	if( !( t.cache[app] )){
 		$.ajax(OC.filePath('core','ajax','translations.php'),{
-- 
cgit v1.2.3


From fe4f056a2334f8e6d77c2327eccf9cf3ebc54965 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Wed, 2 Jan 2013 17:04:11 +0100
Subject: use jQuery.parseJSON fallback for IE6/7/8

---
 core/js/js.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 7d967321d93..5a24ba19c0c 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -343,8 +343,15 @@ if(typeof localStorage !=='undefined' && localStorage !== null){
 			return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
 		},
 		getItem:function(name){
-			if(localStorage.getItem(OC.localStorage.namespace+name)===null){return null;}
-			return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
+			var item = localStorage.getItem(OC.localStorage.namespace+name);
+			if(item===null) {
+				return null;
+			} else if (typeof JSON === 'undefined') {
+				//fallback to jquery for IE6/7/8
+				return $.parseJSON(item);
+			} else {
+				return JSON.parse(item);
+			}
 		}
 	};
 }else{
-- 
cgit v1.2.3


From ba475d486258c0b7ea86cd766814053df6c69170 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 4 Jan 2013 23:34:09 +0100
Subject: javascript notification functions have been moved to js.js for common
 use

---
 apps/files/js/filelist.js | 20 ++++++++++----------
 apps/files/js/files.js    | 45 ++++++++++++---------------------------------
 core/js/js.js             | 30 ++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 43 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 031c58e724c..33f35eee6c5 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -199,9 +199,9 @@ var FileList={
 			$('#notification').data('newName', newName);
 			$('#notification').data('isNewFile', isNewFile);
             if (isNewFile) {
-                Files.showHtmlNotification(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+                OC.Notification.showHtml(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
             } else {
-                Files.showHtmlNotification(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+                OC.Notification.showHtml(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
             }
 			return true;
 		} else {
@@ -244,9 +244,9 @@ var FileList={
 			FileList.finishReplace();
 		};
 		if (isNewFile) {
-			Files.showHtmlNotification(t('files', 'replaced {new_name}', {new_name: newName})+'<span class="undo">'+t('files', 'undo')+'</span>');
+			OC.Notification.showHtml(t('files', 'replaced {new_name}', {new_name: newName})+'<span class="undo">'+t('files', 'undo')+'</span>');
 		} else {
-            Files.showHtmlNotification(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
+            OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
 		}
 	},
 	finishReplace:function() {
@@ -277,9 +277,9 @@ var FileList={
 		} else {
 			// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
 			if ($('#dir').val() == '/Shared') {
-				Files.showHtmlNotification(t('files', 'unshared {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
+				OC.Notification.showHtml(t('files', 'unshared {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
 			} else {
-                Files.showHtmlNotification(t('files', 'deleted {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
+                OC.Notification.showHtml(t('files', 'deleted {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
 			}
 		}
 	},
@@ -293,7 +293,7 @@ var FileList={
 				data: {dir:$('#dir').val(),files:fileNames},
 				complete: function(data){
 					boolOperationFinished(data, function(){
-                        Files.hideNotification();
+                        OC.Notification.hide();
 						$.each(FileList.deleteFiles,function(index,file){
 							FileList.remove(file);
 						});
@@ -353,16 +353,16 @@ $(document).ready(function(){
 			FileList.replaceIsNewFile = null;
 		}
 		FileList.lastAction = null;
-        Files.hideNotification();
+        OC.Notification.hide();
 	});
 	$('#notification .replace').live('click', function() {
-        Files.hideNotification(function() {
+        OC.Notification.hide(function() {
             FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'), $('#notification').data('isNewFile'));
         });
 	});
 	$('#notification .suggest').live('click', function() {
 		$('tr').filterAttr('data-file', $('#notification').data('oldName')).show();
-        Files.hideNotification();
+        OC.Notification.hide();
 	});
 	$('#notification .cancel').live('click', function() {
 		if ($('#notification').data('isNewFile')) {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6023cf78e79..6166b240e83 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -30,45 +30,23 @@ Files={
 		var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
 		for (var i = 0; i < invalid_characters.length; i++) {
 			if (name.indexOf(invalid_characters[i]) != -1) {
-				Files.showNotification(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
+				OC.Notification.show(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
 				return true;
 			}
 		}
-        Files.hideNotification();
+        OC.Notification.hide();
 		return false;
 	},
     displayStorageWarnings: function() {
         var usedSpacePercent = $('#usedSpacePercent').val();
         if (usedSpacePercent > 98) {
-            Files.showNotification(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
+            OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
             return;
         }
         if (usedSpacePercent > 90) {
-            Files.showNotification(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent}));
+            OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent}));
         }
-    },
-    hideNotification: function(callback) {
-        $("#notification").text('');
-        $('#notification').fadeOut('400', function(){
-            if ($("#notification").text() === '') {
-                Files.displayStorageWarnings();
-            }
-            if (callback) {
-                callback.call();
-            }
-        });
-    },
-    showHtmlNotification: function(html) {
-        $('#notification').hide();
-        $("#notification").html(html);
-        $("#notification").fadeIn();
-    },
-    showNotification: function(text) {
-        $('#notification').hide();
-        $("#notification").text(text);
-        $("#notification").fadeIn();
     }
-
 };
 $(document).ready(function() {
 	Files.bindKeyboardShortcuts(document, jQuery); 
@@ -202,7 +180,7 @@ $(document).ready(function() {
 	$('.download').click('click',function(event) {
 		var files=getSelectedFiles('name').join(';');
 		var dir=$('#dir').val()||'/';
-        Files.showNotification(t('files','generating ZIP-file, it may take some time.'));
+        OC.Notification.show(t('files','generating ZIP-file, it may take some time.'));
 		// use special download URL if provided, e.g. for public shared files
 		if ( (downloadURL = document.getElementById("downloadURL")) ) {
 			window.location=downloadURL.value+"&download&files="+files;
@@ -331,7 +309,7 @@ $(document).ready(function() {
 											var response;
 											response=jQuery.parseJSON(result);
 											if(response[0] == undefined || response[0].status != 'success') {
-                                                Files.showNotification(t('files', response.data.message));
+                                                OC.Notification.show(t('files', response.data.message));
 											}
 											var file=response[0];
                                             // TODO: this doesn't work if the file name has been changed server side
@@ -368,7 +346,7 @@ $(document).ready(function() {
 										} else {
 											uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
 										}
-                                        Files.showNotification(t('files', 'Upload cancelled.'));
+                                        OC.Notification.show(t('files', 'Upload cancelled.'));
 									}
 								});
 								//TODO test with filenames containing slashes
@@ -391,14 +369,14 @@ $(document).ready(function() {
 												}
 												FileList.loadingDone(file.name, file.id);
 											} else {
-                                                Files.showNotification(t('files', response.data.message));
+                                                OC.Notification.show(t('files', response.data.message));
 												$('#fileList > tr').not('[data-mime]').fadeOut();
 												$('#fileList > tr').not('[data-mime]').remove();
 											}
 										})
 								.error(function(jqXHR, textStatus, errorThrown) {
 									if(errorThrown === 'abort') {
-                                        Files.showNotification(t('files', 'Upload cancelled.'));
+                                        OC.Notification.show(t('files', 'Upload cancelled.'));
 									}
 								});
 								uploadingFiles[uniqueName] = jqXHR;
@@ -418,7 +396,7 @@ $(document).ready(function() {
 								}
 								FileList.loadingDone(file.name, file.id);
 							} else {
-                                Files.showNotification(t('files', response.data.message));
+                                OC.Notification.show(t('files', response.data.message));
 								$('#fileList > tr').not('[data-mime]').fadeOut();
 								$('#fileList > tr').not('[data-mime]').remove();
 							}
@@ -535,7 +513,7 @@ $(document).ready(function() {
 			if (type != 'web' && Files.containsInvalidCharacters($(this).val())) {
 				return;
 			} else if( type == 'folder' && $('#dir').val() == '/' && $(this).val() == 'Shared') {
-                Files.showNotification(t('files','Invalid folder name. Usage of "Shared" is reserved by Owncloud'));
+                OC.Notification.show(t('files','Invalid folder name. Usage of "Shared" is reserved by Owncloud'));
 				return;
 			}
 			if (FileList.lastAction) {
@@ -708,6 +686,7 @@ $(document).ready(function() {
 
     // display storage warnings
     setTimeout ( "Files.displayStorageWarnings()", 100 );
+    OC.Notification.setDefault(Files.displayStorageWarnings);
 });
 
 function scanFiles(force,dir){
diff --git a/core/js/js.js b/core/js/js.js
index 7d967321d93..b57603b7b2f 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -289,6 +289,36 @@ OC.search.lastResults={};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
+OC.Notification={
+    getDefaultNotificationFunction: null,
+    setDefault: function(callback) {
+        OC.Notification.getDefaultNotificationFunction = callback;
+    },
+    hide: function(callback) {
+        $("#notification").text('');
+        $('#notification').fadeOut('400', function(){
+            if ($("#notification").text() === '') {
+                if (OC.Notification.getDefaultNotificationFunction) {
+                    OC.Notification.getDefaultNotificationFunction.call();
+                }
+            }
+            if (callback) {
+                callback.call();
+            }
+        });
+    },
+    showHtml: function(html) {
+        $('#notification').hide();
+        $('#notification').html(html);
+        $('#notification').fadeIn();
+    },
+    show: function(text) {
+        $('#notification').hide();
+        $('#notification').text(text);
+        $('#notification').fadeIn();
+    }
+};
+
 OC.Breadcrumb={
 	container:null,
 	crumbs:[],
-- 
cgit v1.2.3


From a867b36e7f99c648252ba2a1c04888ba21c1405f Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 6 Jan 2013 10:41:07 +0100
Subject: js optimisations and style fixes

---
 core/js/js.js | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 4e35547c058..710ef416b69 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -37,14 +37,14 @@ function t(app,text, vars){
 			t.cache[app] = [];
 		}
 	}
-	var _build = function(text, vars) {
-		return text.replace(/{([^{}]*)}/g,
-			function (a, b) {
-				var r = vars[b];
-				return typeof r === 'string' || typeof r === 'number' ? r : a;
-			}
-		);
-	}
+	var _build = function (text, vars) {
+        return text.replace(/{([^{}]*)}/g,
+            function (a, b) {
+                var r = vars[b];
+                return typeof r === 'string' || typeof r === 'number' ? r : a;
+            }
+        );
+    };
 	if( typeof( t.cache[app][text] ) !== 'undefined' ){
 		if(typeof vars === 'object') {
 			return _build(t.cache[app][text], vars);
@@ -247,7 +247,6 @@ var OC={
 		var popup = $('#appsettings_popup');
 		if(popup.length == 0) {
 			$('body').prepend('<div class="popup hidden" id="appsettings_popup"></div>');
-			popup = $('#appsettings_popup');
 			popup.addClass(settings.hasClass('topright') ? 'topright' : 'bottomleft');
 		}
 		if(popup.is(':visible')) {
@@ -308,14 +307,16 @@ OC.Notification={
         });
     },
     showHtml: function(html) {
-        $('#notification').hide();
-        $('#notification').html(html);
-        $('#notification').fadeIn();
+        var notification = $('#notification');
+        notification.hide();
+        notification.html(html);
+        notification.fadeIn();
     },
     show: function(text) {
-        $('#notification').hide();
-        $('#notification').text(text);
-        $('#notification').fadeIn();
+        var notification = $('#notification');
+        notification.hide();
+        notification.text(text);
+        notification.fadeIn();
     }
 };
 
-- 
cgit v1.2.3


From 3bb7ee521f38e1ab1fc7cd160dc3d0ae77f0433e Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Mon, 7 Jan 2013 12:23:29 +0100
Subject: attach max upload tipsy to div instead of a to fix tooltip not
 showing due to new z-index

---
 apps/files/js/files.js         | 4 ++++
 apps/files/templates/index.php | 6 +++---
 core/js/js.js                  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6d19a341e9e..038660e6e49 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -322,6 +322,7 @@ $(document).ready(function() {
 											if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
 												delete uploadingFiles[dirName];
 											}
+											//TODO update file upload size limit
 
 											var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
 											var currentUploads = parseInt(uploadtext.attr('currentUploads'));
@@ -375,6 +376,7 @@ $(document).ready(function() {
 												if(size==t('files','Pending')){
 													$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
 												}
+												//TODO update file upload size limit
 												FileList.loadingDone(file.name, file.id);
 											} else {
 												Files.cancelUpload(this.files[0].name);
@@ -407,8 +409,10 @@ $(document).ready(function() {
 								if(size==t('files','Pending')){
 									$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
 								}
+								//TODO update file upload size limit
 								FileList.loadingDone(file.name, file.id);
 							} else {
+								//TODO Files.cancelUpload(/*where do we get the filename*/);
 								$('#notification').text(t('files', response.data.message));
 								$('#notification').fadeIn();
 								$('#fileList > tr').not('[data-mime]').fadeOut();
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 3bcb865ccdb..2e0772443f2 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -14,7 +14,8 @@
 						data-type='web'><p><?php echo $l->t('From link');?></p></li>
 				</ul>
 			</div>
-			<div id="upload" class="button">
+			<div id="upload" class="button"
+				 title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>">
 				<form data-upload-id='1'
 					  id="data-upload-form"
 					  class="file_upload_form"
@@ -31,8 +32,7 @@
 						   value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 					<input type="file" id="file_upload_start" name='files[]'/>
-					<a href="#" class="svg" onclick="return false;"
-					   title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+					<a href="#" class="svg" onclick="return false;"></a>
 				</form>
 			</div>
 			<div id="uploadprogresswrapper">
diff --git a/core/js/js.js b/core/js/js.js
index 9f3e8f92100..95889ac8a27 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -622,7 +622,7 @@ $(document).ready(function(){
 	$('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
 	$('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
 	$('.password .action').tipsy({gravity:'se', fade:true, live:true});
-	$('#upload a').tipsy({gravity:'w', fade:true});
+	$('#upload').tipsy({gravity:'w', fade:true});
 	$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
 	$('a.delete').tipsy({gravity: 'e', fade:true, live:true});
 	$('a.action').tipsy({gravity:'s', fade:true, live:true});
-- 
cgit v1.2.3


From d39655e1269494dd1c8cad06c972e8884cace8ea Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 7 Jan 2013 14:15:51 -0500
Subject: Move template parameters around so database error page is properly
 rendered

---
 core/js/js.js                   |  2 +-
 core/templates/layout.base.php  |  1 -
 core/templates/layout.guest.php |  1 -
 lib/db.php                      |  8 ++++++--
 lib/setup.php                   |  4 +++-
 lib/templatelayout.php          | 17 +++++------------
 6 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 610950995db..b7442f303ac 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -88,7 +88,7 @@ var OC={
 	PERMISSION_DELETE:8,
 	PERMISSION_SHARE:16,
 	webroot:oc_webroot,
-	appswebroots:oc_appswebroots,
+	appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
 	currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
 	coreApps:['', 'admin','log','search','settings','core','3rdparty'],
 	/**
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 47f4b423b3e..cb2f9773839 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -10,7 +10,6 @@
 		<script type="text/javascript">
 			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
 		</script>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 8395426e4e4..5b39503474d 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -10,7 +10,6 @@
 		<script type="text/javascript">
 			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
 			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
 			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
diff --git a/lib/db.php b/lib/db.php
index 74e7ca5b0e0..fbefb13a95e 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -181,7 +181,9 @@ class OC_DB {
 			try{
 				self::$PDO=new PDO($dsn, $user, $pass, $opts);
 			}catch(PDOException $e) {
-				OC_Template::printErrorPage( 'can not connect to database, using '.$type.'. ('.$e->getMessage().')' );
+				OC_User::setUserId(null);
+				OC_Template::printErrorPage('Failed to connect to '.$type.' database. ('.$e->getMessage().')' );
+				die();
 			}
 			// We always, really always want associative arrays
 			self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
@@ -277,7 +279,9 @@ class OC_DB {
 			if( PEAR::isError( self::$MDB2 )) {
 				OC_Log::write('core', self::$MDB2->getUserInfo(), OC_Log::FATAL);
 				OC_Log::write('core', self::$MDB2->getMessage(), OC_Log::FATAL);
-				OC_Template::printErrorPage( 'can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')' );
+				OC_User::setUserId(null);
+				OC_Template::printErrorPage('Failed to connect to '.$type.' database. ('.self::$MDB2->getUserInfo().')' );
+				die();
 			}
 
 			// We always, really always want associative arrays
diff --git a/lib/setup.php b/lib/setup.php
index fdd10be6824..424414faa6b 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -141,7 +141,9 @@ class OC_Setup {
 			if(count($error) == 0) {
 				OC_Appconfig::setValue('core', 'installedat', microtime(true));
 				OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
-
+				OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+				OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+				
 				OC_Group::createGroup('admin');
 				OC_Group::addToGroup($username, 'admin');
 				OC_User::login($username, $password);
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 4173e008ba7..83d36199986 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -28,23 +28,16 @@ class OC_TemplateLayout extends OC_Template {
 					break;
 				}
 			}
+			$apps_paths = array();
+			foreach(OC_App::getEnabledApps() as $app) {
+				$apps_paths[$app] = OC_App::getAppWebPath($app);
+			}
+			$this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution
 		} else if ($renderas == 'guest') {
 			parent::__construct('core', 'layout.guest');
 		} else {
 			parent::__construct('core', 'layout.base');
 		}
-
-		$apps_paths = array();
-		foreach(OC_App::getEnabledApps() as $app) {
-			$apps_paths[$app] = OC_App::getAppWebPath($app);
-		}
-		$this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution
-
-		if (OC_Config::getValue('installed', false) && !OC_AppConfig::getValue('core', 'remote_core.css', false)) {
-			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-			OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-		}
-
 		// Add the js files
 		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
-- 
cgit v1.2.3


From bfc55fef89089fc43c6a352de860374ca3fcfd53 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 8 Jan 2013 00:24:35 +0100
Subject: bring back L250 as spotted by @tanghus - THX

---
 core/js/js.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 710ef416b69..e2775fa7220 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -247,6 +247,7 @@ var OC={
 		var popup = $('#appsettings_popup');
 		if(popup.length == 0) {
 			$('body').prepend('<div class="popup hidden" id="appsettings_popup"></div>');
+            popup = $('#appsettings_popup');
 			popup.addClass(settings.hasClass('topright') ? 'topright' : 'bottomleft');
 		}
 		if(popup.is(':visible')) {
-- 
cgit v1.2.3


From 508b6a9fc79326bcf6d060f1daf42f5b67bfaeec Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 11 Jan 2013 11:52:07 +0100
Subject: displaying notification now centered

The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
---
 apps/files/templates/index.php | 1 -
 core/css/styles.css            | 3 ++-
 core/js/js.js                  | 4 ++--
 core/templates/layout.user.php | 5 ++++-
 settings/templates/users.php   | 2 --
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 77c06007da4..b66b523ae38 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -50,7 +50,6 @@
 	<?php endif;?>
 	<input type="hidden" name="permissions" value="<?php echo $_['permissions']; ?>" id="permissions">
 </div>
-<div id='notification'></div>
 
 <?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
 	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
diff --git a/core/css/styles.css b/core/css/styles.css
index 496320561f8..e7ad777f719 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -190,7 +190,8 @@ fieldset.warning legend { color:#b94a48 !important; }
 .bold { font-weight:bold; }
 .center { text-align:center; }
 
-#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification-container { position: absolute; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
+#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 #notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
 
 tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
diff --git a/core/js/js.js b/core/js/js.js
index 10758a90722..e724be9c2d5 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -311,13 +311,13 @@ OC.Notification={
         var notification = $('#notification');
         notification.hide();
         notification.html(html);
-        notification.fadeIn();
+        notification.fadeIn().css("display","inline");
     },
     show: function(text) {
         var notification = $('#notification');
         notification.hide();
         notification.text(text);
-        notification.fadeIn();
+        notification.fadeIn().css("display","inline");
     }
 };
 
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ba5053edecf..be9eff80553 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -40,7 +40,10 @@
 	</head>
 
 	<body id="<?php echo $_['bodyid'];?>">
-		<header><div id="header">
+	<div id="notification-container">
+		<div id="notification"/>
+	</div>
+	<header><div id="header">
 			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
 			<a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');  echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 			<form class="searchbox header-right" action="#" method="post">
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e8bf9edf604..80d8dc9cc86 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -73,8 +73,6 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 	</div>
 </div>
 
-<div id='notification'></div>
-
 <table data-groups="<?php echo implode(', ', $allGroups);?>">
 	<thead>
 		<tr>
-- 
cgit v1.2.3


From b7f507b92595e6c5537ccc7f678e276d5a8642b9 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 16 Jan 2013 19:38:19 +0100
Subject:  dont resize content div with javascript but use css box-sizing to do
 it

---
 core/css/styles.css            | 3 ++-
 core/js/js.js                  | 9 ++-------
 core/templates/layout.user.php | 6 ++++--
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/css/styles.css b/core/css/styles.css
index 496320561f8..b4e6ce430f9 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -94,7 +94,8 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 /* CONTENT ------------------------------------------------------------------ */
 #controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
 #controls .button { display:inline-block; }
-#content { top:3.5em; left:12.5em; position:absolute; }
+#content { height: 100%; width: 100%; position: absolute; }
+#content-wrapper { height: 100%; width: 100%; padding-top: 3.5em; padding-left: 12.5em; box-sizing: border-box; -moz-box-sizing: border-box; position: absolute;}
 #leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
 #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
 #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
diff --git a/core/js/js.js b/core/js/js.js
index 95889ac8a27..23ace89f4e3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -504,6 +504,7 @@ function fillHeight(selector) {
 	if(selector.outerHeight() > selector.height()){
 		selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
 	}
+	console.warn("This function is deprecated! Use CSS instead");
 }
 
 /**
@@ -519,17 +520,11 @@ function fillWindow(selector) {
 	if(selector.outerWidth() > selector.width()){
 		selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
 	}
+	console.warn("This function is deprecated! Use CSS instead");
 }
 
 $(document).ready(function(){
 
-	$(window).resize(function () {
-		fillHeight($('#leftcontent'));
-		fillWindow($('#content'));
-		fillWindow($('#rightcontent'));
-	});
-	$(window).trigger('resize');
-
 	if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
 		replaceSVG();
 	}else{
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ba5053edecf..a16d2c9e55d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -67,8 +67,10 @@
 			</ul>
 		</div></nav>
 
-		<div id="content">
-			<?php echo $_['content']; ?>
+		<div id="content-wrapper">
+			<div id="content">
+				<?php echo $_['content']; ?>
+			</div>
 		</div>
 	</body>
 </html>
-- 
cgit v1.2.3


From 1dd70ac506982d230d18059ba3626ef2a92664fd Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sat, 19 Jan 2013 00:31:49 +0100
Subject: update used space percent after each ajax call and display the
 notification

---
 apps/files/js/files.js | 12 ++++++++++--
 core/js/js.js          |  7 +++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index f4d572b6954..843c6e3fc4a 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -32,14 +32,18 @@ Files={
 		}
 		if(response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
 			$('#max_upload').val(response.data.uploadMaxFilesize);
-			$('#data-upload-form a').attr('original-title', response.data.maxHumanFilesize);
+			$('#upload.button').attr('original-title', response.data.maxHumanFilesize);
+			$('#usedSpacePercent').val(response.data.usedSpacePercent);
+			Files.displayStorageWarnings();
 		}
 		if(response[0] == undefined) {
 			return;
 		}
 		if(response[0].uploadMaxFilesize !== undefined) {
 			$('#max_upload').val(response[0].uploadMaxFilesize);
-			$('#data-upload-form a').attr('original-title', response[0].maxHumanFilesize);
+			$('#upload.button').attr('original-title', response[0].maxHumanFilesize);
+			$('#usedSpacePercent').val(response[0].usedSpacePercent);
+			Files.displayStorageWarnings();
 		}
 
 	},
@@ -65,6 +69,10 @@ Files={
 		return true;
 	},
 	displayStorageWarnings: function() {
+		if (!OC.Notification.isHidden()) {
+			return;
+		}
+
 		var usedSpacePercent = $('#usedSpacePercent').val();
 		if (usedSpacePercent > 98) {
 			OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
diff --git a/core/js/js.js b/core/js/js.js
index 3160159e287..2daf63af9d8 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -297,7 +297,7 @@ OC.Notification={
     hide: function(callback) {
         $("#notification").text('');
         $('#notification').fadeOut('400', function(){
-            if ($("#notification").text() === '') {
+            if (OC.Notification.isHidden()) {
                 if (OC.Notification.getDefaultNotificationFunction) {
                     OC.Notification.getDefaultNotificationFunction.call();
                 }
@@ -318,7 +318,10 @@ OC.Notification={
         notification.hide();
         notification.text(text);
         notification.fadeIn().css("display","inline");
-    }
+    },
+	isHidden: function() {
+		return ($("#notification").text() === '');
+	}
 };
 
 OC.Breadcrumb={
-- 
cgit v1.2.3


From 936e991394d8984bde69ce6878cb67f268456173 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 25 Jan 2013 16:00:26 +0100
Subject: Add js linkToRemote and linkToRemoteBase

---
 core/js/js.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 6241036b1b8..6e0a405114b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -100,6 +100,27 @@ var OC={
 	linkTo:function(app,file){
 		return OC.filePath(app,'',file);
 	},
+	/**
+	 * Creates an url for remote use
+	 * @param string $service id
+	 * @return string the url
+	 *
+	 * Returns a url to the given service.
+	 */
+	linkToRemoteBase:function(service) {
+		return OC.webroot + '/remote.php/' + service;
+	},
+	/**
+	 * @brief Creates an absolute url for remote use
+	 * @param string $service id
+	 * @param bool $add_slash
+	 * @return string the url
+	 *
+	 * Returns a absolute url to the given service.
+	 */
+	linkToRemote:function(service) {
+		return window.location.protocol + '//' + window.location.host + OC.linkToRemoteBase(service);
+	},
 	/**
 	 * get the absolute url for a file in an app
 	 * @param app the id of the app
-- 
cgit v1.2.3


From 9cd692a6d00623940a4dbf04045793e44d602569 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Thu, 31 Jan 2013 17:00:05 +0100
Subject: use the same tooltip as for the password field

---
 core/js/js.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 01e47edf268..9c8cf4aa625 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -672,6 +672,7 @@ $(document).ready(function(){
 	// all the tipsy stuff needs to be here (in reverse order) to work
 	$('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
 	$('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
+	$('.displayName .action').tipsy({gravity:'se', fade:true, live:true});
 	$('.password .action').tipsy({gravity:'se', fade:true, live:true});
 	$('#upload').tipsy({gravity:'w', fade:true});
 	$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
-- 
cgit v1.2.3


From 5dd2c9152e86a5b4e0ca050aa1aca29ce3b813b1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 1 Feb 2013 00:14:39 +0100
Subject: fix breadcrumbs for gallery and texteditor

---
 core/js/js.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 42d31a8c482..bfc972c786f 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -354,7 +354,6 @@ OC.Breadcrumb={
 		}
 		var crumb=$('<div/>');
 		crumb.addClass('crumb').addClass('last');
-		crumb.attr('style','background-image:url("'+OC.imagePath('core','breadcrumb')+'")');
 
 		var crumbLink=$('<a/>');
 		crumbLink.attr('href',link);
-- 
cgit v1.2.3


From 3bcf3c91e18e5863cb6b6a34eb80ae218f028022 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Fri, 25 Jan 2013 15:22:10 +0530
Subject: Password Toggle Support for Login

---
 core/css/styles.css         |  12 +++++++--
 core/img/actions/toggle.png | Bin 0 -> 515 bytes
 core/img/actions/toggle.svg |  61 ++++++++++++++++++++++++++++++++++++++++++++
 core/js/js.js               |   1 +
 core/templates/login.php    |   6 +++--
 5 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 core/img/actions/toggle.png
 create mode 100644 core/img/actions/toggle.svg

(limited to 'core/js/js.js')

diff --git a/core/css/styles.css b/core/css/styles.css
index e10a4c7fbe1..8bca96349ad 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -52,12 +52,19 @@ input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
 #quota { cursor:default; }
 
+
 /* SCROLLING */
 ::-webkit-scrollbar { width:8px; }
 ::-webkit-scrollbar-track-piece { background-color:transparent; }
 ::-webkit-scrollbar-thumb { background:#ddd; }
 
 
+#show { float: right; position: absolute; right: 1em; top: 0.8em; display:none; }
+#login form input[name="show"] + label { background: url("../img/actions/toggle.png") no-repeat; opacity:0.3;
+float: right; width: 24px; position: absolute !important; height: 14px; right: 1em; top: 1.25em;}
+#login form input[name="show"]:checked + label { background:url("../img/actions/toggle.png") no-repeat; opacity:0.8; }
+
+
 /* BUTTONS */
 input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a {
 	width:auto; padding:.4em;
@@ -141,12 +148,13 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 
 /* Icons for username and password fields to better recognize them */
 #adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
-#adminlogin+label, #adminpass+label, #user+label, #password+label { left:2.2em; }
 #adminlogin+label+img, #adminpass+label+img, #user+label+img, #password+label+img {
 	position:absolute; left:1.25em; top:1.65em;
 	opacity:.3;
 }
 #adminpass+label+img, #password+label+img { top:1.1em; }
+input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
+#pass_image { position: absolute; top: 1.2em; left: 1.4em; opacity: 0.3; }
 
 
 /* Nicely grouping input field sets */
@@ -170,7 +178,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 /* NEEDED FOR INFIELD LABELS */
 p.infield { position:relative; }
 label.infield { cursor:text !important; top:1.05em; left:.85em; }
-#login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; }
+#login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; padding-left:1.2em; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
 
diff --git a/core/img/actions/toggle.png b/core/img/actions/toggle.png
new file mode 100644
index 00000000000..6ef3f2227b7
Binary files /dev/null and b/core/img/actions/toggle.png differ
diff --git a/core/img/actions/toggle.svg b/core/img/actions/toggle.svg
new file mode 100644
index 00000000000..82a5171477e
--- /dev/null
+++ b/core/img/actions/toggle.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="9px"
+   viewBox="0 0 16 9"
+   overflow="visible"
+   enable-background="new 0 0 16 9"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="eye_all.svg"><metadata
+   id="metadata12"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1021"
+   id="namedview10"
+   showgrid="false"
+   inkscape:zoom="20.75"
+   inkscape:cx="8.0963855"
+   inkscape:cy="4.5"
+   inkscape:window-x="0"
+   inkscape:window-y="27"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg2" />
+<defs
+   id="defs4">
+</defs>
+<path
+   fill="#575756"
+   d="M7.999,0C4.89,0,2.073,1.719,0,4.5C2.073,7.281,4.89,9,7.999,9C11.11,9,13.927,7.281,16,4.5  C13.927,1.719,11.108,0,7.999,0z M8,7.5c-1.657,0-3-1.343-3-3s1.343-3,3-3c1.657,0,3,1.343,3,3S9.657,7.5,8,7.5z"
+   id="path6"
+   style="fill:#222222;fill-opacity:1" />
+<circle
+   fill="#575756"
+   cx="8"
+   cy="4.501"
+   r="1.5"
+   id="circle8"
+   style="fill:#222222;fill-opacity:1" />
+</svg>
\ No newline at end of file
diff --git a/core/js/js.js b/core/js/js.js
index bfc972c786f..6b0c289850c 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -622,6 +622,7 @@ $(document).ready(function(){
 	});
 
 	// 'show password' checkbox
+	$('#password').showPassword();	
 	$('#pass2').showPassword();
 
 	//use infield labels
diff --git a/core/templates/login.php b/core/templates/login.php
index c82d2cafa2e..59b685eabff 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -30,10 +30,12 @@
 		</p>
 
 		<p class="infield groupbottom">
-			<input type="password" name="password" id="password" value=""
+			<input type="password" name="password" id="password" value="" data-typetoggle="#show"
 				   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
 			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+			<img class="svg" id="pass_image" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+			<input type="checkbox" id="show" name="show" />
+			<label for="show"></label>
 		</p>
 		<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
 			for="remember_login"><?php echo $l->t('remember'); ?></label>
-- 
cgit v1.2.3


From c0b370f6cf8bf2ec3f4af921fc9f6935238ca41d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Feb 2013 08:11:18 +0100
Subject: Define the variables that are expected to exist but won't be set in
 setup

---
 core/js/js.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 6b0c289850c..80914e954e5 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -5,6 +5,9 @@
  * To the end of config/config.php to enable debug mode.
  * The undefined checks fix the broken ie8 console
  */
+var oc_debug;
+var oc_webroot;
+var oc_requesttoken;
 if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
 	if (!window.console) {
 		window.console = {};
-- 
cgit v1.2.3


From a82d18d2f8e13edab296daaf2bda917381e78810 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Feb 2013 21:13:57 +0100
Subject: Fill oc_webroot with the expected value

---
 core/js/js.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 80914e954e5..c137f734d91 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -8,6 +8,7 @@
 var oc_debug;
 var oc_webroot;
 var oc_requesttoken;
+oc_webroot = oc_webroot || location.pathname.substr(0, location.pathname.lastIndexOf('/'));
 if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
 	if (!window.console) {
 		window.console = {};
-- 
cgit v1.2.3


From b356b7065f406cd2e18ed7bb9842e292f888c8e4 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Fri, 8 Feb 2013 16:38:28 +0530
Subject: Password Toggle Works on Installation as well.

---
 core/css/styles.css             | 1 +
 core/js/js.js                   | 3 ++-
 core/templates/installation.php | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/css/styles.css b/core/css/styles.css
index cefab2d49ff..961c7fb7f3a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -155,6 +155,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 }
 #adminpass-icon, #password-icon { top:1.1em; }
 input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
+input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
 
 /* Nicely grouping input field sets */
 .grouptop input {
diff --git a/core/js/js.js b/core/js/js.js
index c137f734d91..4a1f8571cc7 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -626,7 +626,8 @@ $(document).ready(function(){
 	});
 
 	// 'show password' checkbox
-	$('#password').showPassword();	
+	$('#password').showPassword();
+	$('#adminpass').showPassword();	
 	$('#pass2').showPassword();
 
 	//use infield labels
diff --git a/core/templates/installation.php b/core/templates/installation.php
index f3d232b637e..19395b80efe 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -34,13 +34,13 @@
 	<?php endif; ?>
 	<fieldset id="adminaccount">
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
-		<p class="infield grouptop">
-			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
+		<p class="infield grouptop">		
+			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />			
 			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
+			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />	
 		</p>
 		<p class="infield groupbottom">
-			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required data-typetoggle="#show" />
+			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" />
 			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
 			<input type="checkbox" id="show" name="show" />
-- 
cgit v1.2.3


From d5f98a82aa5d1bee7971cb4c811b86083ce60ed6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Feb 2013 18:44:52 +0100
Subject: fix-oc_webroot

---
 core/js/js.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index c137f734d91..5f1870eb6ce 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -8,7 +8,9 @@
 var oc_debug;
 var oc_webroot;
 var oc_requesttoken;
-oc_webroot = oc_webroot || location.pathname.substr(0, location.pathname.lastIndexOf('/'));
+if (typeof oc_webroot === "undefined") {
+	oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/'));
+}
 if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
 	if (!window.console) {
 		window.console = {};
-- 
cgit v1.2.3


From 3f09cc139f7b932c46dc60567f307ae8064227ca Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 14 Feb 2013 17:13:50 +0100
Subject: double speed for user menu slide

---
 core/js/js.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index ae23c955c38..6d5d65403fb 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -663,14 +663,14 @@ $(document).ready(function(){
 		}
 	});
 	$('#settings #expand').click(function(event) {
-		$('#settings #expanddiv').slideToggle();
+		$('#settings #expanddiv').slideToggle(200);
 		event.stopPropagation();
 	});
 	$('#settings #expanddiv').click(function(event){
 		event.stopPropagation();
 	});
 	$(window).click(function(){//hide the settings menu when clicking outside it
-		$('#settings #expanddiv').slideUp();
+		$('#settings #expanddiv').slideUp(200);
 	});
 
 	// all the tipsy stuff needs to be here (in reverse order) to work
-- 
cgit v1.2.3


From 0dd7fd0599e0757abc81677ccbb8d4a6839a5f79 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Thu, 21 Feb 2013 17:38:25 +0100
Subject: IE8 does not support window.onclick

---
 apps/files/js/files.js | 2 +-
 core/js/js.js          | 2 +-
 search/js/result.js    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 8327460cca6..aeb7aedfaee 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -524,7 +524,7 @@ $(document).ready(function() {
 		crumb.text(text);
 	}
 
-	$(window).click(function(){
+	$(document).click(function(){
 		$('#new>ul').hide();
 		$('#new').removeClass('active');
 		$('#new li').each(function(i,element){
diff --git a/core/js/js.js b/core/js/js.js
index 6d5d65403fb..e373fca8865 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -669,7 +669,7 @@ $(document).ready(function(){
 	$('#settings #expanddiv').click(function(event){
 		event.stopPropagation();
 	});
-	$(window).click(function(){//hide the settings menu when clicking outside it
+	$(document).click(function(){//hide the settings menu when clicking outside it
 		$('#settings #expanddiv').slideUp(200);
 	});
 
diff --git a/search/js/result.js b/search/js/result.js
index cadb0d0aabe..78fa8efc8e9 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -28,7 +28,7 @@ OC.search.showResults=function(results){
 				OC.search.hide();
 				event.stopPropagation();
 			});
-			$(window).click(function(event){
+			$(document).click(function(event){
 				OC.search.hide();
 			});
 			OC.search.lastResults=results;
-- 
cgit v1.2.3


From 4e553480540a36cf14a107e65e2bc4d4d9f1a2e6 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Tue, 26 Feb 2013 19:34:46 +0100
Subject: implemented a heartbeat request which is calls the server every 15
 minutes to prevent a session timeout

---
 core/js/js.js   | 15 +++++++++++++++
 core/routes.php |  5 +++++
 2 files changed, 20 insertions(+)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index e373fca8865..597ca2af9af 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -584,6 +584,7 @@ function fillWindow(selector) {
 }
 
 $(document).ready(function(){
+	sessionHeartBeat();
 
 	if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
 		replaceSVG();
@@ -815,3 +816,17 @@ OC.set=function(name, value) {
 	}
 	context[tail]=value;
 };
+
+
+/**
+ * Calls the server periodically every 15 mins to ensure that session doesnt
+ * time out
+ */
+function sessionHeartBeat(){
+	OC.Router.registerLoadedCallback(function(){
+		setInterval(function(){
+			var url = OC.Router.generate('heartbeat');
+			$.post(url);
+		}, 15000);
+	});
+}
\ No newline at end of file
diff --git a/core/routes.php b/core/routes.php
index 2527816b662..be19b66bf72 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -69,3 +69,8 @@ $this->create('app_script', '/apps/{app}/{file}')
 	->defaults(array('file' => 'index.php'))
 	->requirements(array('file' => '.*.php'))
 	->action('OC', 'loadAppScriptFile');
+
+// used for heartbeat
+$this->create('heartbeat', '/heartbeat')->action(function(){
+	// do nothing
+});
\ No newline at end of file
-- 
cgit v1.2.3


From 81bb4363a2e9df22c12d06fc3df82a7ee947cb21 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Tue, 26 Feb 2013 20:25:07 +0100
Subject: use 15 min instead of 15 sec timeout

---
 core/js/js.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 597ca2af9af..4016f64d601 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -827,6 +827,6 @@ function sessionHeartBeat(){
 		setInterval(function(){
 			var url = OC.Router.generate('heartbeat');
 			$.post(url);
-		}, 15000);
+		}, 900000);
 	});
 }
\ No newline at end of file
-- 
cgit v1.2.3


From a65b16f3e75235882482e49eb603eeecf9431633 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Tue, 26 Feb 2013 20:45:25 +0100
Subject: generate url only once

---
 core/js/js.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 4016f64d601..46dd273b068 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -824,8 +824,8 @@ OC.set=function(name, value) {
  */
 function sessionHeartBeat(){
 	OC.Router.registerLoadedCallback(function(){
+		var url = OC.Router.generate('heartbeat');
 		setInterval(function(){
-			var url = OC.Router.generate('heartbeat');
 			$.post(url);
 		}, 900000);
 	});
-- 
cgit v1.2.3


From ff9476b3e3f857369521a0cab39d76b821b8b7fc Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg@ownCloud.com>
Date: Sat, 9 Feb 2013 17:20:08 +0100
Subject: fix oc#47

---
 apps/files/js/filelist.js | 37 ++++++++++---------
 core/js/js.js             | 93 +++++++++++++++++++++++++++--------------------
 2 files changed, 73 insertions(+), 57 deletions(-)

(limited to 'core/js/js.js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ea721059c3f..88880ce1c9e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -246,14 +246,17 @@ var FileList={
 	},
 	checkName:function(oldName, newName, isNewFile) {
 		if (isNewFile || $('tr').filterAttr('data-file', newName).length > 0) {
-			$('#notification').data('oldName', oldName);
-			$('#notification').data('newName', newName);
-			$('#notification').data('isNewFile', isNewFile);
-            if (isNewFile) {
-                OC.Notification.showHtml(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
-            } else {
-                OC.Notification.showHtml(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
-            }
+			var html;
+			if(isNewFile){
+				html = t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span>&nbsp;<span class="cancel">'+t('files', 'cancel')+'</span>';
+			}else{
+				html = t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>';
+			}
+			html = $('<span>' + html + '</span>');
+			html.attr('data-oldName', oldName);
+			html.attr('data-newName', newName);
+			html.attr('data-isNewFile', isNewFile);
+            OC.Notification.showHtml(html);
 			return true;
 		} else {
 			return false;
@@ -291,9 +294,7 @@ var FileList={
 		FileList.lastAction = function() {
 			FileList.finishReplace();
 		};
-		if (isNewFile) {
-			OC.Notification.showHtml(t('files', 'replaced {new_name}', {new_name: newName})+'<span class="undo">'+t('files', 'undo')+'</span>');
-		} else {
+		if (!isNewFile) {
             OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
 		}
 	},
@@ -376,19 +377,19 @@ $(document).ready(function(){
 		FileList.lastAction = null;
         OC.Notification.hide();
 	});
-	$('#notification').on('click', '.replace', function() {
+	$('#notification:first-child').on('click', '.replace', function() {
         OC.Notification.hide(function() {
-            FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'), $('#notification').data('isNewFile'));
+            FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile'));
         });
 	});
-	$('#notification').on('click', '.suggest', function() {
-		$('tr').filterAttr('data-file', $('#notification').data('oldName')).show();
+	$('#notification:first-child').on('click', '.suggest', function() {
+		$('tr').filterAttr('data-file', $('#notification > span').attr('data-oldName')).show();
         OC.Notification.hide();
 	});
-	$('#notification').on('click', '.cancel', function() {
-		if ($('#notification').data('isNewFile')) {
+	$('#notification:first-child').on('click', '.cancel', function() {
+		if ($('#notification > span').attr('data-isNewFile')) {
 			FileList.deleteCanceled = false;
-			FileList.deleteFiles = [$('#notification').data('oldName')];
+			FileList.deleteFiles = [$('#notification > span').attr('data-oldName')];
 		}
 	});
 	FileList.useUndo=(window.onbeforeunload)?true:false;
diff --git a/core/js/js.js b/core/js/js.js
index 6d5d65403fb..f3141fcd41a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1,7 +1,7 @@
 /**
  * Disable console output unless DEBUG mode is enabled.
  * Add 
- *     define('DEBUG', true);
+ *	 define('DEBUG', true);
  * To the end of config/config.php to enable debug mode.
  * The undefined checks fix the broken ie8 console
  */
@@ -44,13 +44,13 @@ function t(app,text, vars){
 		}
 	}
 	var _build = function (text, vars) {
-        return text.replace(/{([^{}]*)}/g,
-            function (a, b) {
-                var r = vars[b];
-                return typeof r === 'string' || typeof r === 'number' ? r : a;
-            }
-        );
-    };
+		return text.replace(/{([^{}]*)}/g,
+			function (a, b) {
+				var r = vars[b];
+				return typeof r === 'string' || typeof r === 'number' ? r : a;
+			}
+		);
+	};
 	if( typeof( t.cache[app][text] ) !== 'undefined' ){
 		if(typeof vars === 'object') {
 			return _build(t.cache[app][text], vars);
@@ -274,7 +274,7 @@ var OC={
 		var popup = $('#appsettings_popup');
 		if(popup.length == 0) {
 			$('body').prepend('<div class="popup hidden" id="appsettings_popup"></div>');
-            popup = $('#appsettings_popup');
+			popup = $('#appsettings_popup');
 			popup.addClass(settings.hasClass('topright') ? 'topright' : 'bottomleft');
 		}
 		if(popup.is(':visible')) {
@@ -317,35 +317,50 @@ OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
 OC.Notification={
-    getDefaultNotificationFunction: null,
-    setDefault: function(callback) {
-        OC.Notification.getDefaultNotificationFunction = callback;
-    },
-    hide: function(callback) {
-        $("#notification").text('');
-        $('#notification').fadeOut('400', function(){
-            if (OC.Notification.isHidden()) {
-                if (OC.Notification.getDefaultNotificationFunction) {
-                    OC.Notification.getDefaultNotificationFunction.call();
-                }
-            }
-            if (callback) {
-                callback.call();
-            }
-        });
-    },
-    showHtml: function(html) {
-        var notification = $('#notification');
-        notification.hide();
-        notification.html(html);
-        notification.fadeIn().css("display","inline");
-    },
-    show: function(text) {
-        var notification = $('#notification');
-        notification.hide();
-        notification.text(text);
-        notification.fadeIn().css("display","inline");
-    },
+	queuedNotifications: new Array(),
+	getDefaultNotificationFunction: null,
+	setDefault: function(callback) {
+		OC.Notification.getDefaultNotificationFunction = callback;
+	},
+	hide: function(callback) {
+		$('#notification').fadeOut('400', function(){
+			if (OC.Notification.isHidden()) {
+				if (OC.Notification.getDefaultNotificationFunction) {
+					OC.Notification.getDefaultNotificationFunction.call();
+				}
+			}
+			if (callback) {
+				callback.call();
+			}
+			$('#notification').empty();
+			if(OC.Notification.queuedNotifications.length > 0){
+				OC.Notification.showHtml(OC.Notification.queuedNotifications[0]);
+				OC.Notification.queuedNotifications.shift();
+			}
+		});
+	},
+	showHtml: function(html) {
+		if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
+			$('#notification').html(html);
+			$('#notification').fadeIn().css("display","inline");
+		}else{
+			OC.Notification.queuedNotifications.push(html);
+		}
+	},
+	show: function(text) {
+		if(text == ''){
+			return false;
+		}
+		if(OC.Notification.currentlyShownNotifications < 2){
+			var notification = $('#notification');
+			notification.hide();
+			notification.text(text);
+			notification.fadeIn().css("display","inline");
+			OC.Notification.currentlyShownNotifications++;
+		}else{
+			OC.Notification.queuedNotifications.push($(text).html());
+		}
+	},
 	isHidden: function() {
 		return ($("#notification").text() === '');
 	}
@@ -548,7 +563,7 @@ function replaceSVG(){
  */
 function object(o) {
 	function F() {}
-    F.prototype = o;
+	F.prototype = o;
 	return new F();
 }
 
-- 
cgit v1.2.3


From 22424e8abcd89f6f08a1f1104677fdc6f6cc9f15 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg@ownCloud.com>
Date: Sat, 2 Mar 2013 17:36:04 +0100
Subject: update OC.Notification.show

---
 core/js/js.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index f3141fcd41a..faae420ef7f 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -348,15 +348,9 @@ OC.Notification={
 		}
 	},
 	show: function(text) {
-		if(text == ''){
-			return false;
-		}
-		if(OC.Notification.currentlyShownNotifications < 2){
-			var notification = $('#notification');
-			notification.hide();
-			notification.text(text);
-			notification.fadeIn().css("display","inline");
-			OC.Notification.currentlyShownNotifications++;
+		if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
+			$('#notification').html(html);
+			$('#notification').fadeIn().css("display","inline");
 		}else{
 			OC.Notification.queuedNotifications.push($(text).html());
 		}
-- 
cgit v1.2.3


From 620ddd3baacbfab759bff90c9443a2353fe529f4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Sat, 2 Mar 2013 19:24:37 +0100
Subject: new Array() -> []

---
 core/js/js.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index faae420ef7f..1801062241d 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -317,7 +317,7 @@ OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
 OC.Notification={
-	queuedNotifications: new Array(),
+	queuedNotifications: [],
 	getDefaultNotificationFunction: null,
 	setDefault: function(callback) {
 		OC.Notification.getDefaultNotificationFunction = callback;
-- 
cgit v1.2.3


From a83a5aa90051b21df970a456aa35611cbd7a8add Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg@ownCloud.com>
Date: Wed, 6 Mar 2013 13:02:44 +0100
Subject: fix #2128

---
 core/js/js.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index 582d1f808d7..1a94215c27b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -349,7 +349,7 @@ OC.Notification={
 	},
 	show: function(text) {
 		if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
-			$('#notification').html(html);
+			$('#notification').html(text);
 			$('#notification').fadeIn().css("display","inline");
 		}else{
 			OC.Notification.queuedNotifications.push($(text).html());
-- 
cgit v1.2.3