summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-03-31 13:12:04 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-03-31 13:12:04 +0200
commit2be2a5d2c5d8cbc671c4f301eb337fee20023538 (patch)
tree4b6870b52f5606883d239485f6e971b77bdbb956 /core
parent6ac85480f7bffeb65fcbc5820ea7bd4ecd8f21ad (diff)
parent65e3f634000a2142f412b85d0443f241bb64a9ab (diff)
downloadnextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.tar.gz
nextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.zip
external storage: fix merge conflict, indentation
Diffstat (limited to 'core')
-rw-r--r--core/ajax/share.php1
-rw-r--r--core/ajax/update.php1
-rw-r--r--core/command/upgrade.php3
-rw-r--r--core/command/user/report.php3
-rw-r--r--core/css/jquery.ocdialog.css2
-rw-r--r--core/css/mobile.css85
-rw-r--r--core/css/styles.css3
-rw-r--r--core/js/js.js112
-rw-r--r--core/js/share.js8
-rw-r--r--core/js/tests/specs/coreSpec.js104
-rw-r--r--core/l10n/es.php6
-rw-r--r--core/l10n/ru.php11
-rw-r--r--core/l10n/sl.php2
-rw-r--r--core/l10n/tr.php2
-rw-r--r--core/setup/controller.php6
-rw-r--r--core/templates/layout.guest.php2
-rw-r--r--core/templates/layout.user.php4
17 files changed, 331 insertions, 24 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3f04e1e4ad1..e667d9b5faa 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -21,7 +21,6 @@
OC_JSON::checkLoggedIn();
OCP\JSON::callCheck();
-OC_App::loadApps();
$defaults = new \OCP\Defaults();
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 2a0cbb2036d..55e8ab15ec2 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -1,6 +1,5 @@
<?php
set_time_limit(0);
-$RUNTIME_NOAPPS = true;
require_once '../../lib/base.php';
if (OC::checkUpgrade(false)) {
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index cfccfb5d2f0..ed72d136e24 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -34,9 +34,6 @@ class Upgrade extends Command {
* @param OutputInterface $output output interface
*/
protected function execute(InputInterface $input, OutputInterface $output) {
- global $RUNTIME_NOAPPS;
-
- $RUNTIME_NOAPPS = true; //no apps, yet
require_once \OC::$SERVERROOT . '/lib/base.php';
diff --git a/core/command/user/report.php b/core/command/user/report.php
index 70c5a8566b7..a5159310af1 100644
--- a/core/command/user/report.php
+++ b/core/command/user/report.php
@@ -46,7 +46,6 @@ class Report extends Command {
}
private function countUsers() {
- \OC_App::loadApps(array('authentication'));
$userManager = \OC::$server->getUserManager();
return $userManager->countUsers();
}
@@ -56,4 +55,4 @@ class Report extends Command {
$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
return count($userDirectories);
}
-} \ No newline at end of file
+}
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index 236968e3245..a1221137bc4 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -43,7 +43,7 @@
background-color: #000;
opacity: .20;filter:Alpha(Opacity=20);
z-index: 999;
- position: absolute;
+ position: fixed;
top: 0; left: 0;
width: 100%; height: 100%;
}
diff --git a/core/css/mobile.css b/core/css/mobile.css
index a63aa902d34..c67ac3e5ecf 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -1,4 +1,12 @@
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 768px) {
+
+/* show caret indicator next to logo to make clear it is tappable */
+#owncloud.menutoggle {
+ background-image: url('../img/actions/caret.svg');
+ background-repeat: no-repeat;
+ background-position: right 26px;
+ padding-right: 16px !important;
+}
/* compress search box on mobile, expand when focused */
.searchbox input[type="search"] {
@@ -18,5 +26,80 @@
display: none;
}
+/* toggle navigation */
+#content-wrapper {
+ padding-left: 0;
+}
+
+#navigation {
+ top: 45px;
+ bottom: initial;
+ width: 255px;
+ max-height: 90%;
+ margin-top: 0;
+ top: 45px;
+ background-color: rgba(36, 40, 47, .97);
+ overflow-x: initial;
+ border-bottom-right-radius: 7px;
+ border-bottom: 1px #333 solid;
+ border-right: 1px #333 solid;
+ box-shadow: 0 0 7px rgba(29,45,68,.97);
+ display: none;
+}
+#navigation, #navigation * {
+ box-sizing:border-box; -moz-box-sizing:border-box;
+}
+#navigation li {
+ display: inline-block;
+}
+#navigation a {
+ width: 80px;
+ height: 80px;
+ display: inline-block;
+ text-align: center;
+ padding: 20px 0;
+}
+#navigation a span {
+ display: inline-block;
+ font-size: 13px;
+ padding-bottom: 0;
+ padding-left: 0;
+ width: 80px;
+}
+#navigation .icon {
+ margin: 0 auto;
+ padding: 0;
+}
+#navigation li:first-child .icon {
+ padding-top: 0;
+}
+/* Apps management as sticky footer */
+#navigation .wrapper {
+ min-height: initial;
+ margin: 0;
+}
+#apps-management, #navigation .push {
+ height: initial;
+}
+
+
+
+/* shift to account for missing navigation */
+#body-user #controls,
+#body-settings #controls {
+ padding-left: 0;
+}
+
+/* don’t require a minimum width for controls bar */
+#controls {
+ min-width: initial !important;
+}
+
+/* position share dropdown */
+#dropdown {
+ margin-right: 10% !important;
+ width: 80% !important;
+}
+
}
diff --git a/core/css/styles.css b/core/css/styles.css
index 4420633e34e..50e0314475f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -77,6 +77,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
#header .logo {
background-image: url(../img/logo.svg);
+ background-repeat: no-repeat;
width: 250px;
height: 118px;
margin: 0 auto;
@@ -84,6 +85,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
#header .logo-wide {
background-image: url(../img/logo-wide.svg);
+ background-repeat: no-repeat;
width: 147px;
height: 32px;
}
@@ -246,6 +248,7 @@ input[type="submit"].enabled {
-webkit-box-sizing: border-box;
box-sizing: border-box;
position: fixed;
+ top:45px;
right: 0;
left: 0;
height: 44px;
diff --git a/core/js/js.js b/core/js/js.js
index 3d3185f12c1..302b6b4d9fa 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -482,6 +482,53 @@ var OC={
}).show();
}, 'html');
}
+ },
+
+ // for menu toggling
+ registerMenu: function($toggle, $menuEl) {
+ $menuEl.addClass('menu');
+ $toggle.addClass('menutoggle');
+ $toggle.on('click.menu', function(event) {
+ if ($menuEl.is(OC._currentMenu)) {
+ $menuEl.hide();
+ OC._currentMenu = null;
+ OC._currentMenuToggle = null;
+ return false;
+ }
+ // another menu was open?
+ else if (OC._currentMenu) {
+ // close it
+ OC._currentMenu.hide();
+ }
+ $menuEl.show();
+ OC._currentMenu = $menuEl;
+ OC._currentMenuToggle = $toggle;
+ return false
+ });
+ },
+
+ unregisterMenu: function($toggle, $menuEl) {
+ // close menu if opened
+ if ($menuEl.is(OC._currentMenu)) {
+ $menuEl.hide();
+ OC._currentMenu = null;
+ OC._currentMenuToggle = null;
+ }
+ $toggle.off('click.menu').removeClass('menutoggle');
+ $menuEl.removeClass('menu');
+ },
+
+ /**
+ * Wrapper for matchMedia
+ *
+ * This is makes it possible for unit tests to
+ * stub matchMedia (which doesn't work in PhantomJS)
+ */
+ _matchMedia: function(media) {
+ if (window.matchMedia) {
+ return window.matchMedia(media);
+ }
+ return false;
}
};
OC.search.customResults={};
@@ -712,11 +759,11 @@ SVGSupport.checkMimeType=function(){
if(value[0]==='"'){
value=value.substr(1,value.length-2);
}
- headers[parts[0]]=value;
+ headers[parts[0].toLowerCase()]=value;
}
}
});
- if(headers["Content-Type"]!=='image/svg+xml'){
+ if(headers["content-type"]!=='image/svg+xml'){
replaceSVG();
SVGSupport.checkMimeType.correct=false;
}
@@ -940,6 +987,67 @@ function initCore() {
$('a.action').tipsy({gravity:'s', fade:true, live:true});
$('td .modified').tipsy({gravity:'s', fade:true, live:true});
$('input').tipsy({gravity:'w', fade:true});
+
+ // toggle for menus
+ $(document).on('mouseup.closemenus', function(event) {
+ var $el = $(event.target);
+ if ($el.closest('.menu').length || $el.closest('.menutoggle').length) {
+ // don't close when clicking on the menu directly or a menu toggle
+ return false;
+ }
+ if (OC._currentMenu) {
+ OC._currentMenu.hide();
+ }
+ OC._currentMenu = null;
+ OC._currentMenuToggle = null;
+ });
+
+
+ /**
+ * Set up the main menu toggle to react to media query changes.
+ * If the screen is small enough, the main menu becomes a toggle.
+ * If the screen is bigger, the main menu is not a toggle any more.
+ */
+ function setupMainMenu() {
+ // toggle the navigation on mobile
+ if (!OC._matchMedia) {
+ return;
+ }
+ var mq = OC._matchMedia('(max-width: 768px)');
+ var lastMatch = mq.matches;
+ var $toggle = $('#header #owncloud');
+ var $navigation = $('#navigation');
+
+ function updateMainMenu() {
+ // mobile mode ?
+ if (lastMatch && !$toggle.hasClass('menutoggle')) {
+ // init the menu
+ OC.registerMenu($toggle, $navigation);
+ $toggle.data('oldhref', $toggle.attr('href'));
+ $toggle.attr('href', '#');
+ $navigation.hide();
+ }
+ else {
+ OC.unregisterMenu($toggle, $navigation);
+ $toggle.attr('href', $toggle.data('oldhref'));
+ $navigation.show();
+ }
+ }
+
+ updateMainMenu();
+
+ // TODO: debounce this
+ $(window).resize(function() {
+ if (lastMatch !== mq.matches) {
+ lastMatch = mq.matches;
+ updateMainMenu();
+ }
+ });
+ }
+
+ if (window.matchMedia) {
+ setupMainMenu();
+ }
}
$(document).ready(initCore);
diff --git a/core/js/share.js b/core/js/share.js
index 9ee50ff6963..e769edd0a21 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -48,7 +48,7 @@ OC.Share={
var action = $(file).find('.fileactions .action[data-action="Share"]');
var img = action.find('img').attr('src', image);
action.addClass('permanent');
- action.html(' '+t('core', 'Shared')).prepend(img);
+ action.html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
} else {
var dir = $('#dir').val();
if (dir.length > 1) {
@@ -63,7 +63,7 @@ OC.Share={
if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
img.attr('src', image);
$(action).addClass('permanent');
- $(action).html(' '+t('core', 'Shared')).prepend(img);
+ $(action).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
}
});
}
@@ -103,10 +103,10 @@ OC.Share={
var img = action.find('img').attr('src', image);
if (shares) {
action.addClass('permanent');
- action.html(' '+ escapeHTML(t('core', 'Shared'))).prepend(img);
+ action.html(' <span>'+ escapeHTML(t('core', 'Shared'))+'</span>').prepend(img);
} else {
action.removeClass('permanent');
- action.html(' '+ escapeHTML(t('core', 'Share'))).prepend(img);
+ action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img);
}
}
}
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 069546387c7..57ea5be8be0 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -279,5 +279,109 @@ describe('Core base tests', function() {
expect(OC.generateUrl('apps/files/download{file}', {file: '/Welcome.txt'})).toEqual(OC.webroot + '/index.php/apps/files/download/Welcome.txt');
});
});
+ describe('Main menu mobile toggle', function() {
+ var oldMatchMedia;
+ var $toggle;
+ var $navigation;
+
+ beforeEach(function() {
+ oldMatchMedia = OC._matchMedia;
+ // a separate method was needed because window.matchMedia
+ // cannot be stubbed due to a bug in PhantomJS:
+ // https://github.com/ariya/phantomjs/issues/12069
+ OC._matchMedia = sinon.stub();
+ $('#testArea').append('<div id="header">' +
+ '<a id="owncloud" href="#"></a>' +
+ '</div>' +
+ '<div id="navigation"></div>');
+ $toggle = $('#owncloud');
+ $navigation = $('#navigation');
+ });
+
+ afterEach(function() {
+ OC._matchMedia = oldMatchMedia;
+ });
+ it('Sets up menu toggle in mobile mode', function() {
+ OC._matchMedia.returns({matches: true});
+ window.initCore();
+ expect($toggle.hasClass('menutoggle')).toEqual(true);
+ expect($navigation.hasClass('menu')).toEqual(true);
+ });
+ it('Does not set up menu toggle in desktop mode', function() {
+ OC._matchMedia.returns({matches: false});
+ window.initCore();
+ expect($toggle.hasClass('menutoggle')).toEqual(false);
+ expect($navigation.hasClass('menu')).toEqual(false);
+ });
+ it('Switches on menu toggle when mobile mode changes', function() {
+ var mq = {matches: false};
+ OC._matchMedia.returns(mq);
+ window.initCore();
+ expect($toggle.hasClass('menutoggle')).toEqual(false);
+ mq.matches = true;
+ $(window).trigger('resize');
+ expect($toggle.hasClass('menutoggle')).toEqual(true);
+ });
+ it('Switches off menu toggle when mobile mode changes', function() {
+ var mq = {matches: true};
+ OC._matchMedia.returns(mq);
+ window.initCore();
+ expect($toggle.hasClass('menutoggle')).toEqual(true);
+ mq.matches = false;
+ $(window).trigger('resize');
+ expect($toggle.hasClass('menutoggle')).toEqual(false);
+ });
+ it('Clicking menu toggle toggles navigation in mobile mode', function() {
+ OC._matchMedia.returns({matches: true});
+ window.initCore();
+ $navigation.hide(); // normally done through media query triggered CSS
+ expect($navigation.is(':visible')).toEqual(false);
+ $toggle.click();
+ expect($navigation.is(':visible')).toEqual(true);
+ $toggle.click();
+ expect($navigation.is(':visible')).toEqual(false);
+ });
+ it('Clicking menu toggle does not toggle navigation in desktop mode', function() {
+ OC._matchMedia.returns({matches: false});
+ window.initCore();
+ expect($navigation.is(':visible')).toEqual(true);
+ $toggle.click();
+ expect($navigation.is(':visible')).toEqual(true);
+ });
+ it('Switching to mobile mode hides navigation', function() {
+ var mq = {matches: false};
+ OC._matchMedia.returns(mq);
+ window.initCore();
+ expect($navigation.is(':visible')).toEqual(true);
+ mq.matches = true;
+ $(window).trigger('resize');
+ expect($navigation.is(':visible')).toEqual(false);
+ });
+ it('Switching to desktop mode shows navigation', function() {
+ var mq = {matches: true};
+ OC._matchMedia.returns(mq);
+ window.initCore();
+ expect($navigation.is(':visible')).toEqual(false);
+ mq.matches = false;
+ $(window).trigger('resize');
+ expect($navigation.is(':visible')).toEqual(true);
+ });
+ it('Switch to desktop with opened menu then back to mobile resets toggle', function() {
+ var mq = {matches: true};
+ OC._matchMedia.returns(mq);
+ window.initCore();
+ expect($navigation.is(':visible')).toEqual(false);
+ $toggle.click();
+ expect($navigation.is(':visible')).toEqual(true);
+ mq.matches = false;
+ $(window).trigger('resize');
+ expect($navigation.is(':visible')).toEqual(true);
+ mq.matches = true;
+ $(window).trigger('resize');
+ expect($navigation.is(':visible')).toEqual(false);
+ $toggle.click();
+ expect($navigation.is(':visible')).toEqual(true);
+ });
+ });
});
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 7f4d46aa1f1..52f1a15089a 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,6 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Expiration date is in the past." => "La fecha de caducidad está en el pasado.",
+"Expiration date is in the past." => "Ha pasado la fecha de caducidad",
"Couldn't send mail to following users: %s " => "No se pudo enviar el mensaje a los siguientes usuarios: %s",
"Turned on maintenance mode" => "Modo mantenimiento activado",
"Turned off maintenance mode" => "Modo mantenimiento desactivado",
@@ -105,7 +105,7 @@ $TRANSLATIONS = array(
"Edit tags" => "Editar etiquetas",
"Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
"No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
-"Please reload the page." => "Vuelva a cargar la página.",
+"Please reload the page." => "Recargue/Actualice la página",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
"%s password reset" => "%s restablecer contraseña",
@@ -179,6 +179,6 @@ $TRANSLATIONS = array(
"Thank you for your patience." => "Gracias por su paciencia.",
"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
"This ownCloud instance is currently being updated, which may take a while." => "Esta versión de owncloud se está actualizando, esto puede demorar un tiempo.",
-"Please reload this page after a short time to continue using ownCloud." => "Por favor , recargue esta instancia de onwcloud tras un corto periodo de tiempo y continue usándolo."
+"Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue la página tras un corto periodo de tiempo para continuar usando ownCloud"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 8d84e7d31bc..e2fdc36be0b 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Expiration date is in the past." => "Дата истечения срока действия в прошлом.",
"Couldn't send mail to following users: %s " => "Невозможно отправить письмо следующим пользователям: %s",
"Turned on maintenance mode" => "Режим отладки включён",
"Turned off maintenance mode" => "Режим отладки отключён",
@@ -56,6 +57,11 @@ $TRANSLATIONS = array(
"(all selected)" => "(выбраны все)",
"({count} selected)" => "({count} выбрано)",
"Error loading file exists template" => "Ошибка при загрузке шаблона существующего файла",
+"Very weak password" => "Очень слабый пароль",
+"Weak password" => "Слабый пароль",
+"So-so password" => "Так себе пароль",
+"Good password" => "Хороший пароль",
+"Strong password" => "Устойчивый к взлому пароль",
"Shared" => "Общие",
"Share" => "Открыть доступ",
"Error" => "Ошибка",
@@ -103,6 +109,7 @@ $TRANSLATIONS = array(
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
"%s password reset" => "%s сброс пароля",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Произошла ошибка при отправке сообщения электронной почты, пожалуйста, свяжитесь с Вашим администратором.",
"Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ссылка для сброса пароля отправлена вам ​​по электронной почте.<br>Если вы не получите письмо в пределах одной-двух минут, проверьте папку Спам. <br>Если письма там нет, обратитесь к своему администратору.",
"Request failed!<br>Did you make sure your email/username was right?" => "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?",
@@ -115,6 +122,8 @@ $TRANSLATIONS = array(
"To login page" => "На страницу авторизации",
"New password" => "Новый пароль",
"Reset password" => "Сбросить пароль",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
+"For the best results, please consider using a GNU/Linux server instead." => "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
"Personal" => "Личное",
"Users" => "Пользователи",
"Apps" => "Приложения",
@@ -140,6 +149,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
"Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
+"Storage & database" => "Система хранения данных & база данных",
"Data folder" => "Директория с данными",
"Configure the database" => "Настройка базы данных",
"will be used" => "будет использовано",
@@ -162,6 +172,7 @@ $TRANSLATIONS = array(
"remember" => "запомнить",
"Log in" => "Войти",
"Alternative Logins" => "Альтернативные имена пользователя",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>просто даём вам знать, что %s открыл доступ к %s для вас.<br><a href=\"%s\">Посмотреть!</a><br><br>",
"This ownCloud instance is currently in single user mode." => "Эта установка ownCloud в настоящее время в однопользовательском режиме.",
"This means only administrators can use the instance." => "Это значит, что только администраторы могут использовать эту установку.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2cfdfd11899..49eb4f9aa69 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -122,6 +122,8 @@ $TRANSLATIONS = array(
"To login page" => "Na prijavno stran",
"New password" => "Novo geslo",
"Reset password" => "Ponastavi geslo",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
+"For the best results, please consider using a GNU/Linux server instead." => "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
"Personal" => "Osebno",
"Users" => "Uporabniki",
"Apps" => "Programi",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 03544cd3c0f..affa1b063d0 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -111,7 +111,7 @@ $TRANSLATIONS = array(
"%s password reset" => "%s parola sıfırlama",
"A problem has occurred whilst sending the email, please contact your administrator." => "E-posta gönderilirken bir hata oluştu. Lütfen yönetinizle iletişime geçin.",
"Use the following link to reset your password: {link}" => "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br> Eğer yine bulamazsanız sistem yöneticinize sorunuz.",
"Request failed!<br>Did you make sure your email/username was right?" => "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru olduğundan emin misiniz?",
"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantıyı e-posta olarak alacaksınız.",
"Username" => "Kullanıcı Adı",
diff --git a/core/setup/controller.php b/core/setup/controller.php
index bb9c9101fe2..1a8e9b2b764 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -20,7 +20,7 @@ class Controller {
$errors = array('errors' => $e);
if(count($e) > 0) {
- $options = array_merge($post, $opts, $errors);
+ $options = array_merge($opts, $post, $errors);
$this->display($options);
}
else {
@@ -28,7 +28,8 @@ class Controller {
}
}
else {
- $this->display($opts);
+ $options = array_merge($opts, $post);
+ $this->display($options);
}
}
@@ -41,6 +42,7 @@ class Controller {
'dbname' => '',
'dbtablespace' => '',
'dbhost' => '',
+ 'dbtype' => '',
);
$parameters = array_merge($defaults, $post);
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 91157b923a5..5788d1d5bd3 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -36,7 +36,7 @@
<body id="body-login">
<div class="wrapper"><!-- for sticky footer -->
<header><div id="header">
- <div class='logo'></div>
+ <div class="logo svg"></div>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
</div></header>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3d897503480..ba5f6ef9b54 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -15,7 +15,7 @@
</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.0">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
<meta name="apple-itunes-app" content="app-id=543672169">
<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
@@ -46,7 +46,7 @@
</div>
<header><div id="header">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud">
- <div class='logo-wide'></div>
+ <div class="logo-wide svg"></div>
</a>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div id="settings" class="svg">