Commit Graph

40113 Commits

Author SHA1 Message Date
Nextcloud bot 26f8c3adfa
[tx-robot] updated from transifex 2017-12-02 01:10:44 +00:00
Nextcloud bot 3ee749d37f
[tx-robot] updated from transifex 2017-12-01 01:10:32 +00:00
Nextcloud bot 8656462edb
[tx-robot] updated from transifex 2017-11-30 01:13:31 +00:00
Nextcloud bot 0ba10fa5f9
[tx-robot] updated from transifex 2017-11-29 01:10:26 +00:00
Morris Jobke aeae9aefe9
Merge pull request #7330 from nextcloud/1204-rc3
12.0.4 RC3
2017-11-28 20:21:47 +01:00
Morris Jobke b931987cb8
12.0.4 RC3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-28 20:19:23 +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

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:24:19 +01:00
Joas Schilling 3cbd6509e0
Fix current access list test and add one for $currentAccess === false
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:24:12 +01:00
Nextcloud bot 036eae6956
[tx-robot] updated from transifex 2017-11-28 01:10:05 +00:00
Roeland Jago Douma ee69dc128a
Merge pull request #7261 from nextcloud/prepare-12.0.4-RC2
Prepare 12.0.4 RC2
2017-11-27 10:09:30 +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
Nextcloud bot 298b0d67d8
[tx-robot] updated from transifex 2017-11-27 01:10:03 +00:00
Nextcloud bot a6b3fcae8f
[tx-robot] updated from transifex 2017-11-25 01:10:10 +00:00
Lukas Reschke 62b7378331
Merge pull request #7277 from nextcloud/12-7268
[stable12] Update CRL due to files_frommail
2017-11-24 14:40:36 +01:00
Morris Jobke a1c76cc8bf
Update CRL due to files_frommail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 14:11:09 +01:00
Nextcloud bot e94ba32255
[tx-robot] updated from transifex 2017-11-24 01:10:06 +00: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
Morris Jobke 59657542ca
Merge pull request #7245 from nextcloud/feature/noid/allow-migration-from-comingup-oc-release
Allow migration from upcoming 10.0.4 ownCloud release
2017-11-23 13:46:08 +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
Morris Jobke 8019afb9d5
Prepare 12.0.4 RC2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 13:02:20 +01:00
Morris Jobke 4a4cf2613c
Merge pull request #7259 from nextcloud/7211-stable12
[stable12] only replace permission popupmenu
2017-11-23 13:00:37 +01:00
Arthur Schiwon 9383889314
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>
2017-11-23 12:08:29 +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
Nextcloud bot fd46475f6e
[tx-robot] updated from transifex 2017-11-23 01:09:59 +00: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
Nextcloud bot 44d6fe99ef
[tx-robot] updated from transifex 2017-11-22 01:10:22 +00:00
Nextcloud bot 6b189ba1ee
[tx-robot] updated from transifex 2017-11-21 01:10:20 +00:00
Roeland Jago Douma b8d3577b92
Merge pull request #7225 from nextcloud/12.0.4RC-version
12.0.4 RC
2017-11-20 12:59:47 +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
Morris Jobke f6573ca72e
12.0.4 RC
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-20 12:14:12 +01:00
Nextcloud bot 9583910104
[tx-robot] updated from transifex 2017-11-20 01:09:53 +00:00
Nextcloud bot 54dcd70dae
[tx-robot] updated from transifex 2017-11-19 01:10:04 +00:00
Nextcloud bot ccf4f87441
[tx-robot] updated from transifex 2017-11-18 01:10:56 +00:00
Björn Schießle d9cea2fb61
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
2017-11-17 14:48:53 +01: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 9942c39e64
[tx-robot] updated from transifex 2017-11-17 01:10:03 +00: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
Nextcloud bot 2d8d248d28
[tx-robot] updated from transifex 2017-11-15 01:10:00 +00: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 82e4d9b9cc
[tx-robot] updated from transifex 2017-11-14 01:09:59 +00:00
Nextcloud bot b1ac0b6198
[tx-robot] updated from transifex 2017-11-13 01:10:31 +00:00
Nextcloud bot faabc3594d
[tx-robot] updated from transifex 2017-11-12 01:10:15 +00: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