fa95733b0d
Fixed url rebase with theming
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 13:24:21 +01:00
7f0e4a5357
update autoloader
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 13:16:05 +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
233fd16049
[tx-robot] updated from transifex
2018-01-04 09:48:45 +00: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
3a99ef5286
Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12
...
[12] Allow getting the filepath when getting cached mounts by fileid
2017-12-13 13:28:25 +01:00
003c709d25
allow 'Nextcloud' in the user agent string of Android
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:36 +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
e4bf23ce7b
[tx-robot] updated from transifex
2017-12-11 01:10:34 +00:00
0ff717c600
[tx-robot] updated from transifex
2017-12-10 01:10:38 +00: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
9583910104
[tx-robot] updated from transifex
2017-11-20 01:09:53 +00: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
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
fec4e3947e
[tx-robot] updated from transifex
2017-11-16 01:10:03 +00: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
faabc3594d
[tx-robot] updated from transifex
2017-11-12 01:10:15 +00: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
097e8a4994
[tx-robot] updated from transifex
2017-11-11 01:10:24 +00:00
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
5e14b64c55
[tx-robot] updated from transifex
2017-11-10 01:10:05 +00: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
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
69e61b2892
[tx-robot] updated from transifex
2017-11-09 01:09:28 +00:00
e97a58793d
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
2017-11-08 00:42:34 +01:00
0756fc0893
[tx-robot] updated from transifex
2017-11-07 01:09:08 +00:00
3cc7c03ddb
Merge pull request #7082 from nextcloud/12-6974
...
[stable12] Fix seeking on object storage
2017-11-06 20:21:35 +01:00
8a8e76561b
Merge pull request #7081 from nextcloud/12-6958
...
[stable12] Improve mimetype detection for object storages
2017-11-06 18:45:32 +01:00
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
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
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
e873b1a3d1
[tx-robot] updated from transifex
2017-11-06 01:09:19 +00:00
43341833fd
[tx-robot] updated from transifex
2017-11-03 01:09:18 +00:00
52b31a09ef
[tx-robot] updated from transifex
2017-11-01 01:08:55 +00:00
00ffed5a19
[tx-robot] updated from transifex
2017-10-31 01:08:41 +00:00
e20c4c6a71
[tx-robot] updated from transifex
2017-10-29 00:08:41 +00:00
85f612c819
[tx-robot] updated from transifex
2017-10-27 00:08:39 +00:00
f7ac152a6c
[tx-robot] updated from transifex
2017-10-26 00:08:49 +00:00
9c3f6a7ca0
Merge pull request #6944 from nextcloud/12-6433
...
[stable12] Fix uninitialized variable $this->params
2017-10-25 14:33:49 +02:00
5bd0bde89d
[tx-robot] updated from transifex
2017-10-25 00:08:56 +00:00
cfbc0c8141
Fix uninitialized variable $this->params
...
Signed-off-by: William Pain <pain.william@gmail.com>
2017-10-25 01:32:59 +02:00
895336a3f3
[tx-robot] updated from transifex
2017-10-24 00:08:57 +00:00
58f900f380
Correction
...
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-22 07:46:18 +02:00
917e996dda
Fix future time spans
...
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-22 07:26:52 +02:00
bc19a8b193
[tx-robot] updated from transifex
2017-10-22 00:08:45 +00:00
1c488aae8a
[tx-robot] updated from transifex
2017-10-21 00:08:36 +00:00
5d2c6233a9
[tx-robot] updated from transifex
2017-10-20 00:08:44 +00:00
e8c217ed4f
[tx-robot] updated from transifex
2017-10-19 00:08:38 +00:00
8b0842f020
[tx-robot] updated from transifex
2017-10-18 00:08:33 +00:00
74b43f1d7d
propagate multipart upload exception when aborting upload
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-17 15:19:40 +02:00
ea269db6d6
[tx-robot] updated from transifex
2017-10-17 00:08:33 +00:00
51ed66fb26
Merge pull request #6814 from nextcloud/upload-cache-path-12
...
[12] also use configured 'cache_path' for new chunking
2017-10-15 21:43:03 +02:00
d57557774e
Merge pull request #6815 from nextcloud/s3-multipart-upload-part-size-12
...
[12] set s3 part size to 500mb
2017-10-15 21:41:15 +02:00
6e3ec7d911
Merge pull request #6774 from nextcloud/backport-6645-only-colons-for-ipv6
...
[stable12] Only allow colons in db host for IPv6 addresses
2017-10-15 21:40:04 +02:00
95bd9d4c64
[tx-robot] updated from transifex
2017-10-14 02:29:15 +00:00
e2a25d5caf
set s3 part size to 500mb
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 16:01:04 +02:00
1c315a2a8a
also use configured 'cache_path' for new chunking
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 14:27:02 +02:00
df2fa2fce2
Merge pull request #6737 from nextcloud/aws-sdk-12
...
[12] Update aws sdk + s3 improvements
2017-10-09 18:05:16 +02:00
239f561ab2
Add tests for multipart upload
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:44 +02:00
6fee4232ee
only do multipart upload for large files
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:40 +02:00
d3a57a7568
multipart upload for s3 object storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:34 +02:00
adea68e218
[tx-robot] updated from transifex
2017-10-07 00:08:40 +00:00
8f41e8ee60
Only allow colons in db host for IPv6 addresses
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-06 09:43:35 +02:00
037376b4ce
[tx-robot] updated from transifex
2017-10-06 00:08:40 +00:00
6aa25b9f1e
Merge pull request #6743 from nextcloud/invalid-path-repair-from11-12
...
[12] dont run invalid path repair step when upgrading from 11.0.5.2 and later
2017-10-04 15:08:34 +02:00
1c30c72909
[tx-robot] updated from transifex
2017-10-04 00:08:37 +00:00
95dc9a89b3
dont run invalid path repair step when upgrading from 11.0.5.2 and later
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 16:28:54 +02:00
5b82e2e4d5
update autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:31 +02:00
d26951beb4
fix path style
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:21 +02:00
474c8aff29
reuse object read/write/delete logic in s3 implementations
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:10:57 +02:00
John Molakvoæ (skjnldsv)
Arthur Schiwon
Nextcloud bot
Julius Härtl
Johannes Schlichenmaier
Christoph Wurst
Morris Jobke
Bjoern Schiessle
Robin Appelman
Roeland Jago Douma
Joas Schilling
Kyle Fazzari
korelstar
Dariusz Olszewski
Roeland Jago Douma
William Pain
dartcafe