Morris Jobke
d41971184b
Remove wrong entry in admin_settings that causes 500
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 21:04:56 +01:00
Nextcloud bot
e4bf23ce7b
[tx-robot] updated from transifex
2017-12-11 01:10:34 +00:00
Nextcloud bot
0ff717c600
[tx-robot] updated from transifex
2017-12-10 01:10:38 +00:00
Roeland Jago Douma
ac29608db6
Merge pull request #7409 from nextcloud/swift-retry-12
...
[12]add retry wrapper when reading files from swift
2017-12-08 09:26:41 +01:00
Morris Jobke
5dd15c4a7d
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
2017-12-08 09:03:03 +01:00
Robin Appelman
0519ca5893
add retry wrapper when reading files from swift
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-06 15:43:00 +01:00
Robin Appelman
4144580167
delay calculating the shared cache root until it's used
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:18:23 +01:00
Morris Jobke
1cd5ba3e90
Merge pull request #7144 from nextcloud/rename-locks-stable12
...
Unlock files even if an exception occurs (stable12)
2017-12-04 11:13:19 +01:00
Arthur Schiwon
17c13e4436
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>
2017-12-01 11:55:29 +01:00
Morris Jobke
90feccf4be
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
2017-11-28 20:16:32 +01:00
Joas Schilling
76a2fb0231
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 3820d6883d
2017-11-28 17:24:19 +01:00
Robin Appelman
6d8de960c9
Use the correct root for shared jail when the source storage is also a jail
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-28 13:55:42 +01:00
Roeland Jago Douma
7e1ca611f8
Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot
...
[stable12] CSSResourceLocator: handle SCSS in apps outside root
2017-11-27 10:08:27 +01:00
Morris Jobke
b901f8b0c8
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
2017-11-23 13:54:46 +01:00
Joas Schilling
6978128b48
Fix accesslist when a user has an ID only containting 0-9
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-23 13:19:55 +01:00
Kyle Fazzari
7f8f3dc21b
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>
2017-11-22 21:41:40 -08:00
Joas Schilling
2c11d62adf
Allow migration from upcoming 10.0.4 ownCloud release
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-22 14:06:07 +01:00
Roeland Jago Douma
6bfeec049e
Merge pull request #7170 from kyrofa/backport/6028/app_path_realpath
...
[stable12] {J,CS}SResourceLocator: account for symlinks in app path
2017-11-20 12:58:10 +01:00
Nextcloud bot
9583910104
[tx-robot] updated from transifex
2017-11-20 01:09:53 +00:00
Bjoern Schiessle
83ef3d2411
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>
2017-11-17 12:46:52 +01:00
Björn Schießle
031bde5c88
Merge pull request #7186 from nextcloud/s3-download-stream-fix-12
...
[12] Fix s3 download and touch
2017-11-17 12:44:40 +01:00
Nextcloud bot
fec4e3947e
[tx-robot] updated from transifex
2017-11-16 01:10:03 +00:00
Robin Appelman
e041c7a92f
Use non empty files for object store touch
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:47 +01:00
Robin Appelman
a21f2c2813
Fix contructing headers for s3 download
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:43 +01:00
Kyle Fazzari
697774112f
{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>
2017-11-14 09:22:33 -08:00
Nextcloud bot
faabc3594d
[tx-robot] updated from transifex
2017-11-12 01:10:15 +00:00
korelstar
f907cdc09d
Unlock files even if an exception occurs
...
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
2017-11-11 13:25:28 +01:00
Nextcloud bot
097e8a4994
[tx-robot] updated from transifex
2017-11-11 01:10:24 +00:00
blizzz
14986e0f5c
Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12
...
[stable12] Improve text: 'you have now' -> 'you now have'
2017-11-10 15:48:37 +01:00
Nextcloud bot
5e14b64c55
[tx-robot] updated from transifex
2017-11-10 01:10:05 +00:00
Morris Jobke
20e5220103
Merge pull request #7120 from nextcloud/12-6988
...
[stable12] Improve performance of UserMountCache with external storage folders
2017-11-09 17:16:00 +01:00
Dariusz Olszewski
b9898c5b87
Improve performance of UserMountCache with external storage folders
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:07:27 +01:00
Roeland Jago Douma
9cbb39511f
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>
2017-11-09 09:50:57 +01:00
Morris Jobke
d8cf19b258
Fix welcome text for better grammar in themed instances
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:28:29 +01:00
Nextcloud bot
69e61b2892
[tx-robot] updated from transifex
2017-11-09 01:09:28 +00:00
Morris Jobke
e97a58793d
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
2017-11-08 00:42:34 +01:00
Nextcloud bot
0756fc0893
[tx-robot] updated from transifex
2017-11-07 01:09:08 +00:00
Morris Jobke
3cc7c03ddb
Merge pull request #7082 from nextcloud/12-6974
...
[stable12] Fix seeking on object storage
2017-11-06 20:21:35 +01:00
Morris Jobke
8a8e76561b
Merge pull request #7081 from nextcloud/12-6958
...
[stable12] Improve mimetype detection for object storages
2017-11-06 18:45:32 +01:00
Morris Jobke
d459351ce2
Fix seeking on object storage
...
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 15:28:39 +01:00
Morris Jobke
21b8399e88
Improve mimetype detection for object storages
...
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 15:23:35 +01:00
Robin Appelman
1ed9a25ae8
use fopen directly when reading objects from s3
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-06 10:39:52 +01:00
Nextcloud bot
e873b1a3d1
[tx-robot] updated from transifex
2017-11-06 01:09:19 +00:00
Nextcloud bot
43341833fd
[tx-robot] updated from transifex
2017-11-03 01:09:18 +00:00
Nextcloud bot
52b31a09ef
[tx-robot] updated from transifex
2017-11-01 01:08:55 +00:00
Nextcloud bot
00ffed5a19
[tx-robot] updated from transifex
2017-10-31 01:08:41 +00:00
Nextcloud bot
e20c4c6a71
[tx-robot] updated from transifex
2017-10-29 00:08:41 +00:00
Nextcloud bot
85f612c819
[tx-robot] updated from transifex
2017-10-27 00:08:39 +00:00
Nextcloud bot
f7ac152a6c
[tx-robot] updated from transifex
2017-10-26 00:08:49 +00:00
Morris Jobke
9c3f6a7ca0
Merge pull request #6944 from nextcloud/12-6433
...
[stable12] Fix uninitialized variable $this->params
2017-10-25 14:33:49 +02:00
