summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-11-024-2/+12
|
* Merge pull request #7040 from nextcloud/7039_12Joas Schilling2017-11-011-2/+2
|\ | | | | [stable12] Translate Grant Access
| * Translate Grant AccessRoeland Jago Douma2017-11-011-2/+2
|/ | | | | | Fixes #7038 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2017-11-0184-110/+310
|
* Merge pull request #7028 from nextcloud/stable12-login-readabilityJan-Christoph Borchardt2017-10-311-0/+2
|\ | | | | [stable12] Better readability for text on log in page which is directly on backgrounds
| * Better readability for text on log in page which is directly on backgroundsJan-Christoph Borchardt2017-10-311-0/+2
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #6878 from nextcloud/allow-migrating-from-10.0.3.3Joas Schilling2017-10-311-0/+1
|\ \ | |/ |/| Allow to migrate from 10.0.3.3
| * Allow to migrate from 10.0.3.3Joas Schilling2017-10-191-0/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-10-3122-34/+348
| |
* | Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changedMorris Jobke2017-10-303-1/+7
|\ \ | | | | | | #6307 fix page title not changed (stable12)
| * | bugfix: set/change page title when switching to file tagsBernd Stellwag2017-10-271-0/+3
| | | | | | | | | | | | Signed-off-by: Bernd Stellwag <burned@zerties.org>
| * | bugfix: set/change page title when switching to filelistBernd Stellwag2017-10-272-1/+4
| | | | | | | | | | | | Signed-off-by: Bernd Stellwag <burned@zerties.org>
* | | [tx-robot] updated from transifexNextcloud bot2017-10-306-8/+10
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-10-298-20/+38
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-10-2814-86/+122
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-10-2728-32/+128
| |
* | [tx-robot] updated from transifexNextcloud bot2017-10-26102-150/+226
| |
* | Merge pull request #6935 from nextcloud/12-5780Morris Jobke2017-10-253-11/+4
|\ \ | | | | | | Backport of translation string fixes
| * | Merge vendor/core.jsMorris Jobke2017-10-251-7/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add space between ellipsis and wordMorris Jobke2017-10-252-3/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Update file-upload.jsrakekniven2017-10-241-2/+2
| | | | | | | | | Fixed tiny translation issues. Removed space before ellipsis.
| * | Replace ... with …Morris Jobke2017-10-242-4/+4
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6944 from nextcloud/12-6433Morris Jobke2017-10-251-2/+2
|\ \ \ | | | | | | | | [stable12] Fix uninitialized variable $this->params
| * | | Fix uninitialized variable $this->paramsWilliam Pain2017-10-251-2/+2
| |/ / | | | | | | | | | Signed-off-by: William Pain <pain.william@gmail.com>
* | | Merge pull request #6946 from nextcloud/12-6574Morris Jobke2017-10-251-1/+1
|\ \ \ | | | | | | | | [stable12] Fix undefined offset warning when using '/' as external storage root
| * | | Fix undefined offset warning when using '/' as external storage rootRobin Appelman2017-10-251-1/+1
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #6942 from nextcloud/12-6826Joas Schilling2017-10-251-6/+12
|\ \ \ | | | | | | | | [stable12] Fix class name in exception logger plugin
| * | | Use ::class to avoid errorsJoas Schilling2017-10-251-6/+12
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix class name, regression from 44cf67accdc294f46bf82b3f8661f353dc5e22f0Joas Schilling2017-10-251-1/+1
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #6943 from nextcloud/12-6758blizzz2017-10-251-1/+1
|\ \ \ | | | | | | | | [stable12] Allow quota of 0 again
| * | | Allow quota of 0 againJoas Schilling2017-10-251-1/+1
| |/ / | | | | | | | | | | | | | | | Regression from f1fccaca0605a5d183f78b2c39d2e09a54753787 Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #6945 from nextcloud/12-6633Roeland Jago Douma2017-10-251-1/+5
|\ \ \ | | | | | | | | [stable12] Don't add a LIKE condition when it's not needed
| * | | Don't add a LIKE condition when it's not neededThomas Citharel2017-10-251-1/+5
| |/ / | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* / / [tx-robot] updated from transifexNextcloud bot2017-10-25100-80/+396
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-10-24210-178/+4660
| |
* | Merge pull request #6910 from nextcloud/backport-6677-s12Morris Jobke2017-10-233-18/+12
|\ \ | | | | | | [stable12] don't reset quota
| * | and add missing whitespaces to log outoutArthur Schiwon2017-10-231-2/+2
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | Adjust unittestJuan Pablo Villafáñez2017-10-231-15/+10
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | Keep the current quota if no suitable quota is foundJuan Pablo Villafáñez2017-10-231-1/+0
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #6896 from nextcloud/12-timespan-checkMorris Jobke2017-10-232-9/+54
|\ \ \ | | | | | | | | [12] timespan check
| * | | Provide tests for future timestamp formattingMorris Jobke2017-10-231-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Correctiondartcafe2017-10-221-22/+21
| | | | | | | | | | | | | | | | Signed-off-by: dartcafe <github@dartcafe.de>
| * | | Fix future time spansdartcafe2017-10-221-12/+49
| | | | | | | | | | | | | | | | Signed-off-by: dartcafe <github@dartcafe.de>
* | | | Merge pull request #6908 from nextcloud/6132-12Morris Jobke2017-10-232-3/+10
|\ \ \ \ | |_|/ / |/| | | [stable12] Do not log WebDAV maintenance mode exception
| * | | Do not log WebDAV maintenance mode exceptionMorris Jobke2017-10-232-3/+10
|/ / / | | | | | | | | | | | | | | | Log the maintenance mode exception only in debug level. Fixes #6124 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / [tx-robot] updated from transifexNextcloud bot2017-10-2310-6/+112
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-10-2212-6/+178
| |
* | [tx-robot] updated from transifexNextcloud bot2017-10-2126-12/+118
| |
* | [tx-robot] updated from transifexNextcloud bot2017-10-2020-4/+260
| |
* | [tx-robot] updated from transifexNextcloud bot2017-10-19206-442/+556
|/