]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoRectify variable $uid->$user 5665/head
Roger Szabo [Mon, 10 Jul 2017 10:38:30 +0000 (18:38 +0800)]
Rectify variable $uid->$user

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agopass missing function parameter
Roger Szabo [Wed, 21 Jun 2017 06:40:44 +0000 (14:40 +0800)]
pass missing function parameter

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agocss for button adjustment for nc12
Roger Szabo [Thu, 22 Jun 2017 07:53:11 +0000 (15:53 +0800)]
css for button adjustment for nc12

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agoset needsPasswordReset flag correctly
Roger Szabo [Thu, 22 Jun 2017 07:58:30 +0000 (15:58 +0800)]
set needsPasswordReset flag correctly

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agosuppress superflous php error on rejected password change
Roger Szabo [Fri, 30 Jun 2017 10:36:33 +0000 (18:36 +0800)]
suppress superflous php error on rejected password change

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 10 Jul 2017 00:08:51 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 9 Jul 2017 00:08:41 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 8 Jul 2017 00:08:37 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails
Morris Jobke [Fri, 7 Jul 2017 12:04:01 +0000 (14:04 +0200)]
Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails

[stable12] Use PNG icons for activity emails and ios client

7 years agoMerge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares
Björn Schießle [Fri, 7 Jul 2017 09:54:11 +0000 (11:54 +0200)]
Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares

[stable12] Use the share_folder config for remote shares

7 years agoFix tests 5648/head
Joas Schilling [Tue, 20 Jun 2017 12:25:24 +0000 (14:25 +0200)]
Fix tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse PNG version of the icons for shipped activities
Joas Schilling [Tue, 20 Jun 2017 11:48:51 +0000 (13:48 +0200)]
Use PNG version of the icons for shipped activities

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd a flag to allow checking if SVGs are okay
Joas Schilling [Tue, 20 Jun 2017 10:40:45 +0000 (12:40 +0200)]
Add a flag to allow checking if SVGs are okay

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-for...
Morris Jobke [Fri, 7 Jul 2017 08:46:11 +0000 (10:46 +0200)]
Merge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-for-group-restricted-apps

[stable12] Don't load navigation entries of restricted apps

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 7 Jul 2017 00:08:35 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoAdjust tests to the old settings menu 5617/head
Joas Schilling [Thu, 6 Jul 2017 07:30:42 +0000 (09:30 +0200)]
Adjust tests to the old settings menu

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spam
Joas Schilling [Thu, 6 Jul 2017 06:43:39 +0000 (08:43 +0200)]
Merge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spam

[stable12] Don't try to generate logs for chunking paths

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 6 Jul 2017 00:08:53 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5619 from nextcloud/backport-5557-dont-log-passwords-on-dav-excep...
blizzz [Wed, 5 Jul 2017 20:15:04 +0000 (22:15 +0200)]
Merge pull request #5619 from nextcloud/backport-5557-dont-log-passwords-on-dav-exceptions-either

[stable12] Don't log passwords on dav exceptions

7 years agoMerge pull request #5434 from nextcloud/backport-5404-translated-hint-password-policy
Morris Jobke [Wed, 5 Jul 2017 14:21:30 +0000 (16:21 +0200)]
Merge pull request #5434 from nextcloud/backport-5404-translated-hint-password-policy

Use translated Hint instead of english error on password policy

7 years agoDon't log passwords on dav exceptions 5619/head
Joas Schilling [Thu, 29 Jun 2017 09:43:32 +0000 (11:43 +0200)]
Don't log passwords on dav exceptions

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't load navigation entries of restricted apps
Joas Schilling [Wed, 5 Jul 2017 11:52:51 +0000 (13:52 +0200)]
Don't load navigation entries of restricted apps

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #5613 from nextcloud/stable12-5549
Morris Jobke [Wed, 5 Jul 2017 10:52:25 +0000 (12:52 +0200)]
Merge pull request #5613 from nextcloud/stable12-5549

[stable12] Add info text about updates

7 years agoUpdate admin.php 5613/head
Jos Poortvliet [Tue, 27 Jun 2017 15:00:06 +0000 (17:00 +0200)]
Update admin.php

add a note on our staged roll-out.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #5584 from nextcloud/stable12-5429
Joas Schilling [Wed, 5 Jul 2017 09:30:08 +0000 (11:30 +0200)]
Merge pull request #5584 from nextcloud/stable12-5429

[stable12] Use base url for cache prefix and SCSS caching

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 5 Jul 2017 00:08:36 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5525 from nextcloud/stable12-5517
Morris Jobke [Tue, 4 Jul 2017 17:36:08 +0000 (19:36 +0200)]
Merge pull request #5525 from nextcloud/stable12-5517

[stable12] Enhance the logging if the part file can not be renamed

7 years agoMerge pull request #5601 from nextcloud/stable12-5460-5526
Morris Jobke [Tue, 4 Jul 2017 15:37:45 +0000 (17:37 +0200)]
Merge pull request #5601 from nextcloud/stable12-5460-5526

[stable12] Improved logging for object storage and trashbin

7 years agoImprove logging of trash bin inconsistencies 5601/head
Morris Jobke [Fri, 23 Jun 2017 21:09:00 +0000 (16:09 -0500)]
Improve logging of trash bin inconsistencies

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoimproved logging of objectore errors
Robin Appelman [Mon, 19 Jun 2017 11:52:51 +0000 (13:52 +0200)]
improved logging of objectore errors

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #5583 from nextcloud/stable12-5450
Morris Jobke [Tue, 4 Jul 2017 09:01:12 +0000 (11:01 +0200)]
Merge pull request #5583 from nextcloud/stable12-5450

[stable12] Fix more icon in apps menu on bright backgrounds

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 4 Jul 2017 00:08:34 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 3 Jul 2017 00:08:31 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoFix tests 5584/head
Julius Härtl [Fri, 16 Jun 2017 09:06:26 +0000 (11:06 +0200)]
Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoFix theming app to also use the prefix
Julius Härtl [Thu, 15 Jun 2017 20:14:39 +0000 (22:14 +0200)]
Fix theming app to also use the prefix

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoAdd tests and inject IRequest
Julius Härtl [Thu, 15 Jun 2017 19:51:51 +0000 (21:51 +0200)]
Add tests and inject IRequest

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoDo not open version file again
Julius Härtl [Thu, 15 Jun 2017 10:46:51 +0000 (12:46 +0200)]
Do not open version file again

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoMake cache and scss caching depend on the baseUrl
Julius Härtl [Thu, 15 Jun 2017 10:35:16 +0000 (12:35 +0200)]
Make cache and scss caching depend on the baseUrl

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoFix more icon in apps menu on bright backgrounds 5583/head
Julius Härtl [Sat, 17 Jun 2017 08:08:31 +0000 (10:08 +0200)]
Fix more icon in apps menu on bright backgrounds

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 2 Jul 2017 00:08:23 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 1 Jul 2017 00:08:38 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 30 Jun 2017 00:08:35 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 29 Jun 2017 00:08:35 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 28 Jun 2017 00:08:28 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 27 Jun 2017 00:08:26 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 26 Jun 2017 00:08:40 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 25 Jun 2017 00:08:27 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 24 Jun 2017 00:08:39 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoEnhance the logging if the part file can not be renamed 5525/head
Morris Jobke [Thu, 22 Jun 2017 22:48:19 +0000 (17:48 -0500)]
Enhance the logging if the part file can not be renamed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #5507 from derkostka/stable12
Morris Jobke [Fri, 23 Jun 2017 20:43:15 +0000 (15:43 -0500)]
Merge pull request #5507 from derkostka/stable12

[stable12] Use realpath to obtain the webroot

7 years agoMerge pull request #5521 from nextcloud/backport-5508-no-acitivity-before-login
Morris Jobke [Fri, 23 Jun 2017 16:23:50 +0000 (11:23 -0500)]
Merge pull request #5521 from nextcloud/backport-5508-no-acitivity-before-login

[stable12] Don't create activities for email and password change before login

7 years agoMerge pull request #5509 from nextcloud/backport-5498-allow-to-force-a-language
blizzz [Fri, 23 Jun 2017 12:24:05 +0000 (14:24 +0200)]
Merge pull request #5509 from nextcloud/backport-5498-allow-to-force-a-language

[stable12] Allow to force a language and set it via the ocs api

7 years agoDon't create activities for email and password change before login 5521/head
Joas Schilling [Thu, 22 Jun 2017 07:02:12 +0000 (09:02 +0200)]
Don't create activities for email and password change before login

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 23 Jun 2017 00:09:22 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5511 from nextcloud/5491-stable12
Joas Schilling [Thu, 22 Jun 2017 12:11:43 +0000 (14:11 +0200)]
Merge pull request #5511 from nextcloud/5491-stable12

[stable12] Create users in non default backends first

7 years agoCreate users in non default backends first 5511/head
Joas Schilling [Tue, 20 Jun 2017 17:59:41 +0000 (19:59 +0200)]
Create users in non default backends first

Most of the time, when people have multiple backends or add a
custom backend, they want to create the users there and not in
the default backend. But since that is registered first, users
were always created there.

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUpdate autoloader 5509/head
Morris Jobke [Wed, 21 Jun 2017 19:41:47 +0000 (14:41 -0500)]
Update autoloader

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd unit tests for the new code
Joas Schilling [Wed, 21 Jun 2017 10:21:21 +0000 (12:21 +0200)]
Add unit tests for the new code

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAllow to force a language and set it via the ocs api
Joas Schilling [Wed, 21 Jun 2017 09:22:05 +0000 (11:22 +0200)]
Allow to force a language and set it via the ocs api

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[stable12] Use realpath to obtain the webroot 5507/head
Sebastian Kostka [Thu, 22 Jun 2017 06:37:11 +0000 (08:37 +0200)]
[stable12] Use realpath to obtain the webroot

Use realpath to obtain the webroot - backport
Signed-off-by: Sebastian Kostka sebastian.kostka@gmail.com
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 22 Jun 2017 00:08:46 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5489 from nextcloud/stable12-5061
Morris Jobke [Wed, 21 Jun 2017 21:28:57 +0000 (16:28 -0500)]
Merge pull request #5489 from nextcloud/stable12-5061

[stable12] Fix example theme

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 21 Jun 2017 00:08:24 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMove styles.css to server.css 5489/head
Julius Härtl [Tue, 23 May 2017 09:14:49 +0000 (11:14 +0200)]
Move styles.css to server.css

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoMerge pull request #5480 from nextcloud/backport-5459-group-admins-change-settings
Morris Jobke [Tue, 20 Jun 2017 15:54:09 +0000 (10:54 -0500)]
Merge pull request #5480 from nextcloud/backport-5459-group-admins-change-settings

[stable12] Don't try to save the setting when its not an admin

7 years agoAlso allow group admins to toogle the storage location 5480/head
Joas Schilling [Tue, 20 Jun 2017 08:35:22 +0000 (10:35 +0200)]
Also allow group admins to toogle the storage location

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't try to save the setting when its not an admin
Joas Schilling [Mon, 19 Jun 2017 10:55:00 +0000 (12:55 +0200)]
Don't try to save the setting when its not an admin

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 20 Jun 2017 00:08:51 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoRevert "dont die if we try to access the shared cache while setting up the shared...
Robin Appelman [Mon, 19 Jun 2017 12:00:27 +0000 (14:00 +0200)]
Revert "dont die if we try to access the shared cache while setting up the shared storage"

Revent accidental push

This reverts commit ed8903404768f5957ddf39f5979741b18000f69d.

7 years agodont die if we try to access the shared cache while setting up the shared storage
Robin Appelman [Wed, 24 May 2017 11:56:09 +0000 (13:56 +0200)]
dont die if we try to access the shared cache while setting up the shared storage

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoUse the share_folder config for remote shares 5458/head
Joas Schilling [Tue, 13 Jun 2017 12:30:25 +0000 (14:30 +0200)]
Use the share_folder config for remote shares

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 19 Jun 2017 00:08:29 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5442 from Bekcpear/stable12
Morris Jobke [Sat, 17 Jun 2017 23:32:47 +0000 (18:32 -0500)]
Merge pull request #5442 from Bekcpear/stable12

Fix upload remaining time and uploadrate value

7 years agoMerge pull request #5420 from nextcloud/stable12-appmenu-fixes
Morris Jobke [Sat, 17 Jun 2017 23:28:59 +0000 (18:28 -0500)]
Merge pull request #5420 from nextcloud/stable12-appmenu-fixes

[stable12] App menu fixes

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 17 Jun 2017 00:08:36 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoFix upload remaining time and uploadrate value 5442/head
Yaojin Qian [Fri, 16 Jun 2017 14:03:28 +0000 (22:03 +0800)]
Fix upload remaining time and uploadrate value

1. The upload remaining time is always 'a few second' whatever a big or a
small file uploading.
This commit fixes it. The `new Date().getMilliseconds()` only return a
three digits number. When time arrived the next second, the millisecond
start from ZERO again. So `new Date().getTime()` is the righe choice.
And remaining time variables shoule be initialized when the file starts
uploading, otherwise the remaining time of a new upload will always be
'Infinity years' until you refresh the page.

2. The unit of `data.bitrate` is bit, but the argument unit of
`humanFileSize` function is byte, so it should be divided by 8.

Signed-off-by: Yaojin Qian <i@ume.ink>
7 years agoUse translated Hint instead of english error on password policy 5434/head
Joas Schilling [Wed, 14 Jun 2017 10:17:16 +0000 (12:17 +0200)]
Use translated Hint instead of english error on password policy

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't try to generate logs for chunking paths 5433/head
Joas Schilling [Wed, 31 May 2017 09:10:42 +0000 (11:10 +0200)]
Don't try to generate logs for chunking paths

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 16 Jun 2017 00:08:53 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5428 from nextcloud/5384-stable12
Morris Jobke [Thu, 15 Jun 2017 17:53:34 +0000 (12:53 -0500)]
Merge pull request #5428 from nextcloud/5384-stable12

[stable12] Allow to find local users by their email address

7 years agoBackport of #5384 to stable12 5428/head
Joas Schilling [Tue, 13 Jun 2017 16:07:47 +0000 (18:07 +0200)]
Backport of #5384 to stable12

Allow to find local users by their email address

Signed-off-by: Joas Schilling <coding@schilljs.com>
Make sure to only add system users once

Signed-off-by: Joas Schilling <coding@schilljs.com>
Add unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #5422 from nextcloud/5190-stable12
Morris Jobke [Thu, 15 Jun 2017 15:20:12 +0000 (10:20 -0500)]
Merge pull request #5422 from nextcloud/5190-stable12

[stable12] Treat PHP Errors on User session regenerate

7 years agoMerge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12
Lukas Reschke [Thu, 15 Jun 2017 11:29:42 +0000 (13:29 +0200)]
Merge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12

[stable12] Ldap attempt reconnect stable12

7 years agoForward port of #5190 to stable12 5422/head
Arthur Schiwon [Wed, 31 May 2017 10:15:06 +0000 (12:15 +0200)]
Forward port of #5190 to stable12

Treat PHP Errors on User session regenerate

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
remove unnecessary lines…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
change PHP errors to ErrorException in the session (PHP >=7)

Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoShow at least 8 icons, don't use percentage on mobile 5420/head
Julius Härtl [Wed, 14 Jun 2017 09:08:45 +0000 (11:08 +0200)]
Show at least 8 icons, don't use percentage on mobile

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoDecimal percentage, dynamic appIcon width
Patrik Kernstock [Sat, 10 Jun 2017 15:33:01 +0000 (17:33 +0200)]
Decimal percentage, dynamic appIcon width

Signed-off-by: Patrik Kernstock <info@pkern.at>
7 years agoNow using dynamic percentual appmenu limit
Patrik Kernstock [Sun, 4 Jun 2017 01:26:40 +0000 (03:26 +0200)]
Now using dynamic percentual appmenu limit

Signed-off-by: Patrik Kernstock <info@pkern.at>
7 years agoClosed #5121, remove appmenu limit
Patrik Kernstock [Fri, 26 May 2017 17:39:22 +0000 (19:39 +0200)]
Closed #5121, remove appmenu limit

Signed-off-by: Patrik Kernstock <info@pkern.at>
7 years agoMerge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_requests_t...
Morris Jobke [Thu, 15 Jun 2017 04:11:18 +0000 (23:11 -0500)]
Merge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_requests_to_groupshares

[stable12] allow users to send PropPatch request when calendar is group-shared with them

7 years agoMerge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_url_spec...
Morris Jobke [Thu, 15 Jun 2017 04:10:19 +0000 (23:10 -0500)]
Merge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_url_special_char_issue

[stable12] urldecode group principals in Cal- and CardDAV backend

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 15 Jun 2017 00:08:52 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5416 from nextcloud/stable12-5392
Morris Jobke [Wed, 14 Jun 2017 23:04:06 +0000 (18:04 -0500)]
Merge pull request #5416 from nextcloud/stable12-5392

[stable12] Use the guest.css for the maintenance page as well

7 years agoMerge pull request #5397 from nextcloud/stable12-5072
Morris Jobke [Wed, 14 Jun 2017 16:30:38 +0000 (11:30 -0500)]
Merge pull request #5397 from nextcloud/stable12-5072

[stable12] Fixed a crash caused by Local::copyFromStorage() not conforming to Co…

7 years agoMerge pull request #5026 from nextcloud/filename-input-tooltip-stable12
Morris Jobke [Wed, 14 Jun 2017 16:29:03 +0000 (11:29 -0500)]
Merge pull request #5026 from nextcloud/filename-input-tooltip-stable12

[stable12] Make file name input tooltip error text change

7 years agoMerge pull request #5401 from nextcloud/translate-oauth2
Morris Jobke [Wed, 14 Jun 2017 16:22:56 +0000 (11:22 -0500)]
Merge pull request #5401 from nextcloud/translate-oauth2

Translate OAuth2 in stable12

7 years agoUse the guest.css for the maintenance page as well 5416/head
Morris Jobke [Tue, 13 Jun 2017 21:43:25 +0000 (16:43 -0500)]
Use the guest.css for the maintenance page as well

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #5402 from nextcloud/stable12-fix/contactsmenu-l10n-search-placeholder
Joas Schilling [Wed, 14 Jun 2017 12:45:15 +0000 (14:45 +0200)]
Merge pull request #5402 from nextcloud/stable12-fix/contactsmenu-l10n-search-placeholder

[stable12] Localize contacts menu search input placeholder

7 years agoMerge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via...
Joas Schilling [Wed, 14 Jun 2017 12:24:01 +0000 (14:24 +0200)]
Merge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via-email

[stable12] Prevent sending second WWW-Authenticate header

7 years agoLocalize contacts menu search input placeholder 5402/head
Christoph Wurst [Wed, 14 Jun 2017 08:29:36 +0000 (10:29 +0200)]
Localize contacts menu search input placeholder

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoTranslate OAuth2 in stable12 5401/head
Joas Schilling [Wed, 14 Jun 2017 09:50:58 +0000 (11:50 +0200)]
Translate OAuth2 in stable12

Signed-off-by: Joas Schilling <coding@schilljs.com>