4ec4a7df93
add option to use legacy v2 auth with s3
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-09 18:21:47 +01:00
db6b9fdb6a
Merge pull request #7745 from nextcloud/7692_12
...
[stable12] Don't lie about preview types
2018-01-09 11:27:53 +01:00
25ba9cbe71
Merge pull request #7684 from nextcloud/backport-ie-fix-invert
...
[stable12] Fix inverted app icons on IE11
2018-01-09 11:22:54 +01:00
1f875eca3c
Merge pull request #7694 from nextcloud/stable12-7611
...
[stable12] Don't attempt to translate login names to uids when uids are provided
2018-01-08 21:10:11 +01:00
87e99651f5
Only return 1 type
...
Throw proper exception if we can't get the mimetype for a preview. Catch
it later on so we can just return a not found for the preview.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-08 20:39:48 +01:00
50b880edeb
Don't lie about the preview mimetype
...
For legacy reasons we stored all the previews with a png extention.
However we did not put png data in them all the time.
This caused the preview endpoints to always report that a preview is a
png file. Which was a lie.
Since we abstract away from the storage etc in the previewmanager. There
is no need anymore to store them as .png files and instead we can use
the actual file extention.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-08 20:39:39 +01:00
b95d18b85e
Revert rebaseurl function edit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:35:38 +01:00
7a282dee89
Rollback caching fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:34:32 +01:00
1f2437e2c5
Fixup! Proberly detect variable changes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 19:11:41 +01:00
cf53560218
Proberly detect variable changes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 19:10:27 +01:00
fa95733b0d
Fixed url rebase with theming
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 13:24:21 +01:00
776d9e6805
never translate login names when requiring with a user id
...
where appropriate, the preLoginNameUsedAsUserName hook should be thrown.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:47:31 +01:00
1ae126a781
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:03 +01:00
87b1839cd1
Added tests for various installations types
...
- With root installation
- Core css
- App inside server root
- Secondary apps directory outside server root
- With an installation in a sub directory
- Core css
- App inside server root
- Secondary apps directory outside server root
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
a46d45a652
Fixup! getWebdir return
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
89b6bc9424
Use OC_Util function for app web path
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
5008eb8f85
getWebDir function
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
00412d1c8c
Fixed webroot for scss files
...
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:04:59 +01:00
f13b3b6651
Fixed scss url rewriting
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:04:08 +01:00
a3b6f05722
Invert app icons on IE11 as well
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 15:22:54 +01:00
a7e67a6ce2
Added additional methods for removal of sensitive info
...
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2018-01-03 10:46:04 +01:00
85c18f5980
Fix duplicate session token after remembered login
...
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>
2017-12-19 09:17:06 +01:00
6859e5a22a
Merge pull request #7558 from nextcloud/12-7427
...
[stable12] Fix email buttons for white theme
2017-12-18 21:19:51 +01:00
e726d191f1
Fix email buttons for white theme
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 17:03:01 +01:00
3ec1bbbde8
Allow getting the filepath when getting cached mounts by fileid
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-12 14:11:40 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a21f2c2813
Fix contructing headers for s3 download
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:43 +01:00
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
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
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
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
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
e97a58793d
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
2017-11-08 00:42:34 +01:00
Robin Appelman
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
John Molakvoæ (skjnldsv)
Arthur Schiwon
Julius Härtl
Johannes Schlichenmaier
Christoph Wurst
Joas Schilling
Kyle Fazzari
Bjoern Schiessle
korelstar
Dariusz Olszewski