summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix duplicate session token after remembered loginChristoph Wurst2017-12-192-0/+9
|/ | | | | | | | | On a remembered login session, we create a new session token in the database with the values of the old one. As we actually don't need the old session token anymore, we can delete it right away. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #7558 from nextcloud/12-7427Morris Jobke2017-12-1811-22/+74
|\ | | | | [stable12] Fix email buttons for white theme
| * Fix email buttons for white themeMorris Jobke2017-12-1811-22/+74
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12Morris Jobke2017-12-137-3/+115
|\ \ | | | | | | [12] Allow getting the filepath when getting cached mounts by fileid
| * | Allow getting the filepath when getting cached mounts by fileidRobin Appelman2017-12-127-3/+115
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #7468 from nextcloud/update-user-agent-regex-stable12Morris Jobke2017-12-123-4/+18
|\ \ \ | |/ / |/| | allow 'Nextcloud' in the user agent string of Android
| * | fix dav unit testsBjoern Schiessle2017-12-121-3/+3
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | allow 'Nextcloud' in the user agent string of AndroidBjoern Schiessle2017-12-122-1/+15
|/ / | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #7456 from nextcloud/12_7342Morris Jobke2017-12-121-2/+5
|\ \ | |/ |/| [stable12] CardDAV convertor check should not be to wide
| * CardDAV convertor check should not be to wideRoeland Jago Douma2017-12-111-2/+5
| | | | | | | | | | | | | | | | Case: email is set to null, but the avatar is set. In the old case the email would set $emptyValue but $noImage would still be false. This we would set the empty string as email. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7457 from nextcloud/stable12-7271Roeland Jago Douma2017-12-121-0/+2
|\ \ | | | | | | [stable12] Fix loading icon position in the app menu
| * | Fix loading icon position in the app menuJulius Härtl2017-12-111-0/+2
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #7455 from nextcloud/12_7230Morris Jobke2017-12-111-0/+5
|\ \ | |/ |/| [stable12] Remove wrong entry in admin_settings that causes 500
| * Remove wrong entry in admin_settings that causes 500Morris Jobke2017-12-111-0/+5
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #7451 from nextcloud/12-7433Morris Jobke2017-12-111-1/+1
|\ | | | | [stable12] Fix constructor spy in unit test with Sinon 4.1.3
| * Fix constructor spy in unit test with Sinon 4.1.3Daniel Calviño Sánchez2017-12-111-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* [tx-robot] updated from transifexNextcloud bot2017-12-1120-162/+466
|
* [tx-robot] updated from transifexNextcloud bot2017-12-1034-112/+950
|
* [tx-robot] updated from transifexNextcloud bot2017-12-096-12/+344
|
* Merge pull request #7409 from nextcloud/swift-retry-12Roeland Jago Douma2017-12-082-2/+4
|\ | | | | [12]add retry wrapper when reading files from swift
| * add retry wrapper when reading files from swiftRobin Appelman2017-12-062-2/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #7407 from nextcloud/12_7348Morris Jobke2017-12-082-0/+7
|\ \ | | | | | | [stable12] Check if owner of share exists
| * | Fix testsRoeland Jago Douma2017-12-062-1/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | A failed storage is a not available storageRoeland Jago Douma2017-12-061-0/+5
| |/ | | | | | | | | | | | | | | 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>
* | Merge pull request #7323 from nextcloud/shared-jailed-source-root-12Morris Jobke2017-12-084-15/+93
|\ \ | | | | | | [12]Use the correct root for shared jail when the source storage is also a jail
| * | delay calculating the shared cache root until it's usedRobin Appelman2017-12-042-26/+41
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Use the correct root for shared jail when the source storage is also a jailRobin Appelman2017-11-283-1/+64
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-12-0814-16/+128
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-12-0712-2/+168
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-12-0620-6/+88
| |
* | [tx-robot] updated from transifexNextcloud bot2017-12-058-42/+66
| |
* | Merge pull request #7144 from nextcloud/rename-locks-stable12Morris Jobke2017-12-041-83/+86
|\ \ | | | | | | Unlock files even if an exception occurs (stable12)
| * | Unlock files even if an exception occurskorelstar2017-11-111-83/+86
| | | | | | | | | | | | Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
* | | Merge pull request #7322 from nextcloud/12-6303Morris Jobke2017-12-043-4/+4
|\ \ \ | | | | | | | | [stable12] Set primary action button color to same as theming color
| * | | Set primary action button color to same as theming colorJan-Christoph Borchardt2017-11-283-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #7353 from nextcloud/12-7346Morris Jobke2017-12-041-6/+6
|\ \ \ \ | | | | | | | | | | [stable12] Fix translation of federation scope menu
| * | | | Fix translation of federation scope menuMorris Jobke2017-11-301-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | | | | Merge pull request #7362 from nextcloud/12-7347Morris Jobke2017-12-042-1/+16
|\ \ \ \ \ | | | | | | | | | | | | [stable12] Allow to skip data dir permission checks by config
| * | | | | Allow to skip data dir permission checks by configArthur Schiwon2017-12-012-1/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables installation on services that don't allow/support permission changes. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #7355 from nextcloud/12.0.4-finalv12.0.4Morris Jobke2017-12-041-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Release 12.0.4
| * | | | | Release 12.0.4Morris Jobke2017-11-301-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-0410-0/+26
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-034-0/+16
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-0214-10/+100
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-01202-0/+1282
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-3030-38/+128
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-2924-0/+186
| | | |
* | | | Merge pull request #7330 from nextcloud/1204-rc3v12.0.4RC3Morris Jobke2017-11-281-2/+2
|\ \ \ \ | | | | | | | | | | 12.0.4 RC3
| * | | | 12.0.4 RC3Morris Jobke2017-11-281-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7328 from ↵Morris Jobke2017-11-282-3/+120
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/backport/7327/access-list-regression-for-not-current-accesss [stable12] Only in case of $currentAccess the array uses the id as index
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-10 08:33:50 +0000