]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoRemove wrong entry in admin_settings that causes 500 7455/head
Morris Jobke [Mon, 20 Nov 2017 16:23:20 +0000 (17:23 +0100)]
Remove wrong entry in admin_settings that causes 500

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #7451 from nextcloud/12-7433
Morris Jobke [Mon, 11 Dec 2017 16:25:36 +0000 (17:25 +0100)]
Merge pull request #7451 from nextcloud/12-7433

[stable12] Fix constructor spy in unit test with Sinon 4.1.3

6 years agoFix constructor spy in unit test with Sinon 4.1.3 7451/head
Daniel Calviño Sánchez [Fri, 8 Dec 2017 17:55:38 +0000 (18:55 +0100)]
Fix constructor spy in unit test with Sinon 4.1.3

When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 11 Dec 2017 01:10:34 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 10 Dec 2017 01:10:38 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 9 Dec 2017 01:10:36 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #7409 from nextcloud/swift-retry-12
Roeland Jago Douma [Fri, 8 Dec 2017 08:26:41 +0000 (09:26 +0100)]
Merge pull request #7409 from nextcloud/swift-retry-12

[12]add retry wrapper when reading files from swift

6 years agoMerge pull request #7407 from nextcloud/12_7348
Morris Jobke [Fri, 8 Dec 2017 08:22:07 +0000 (09:22 +0100)]
Merge pull request #7407 from nextcloud/12_7348

[stable12] Check if owner of share exists

6 years agoMerge pull request #7323 from nextcloud/shared-jailed-source-root-12
Morris Jobke [Fri, 8 Dec 2017 08:03:03 +0000 (09:03 +0100)]
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12

[12]Use the correct root for shared jail when the source storage is also a jail

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 8 Dec 2017 01:10:26 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 7 Dec 2017 01:10:49 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agoadd retry wrapper when reading files from swift 7409/head
Robin Appelman [Mon, 4 Dec 2017 15:34:53 +0000 (16:34 +0100)]
add retry wrapper when reading files from swift

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoFix tests 7407/head
Roeland Jago Douma [Fri, 1 Dec 2017 11:34:37 +0000 (12:34 +0100)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoA failed storage is a not available storage
Roeland Jago Douma [Thu, 30 Nov 2017 20:29:06 +0000 (21:29 +0100)]
A failed storage is a not available storage

We have to double check. Since getting the info of the root returns a
generic entry. But actually the stroage is not available. Else we get
very weird sync and web behavior.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 6 Dec 2017 01:10:37 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 5 Dec 2017 01:10:33 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agodelay calculating the shared cache root until it's used 7323/head
Robin Appelman [Mon, 4 Dec 2017 14:16:39 +0000 (15:16 +0100)]
delay calculating the shared cache root until it's used

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #7144 from nextcloud/rename-locks-stable12
Morris Jobke [Mon, 4 Dec 2017 10:13:19 +0000 (11:13 +0100)]
Merge pull request #7144 from nextcloud/rename-locks-stable12

Unlock files even if an exception occurs (stable12)

6 years agoMerge pull request #7322 from nextcloud/12-6303
Morris Jobke [Mon, 4 Dec 2017 10:12:51 +0000 (11:12 +0100)]
Merge pull request #7322 from nextcloud/12-6303

[stable12] Set primary action button color to same as theming color

6 years agoMerge pull request #7353 from nextcloud/12-7346
Morris Jobke [Mon, 4 Dec 2017 10:12:32 +0000 (11:12 +0100)]
Merge pull request #7353 from nextcloud/12-7346

[stable12] Fix translation of federation scope menu

6 years agoMerge pull request #7362 from nextcloud/12-7347
Morris Jobke [Mon, 4 Dec 2017 10:06:01 +0000 (11:06 +0100)]
Merge pull request #7362 from nextcloud/12-7347

[stable12] Allow to skip data dir permission checks by config

6 years agoMerge pull request #7355 from nextcloud/12.0.4-final v12.0.4
Morris Jobke [Mon, 4 Dec 2017 07:17:45 +0000 (08:17 +0100)]
Merge pull request #7355 from nextcloud/12.0.4-final

Release 12.0.4

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 4 Dec 2017 01:10:42 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 3 Dec 2017 01:10:35 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 2 Dec 2017 01:10:44 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agoAllow to skip data dir permission checks by config 7362/head
Arthur Schiwon [Thu, 30 Nov 2017 10:16:00 +0000 (11:16 +0100)]
Allow to skip data dir permission checks by config

Enables installation on services that don't allow/support permission
changes.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 1 Dec 2017 01:10:32 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agoRelease 12.0.4 7355/head
Morris Jobke [Thu, 30 Nov 2017 15:25:04 +0000 (16:25 +0100)]
Release 12.0.4

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoFix translation of federation scope menu 7353/head
Morris Jobke [Thu, 30 Nov 2017 10:11:40 +0000 (11:11 +0100)]
Fix translation of federation scope menu

* l10n in Nextcloud works by extracting the values only passed on their location and not based on the first parameter
* we need to change the translation pool from `core` to `settings` then
* fixes #7345

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 30 Nov 2017 01:13:31 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex 7341/head
Nextcloud bot [Wed, 29 Nov 2017 01:10:26 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #7330 from nextcloud/1204-rc3 v12.0.4RC3
Morris Jobke [Tue, 28 Nov 2017 19:21:47 +0000 (20:21 +0100)]
Merge pull request #7330 from nextcloud/1204-rc3

12.0.4 RC3

6 years ago12.0.4 RC3 7330/head
Morris Jobke [Tue, 28 Nov 2017 19:19:23 +0000 (20:19 +0100)]
12.0.4 RC3

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #7328 from nextcloud/backport/7327/access-list-regression-for...
Morris Jobke [Tue, 28 Nov 2017 19:16:32 +0000 (20:16 +0100)]
Merge pull request #7328 from nextcloud/backport/7327/access-list-regression-for-not-current-accesss

[stable12]  Only in case of $currentAccess the array uses the id as index

6 years agoOnly in case of $currentAccess the array uses the id as index 7328/head
Joas Schilling [Tue, 28 Nov 2017 15:38:16 +0000 (16:38 +0100)]
Only in case of $currentAccess the array uses the id as index

Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.

Regression from 3820d6883dffcaa49deb1054ae0f32ab3d3e39b1

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoFix current access list test and add one for $currentAccess === false
Joas Schilling [Tue, 28 Nov 2017 16:16:47 +0000 (17:16 +0100)]
Fix current access list test and add one for $currentAccess === false

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoUse the correct root for shared jail when the source storage is also a jail
Robin Appelman [Fri, 10 Nov 2017 16:02:35 +0000 (17:02 +0100)]
Use the correct root for shared jail when the source storage is also a jail

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoSet primary action button color to same as theming color 7322/head
Jan-Christoph Borchardt [Tue, 29 Aug 2017 14:05:18 +0000 (16:05 +0200)]
Set primary action button color to same as theming color

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 28 Nov 2017 01:10:05 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #7261 from nextcloud/prepare-12.0.4-RC2 v12.0.4RC2
Roeland Jago Douma [Mon, 27 Nov 2017 09:09:30 +0000 (10:09 +0100)]
Merge pull request #7261 from nextcloud/prepare-12.0.4-RC2

Prepare 12.0.4 RC2

6 years agoMerge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot
Roeland Jago Douma [Mon, 27 Nov 2017 09:08:27 +0000 (10:08 +0100)]
Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot

[stable12] CSSResourceLocator: handle SCSS in apps outside root

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 27 Nov 2017 01:10:03 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 25 Nov 2017 01:10:10 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #7277 from nextcloud/12-7268
Lukas Reschke [Fri, 24 Nov 2017 13:40:36 +0000 (14:40 +0100)]
Merge pull request #7277 from nextcloud/12-7268

[stable12] Update CRL due to files_frommail

7 years agoUpdate CRL due to files_frommail 7277/head
Morris Jobke [Thu, 23 Nov 2017 16:56:58 +0000 (17:56 +0100)]
Update CRL due to files_frommail

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 24 Nov 2017 01:10:06 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #7262 from nextcloud/backport/7168/files-access-list-with-integer...
Morris Jobke [Thu, 23 Nov 2017 12:54:46 +0000 (13:54 +0100)]
Merge pull request #7262 from nextcloud/backport/7168/files-access-list-with-integer-userid

[stable12] Fix accesslist when a user has an ID only containting 0-9

7 years agoMerge pull request #7245 from nextcloud/feature/noid/allow-migration-from-comingup...
Morris Jobke [Thu, 23 Nov 2017 12:46:08 +0000 (13:46 +0100)]
Merge pull request #7245 from nextcloud/feature/noid/allow-migration-from-comingup-oc-release

Allow migration from upcoming 10.0.4 ownCloud release

7 years agoFix accesslist when a user has an ID only containting 0-9 7262/head
Joas Schilling [Tue, 14 Nov 2017 16:21:16 +0000 (17:21 +0100)]
Fix accesslist when a user has an ID only containting 0-9

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoPrepare 12.0.4 RC2 7261/head
Morris Jobke [Thu, 23 Nov 2017 12:02:20 +0000 (13:02 +0100)]
Prepare 12.0.4 RC2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #7259 from nextcloud/7211-stable12
Morris Jobke [Thu, 23 Nov 2017 12:00:37 +0000 (13:00 +0100)]
Merge pull request #7259 from nextcloud/7211-stable12

[stable12] only replace permission popupmenu

7 years agoonly replace permission popupmenu 7259/head
Arthur Schiwon [Fri, 17 Nov 2017 16:08:29 +0000 (17:08 +0100)]
only replace permission popupmenu

the contacts popovermenu is also present and is being replaces, ending
up in two permission popupmenus with checkboxes duplicating the id,
breaking further permission changes.

plus, fixing a selector

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoCSSResourceLocator: handle SCSS in apps outside root 7257/head
Kyle Fazzari [Thu, 23 Nov 2017 05:30:21 +0000 (21:30 -0800)]
CSSResourceLocator: handle SCSS in apps outside root

Currently static CSS files work fine in apps outside of the root.
However, as soon as an app uses SCSS, Nextcloud starts being unable to
find the web root.

Fix this problem by backporting select snippets from master
specifically targeting this issue, and add a test to ensure it doesn't
regress.

Fix #5289

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 23 Nov 2017 01:09:59 +0000 (01:09 +0000)]
[tx-robot] updated from transifex

7 years agoAllow migration from upcoming 10.0.4 ownCloud release 7245/head
Joas Schilling [Wed, 22 Nov 2017 13:02:22 +0000 (14:02 +0100)]
Allow migration from upcoming 10.0.4 ownCloud release

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 22 Nov 2017 01:10:22 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 21 Nov 2017 01:10:20 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #7225 from nextcloud/12.0.4RC-version v12.0.4RC1
Roeland Jago Douma [Mon, 20 Nov 2017 11:59:47 +0000 (12:59 +0100)]
Merge pull request #7225 from nextcloud/12.0.4RC-version

12.0.4 RC

7 years agoMerge pull request #7170 from kyrofa/backport/6028/app_path_realpath
Roeland Jago Douma [Mon, 20 Nov 2017 11:58:10 +0000 (12:58 +0100)]
Merge pull request #7170 from kyrofa/backport/6028/app_path_realpath

[stable12] {J,CS}SResourceLocator: account for symlinks in app path

7 years ago12.0.4 RC 7225/head
Morris Jobke [Mon, 20 Nov 2017 10:43:33 +0000 (11:43 +0100)]
12.0.4 RC

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 20 Nov 2017 01:09:53 +0000 (01:09 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 19 Nov 2017 01:10:04 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 18 Nov 2017 01:10:56 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #7207 from nextcloud/fix-object-storage-touch-12
Björn Schießle [Fri, 17 Nov 2017 13:48:53 +0000 (14:48 +0100)]
Merge pull request #7207 from nextcloud/fix-object-storage-touch-12

[stable12] touch opertation on object storage, don't create the file cache entry to early

7 years agoonly create the file cache entry after the empty file was created successfully, other... 7207/head
Bjoern Schiessle [Fri, 17 Nov 2017 10:59:25 +0000 (11:59 +0100)]
only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #7186 from nextcloud/s3-download-stream-fix-12
Björn Schießle [Fri, 17 Nov 2017 11:44:40 +0000 (12:44 +0100)]
Merge pull request #7186 from nextcloud/s3-download-stream-fix-12

[12] Fix s3 download and touch

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 17 Nov 2017 01:10:03 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 16 Nov 2017 01:10:03 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years agoUse non empty files for object store touch 7186/head
Robin Appelman [Wed, 8 Nov 2017 16:51:02 +0000 (17:51 +0100)]
Use non empty files for object store touch

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoFix contructing headers for s3 download
Robin Appelman [Wed, 8 Nov 2017 16:50:46 +0000 (17:50 +0100)]
Fix contructing headers for s3 download

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 15 Nov 2017 01:10:00 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years ago{J,CS}SResourceLocator: account for symlinks in app path 7170/head
Kyle Fazzari [Tue, 14 Nov 2017 17:22:33 +0000 (09:22 -0800)]
{J,CS}SResourceLocator: account for symlinks in app path

Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.

Use realpath when retrieving app path, and these issues go away.

Fix #6028

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 14 Nov 2017 01:09:59 +0000 (01:09 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex 7127/head
Nextcloud bot [Mon, 13 Nov 2017 01:10:31 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 12 Nov 2017 01:10:15 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years agoUnlock files even if an exception occurs 7144/head
korelstar [Mon, 30 Oct 2017 17:12:37 +0000 (18:12 +0100)]
Unlock files even if an exception occurs

Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 11 Nov 2017 01:10:24 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12
blizzz [Fri, 10 Nov 2017 14:48:37 +0000 (15:48 +0100)]
Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12

[stable12] Improve text: 'you have now' -> 'you now have'

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 10 Nov 2017 01:10:05 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #7120 from nextcloud/12-6988
Morris Jobke [Thu, 9 Nov 2017 16:16:00 +0000 (17:16 +0100)]
Merge pull request #7120 from nextcloud/12-6988

[stable12] Improve performance of UserMountCache with external storage folders

7 years agoMerge pull request #7116 from nextcloud/12-fix-6033
Roeland Jago Douma [Thu, 9 Nov 2017 10:37:38 +0000 (11:37 +0100)]
Merge pull request #7116 from nextcloud/12-fix-6033

[stable12] Fix icon for security settings

7 years agoMerge pull request #7118 from nextcloud/12-7109
Roeland Jago Douma [Thu, 9 Nov 2017 10:02:25 +0000 (11:02 +0100)]
Merge pull request #7118 from nextcloud/12-7109

[stable12]  If for some reason the json can't be decoded it is not cached

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 9 Nov 2017 09:12:53 +0000 (09:12 +0000)]
[tx-robot] updated from transifex

7 years agoImprove performance of UserMountCache with external storage folders 7120/head
Dariusz Olszewski [Fri, 27 Oct 2017 21:22:35 +0000 (23:22 +0200)]
Improve performance of UserMountCache with external storage folders

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoIf for some reason the json can't be decoded it is not cached 7118/head
Roeland Jago Douma [Wed, 8 Nov 2017 11:37:35 +0000 (12:37 +0100)]
If for some reason the json can't be decoded it is not cached

Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #6847 from nextcloud/filelist-confict-path-12
Morris Jobke [Thu, 9 Nov 2017 08:34:24 +0000 (09:34 +0100)]
Merge pull request #6847 from nextcloud/filelist-confict-path-12

[12] still trigger conflict resolution for existing entries when the curre…

7 years agoFix welcome text for better grammar in themed instances 6464/head
Morris Jobke [Thu, 9 Nov 2017 08:24:35 +0000 (09:24 +0100)]
Fix welcome text for better grammar in themed instances

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix icon for security settings 7116/head
Morris Jobke [Thu, 9 Nov 2017 08:13:31 +0000 (09:13 +0100)]
Fix icon for security settings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 9 Nov 2017 01:09:28 +0000 (01:09 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #7114 from nextcloud/12-7110
Morris Jobke [Wed, 8 Nov 2017 21:35:19 +0000 (22:35 +0100)]
Merge pull request #7114 from nextcloud/12-7110

[stable12] theme flow redirection page

7 years agoTheming: theme flow redirection page 7114/head
Julius Härtl [Wed, 8 Nov 2017 12:04:35 +0000 (13:04 +0100)]
Theming: theme flow redirection page

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoMerge pull request #7102 from nextcloud/revert-6774-backport-6645-only-colons-for...
Morris Jobke [Wed, 8 Nov 2017 09:33:35 +0000 (10:33 +0100)]
Merge pull request #7102 from nextcloud/revert-6774-backport-6645-only-colons-for-ipv6

Revert "[stable12] Only allow colons in db host for IPv6 addresses"

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 8 Nov 2017 01:09:33 +0000 (01:09 +0000)]
[tx-robot] updated from transifex

7 years agoRevert "[stable12] Only allow colons in db host for IPv6 addresses" 7102/head
Morris Jobke [Tue, 7 Nov 2017 23:42:34 +0000 (00:42 +0100)]
Revert "[stable12] Only allow colons in db host for IPv6 addresses"

7 years agoMerge pull request #7096 from nextcloud/backport-stable12-7042
Lukas Reschke [Tue, 7 Nov 2017 20:58:02 +0000 (21:58 +0100)]
Merge pull request #7096 from nextcloud/backport-stable12-7042

[stable12] ensure uid for calendar objects is unique

7 years agonever show '/' as path for conflicting file names 6847/head
Robin Appelman [Wed, 18 Oct 2017 13:16:51 +0000 (15:16 +0200)]
never show '/' as path for conflicting file names

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agostill trigger conflict resolution for existing entries when the current entry doesn...
Robin Appelman [Mon, 16 Oct 2017 14:15:15 +0000 (16:15 +0200)]
still trigger conflict resolution for existing entries when the current entry doesn't need it

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #6699 from nextcloud/backport-6522-stable12
Morris Jobke [Tue, 7 Nov 2017 13:45:06 +0000 (14:45 +0100)]
Merge pull request #6699 from nextcloud/backport-6522-stable12

[stable12] fix LDAP User deletion (cleanup), fixes #3365

7 years agoMerge pull request #7095 from nextcloud/12-7059
Morris Jobke [Tue, 7 Nov 2017 12:51:20 +0000 (13:51 +0100)]
Merge pull request #7095 from nextcloud/12-7059

[stable12] hide spinner for initial install

7 years agoensure uid for calendar objects is unique 7096/head
Georg Ehrke [Wed, 1 Nov 2017 21:00:53 +0000 (22:00 +0100)]
ensure uid for calendar objects is unique

Signed-off-by: Georg Ehrke <developer@georgehrke.com>