db9e1b90f9
Merge pull request #12375 from nextcloud/backport/12284/stable14
...
[14] Properly search the root of a shared external storage
2018-11-13 15:09:24 +01:00
846fa89045
Merge pull request #12431 from nextcloud/stb14-ie11-width-fix
...
Fix IE rule for min width
2018-11-13 15:08:31 +01:00
40f5f124a4
Merge pull request #12433 from nextcloud/backport/12411-12413/unique-constraint-fix
...
[stable14] Unique contraint and deadlock fixes for filecache and file_locks
2018-11-13 15:04:12 +01:00
1aac8d8f0f
Added cache override to ensure an always up-to-date accessibility css
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-13 14:02:03 +01:00
ec5c11d284
Fix UniqueConstraintViolationException while insert into oc_file_locks
...
* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-13 13:59:24 +01:00
442680024f
Fix UniqueConstraintViolationException while insert into oc_filecache
...
* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-13 13:59:15 +01:00
ae9f96f2c5
Fix IE rule for min width
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-13 13:51:04 +01:00
655b7f047c
[tx-robot] updated from transifex
2018-11-13 01:12:52 +00:00
b28398fe15
Merge pull request #12416 from nextcloud/stb14-admin-vue-approval-fix
...
[stable14] Use nextcloud-password-confirmation
2018-11-12 23:13:20 +01:00
17d581a446
Merge pull request #12412 from nextcloud/backport/12358/fix-update-check
...
[stable14] Fix app update available check
2018-11-12 16:23:33 +01:00
89e5ec4183
Use nextcloud-password-confirmation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-12 15:39:02 +01:00
da2106391d
Adjust unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-12 14:29:00 +01:00
90cd445019
Improve style of incompatible apps list
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-12 14:28:43 +01:00
8ac7d060dd
Use the version number when checking the appstore for compatible updates
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-12 14:28:24 +01:00
888fd4c218
Fix overlapping update button in notifications
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-12 14:26:59 +01:00
13eae29509
[tx-robot] updated from transifex
2018-11-12 01:12:58 +00:00
d476fc9d25
[tx-robot] updated from transifex
2018-11-11 01:13:19 +00:00
0fac79a8a1
[tx-robot] updated from transifex
2018-11-10 01:12:35 +00:00
2b204616d5
Merge pull request #12374 from nextcloud/backport/12342/stable14
...
[14] Add fix for IE11 flexbox height bug
2018-11-09 15:12:19 +01:00
b71bc1289b
Properly search the root of a shared external storage
...
Fixes #1020
When an external storage is shared with you in full the root is ''
(empty). This adds an extra check for an empty jail basically.
Because if the jail is on the empty string. It matches all paths.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 13:21:45 +01:00
50ee75db5a
Add fix for IE11 flexbox height bug
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-09 13:11:45 +01:00
1eaa4b443f
first check if the user is already logged in and then try to authenticate via apache, this way we suppress wrong audit log messages about failed login attempts
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-09 11:43:51 +01:00
7fba370a75
[tx-robot] updated from transifex
2018-11-09 01:12:36 +00:00
5ad40b2060
Merge pull request #12353 from nextcloud/backport/11838/fix-default-types-of-members
...
[stable14] Fix default types of activity event member variables
2018-11-08 22:42:23 +01:00
f48f43818e
Fix default types of activity event member variables
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 14:14:01 +01:00
911321dc4a
Merge pull request #12339 from nextcloud/bugfix/12007
...
fix - Add to favorites not working in IE11
2018-11-08 10:24:45 +01:00
81ce3c22ff
fix - Add to favorites not working in IE11 - polyfill needed #12007
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-08 07:43:02 +01:00
66b7adfff9
Merge pull request #12341 from nextcloud/stb14-ie11-function-fix
...
Remove arrow function for ie compatibility
2018-11-08 07:42:14 +01:00
9c88ff5eda
[tx-robot] updated from transifex
2018-11-08 01:12:28 +00:00
3745b0a4e1
Remove arrow function for ie compatibility
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-07 18:29:45 +01:00
1a079fd514
Merge pull request #12331 from nextcloud/backport/12306/stable14
...
[14] Disabled ldap fix
2018-11-07 16:19:55 +01:00
21c9146bdb
Build settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-07 13:20:11 +01:00
df841cc073
Show disabled even if empty if ldap enabled
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-07 13:19:29 +01:00
390518c140
[tx-robot] updated from transifex
2018-11-07 01:12:40 +00:00
358512f136
Merge pull request #12297 from nextcloud/backport/12127/stable14
...
[14] A folder should get a folder mimetype
2018-11-06 18:14:05 +01:00
8a86f59c02
Merge pull request #12300 from nextcloud/backport/12230/stable14
...
[14] Do not log FileLock as exception
2018-11-06 18:13:24 +01:00
e10b7c8c33
Merge pull request #12299 from nextcloud/backport/12177/stable14
...
[14] Use the proper server for the apptoken flow login
2018-11-06 10:15:40 +01:00
524a344d25
Merge pull request #12301 from nextcloud/backport/12231/stable14
...
[14] Set the filemodel before rending the detailsview
2018-11-06 09:59:48 +01:00
2d153adb64
Set the filemodel before rending the detailsview
...
fixes #10934
Else it triggers the rendering two times. Resulting is weird state in
for example the comments. Because the comments for OLD_FILEID are
retrieved but then the model is changed to NEW_FILEID. But the old
comments still get in and get parsed.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:10:19 +01:00
9386a0c36a
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:07:16 +01:00
aaf060893c
Do not log FileLock as exception
...
There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:07:07 +01:00
5678f432a4
Use the proper server for the apptoken flow login
...
If a user can't authenticate normally (because they have 2FA that is not
available on their devices for example). The redirect that is generated
should be of the proper format.
This means
1. Include the protocol
2. Include the possible subfolder
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:05:02 +01:00
41c8a9314c
A folder should get a folder mimetype
...
If doing achunked upload the mimetype of the folder would otherwise be
guessed from the path. Which always returned application/octet-stream.
If an access control rule to block that is in place this means that all
chunked uploads fail hard in directories as the isCreatable on the
directory always fails.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:02:21 +01:00
288991a610
[tx-robot] updated from transifex
2018-11-06 01:12:48 +00:00
f962a43388
[tx-robot] updated from transifex
2018-11-05 01:12:47 +00:00
d829b158f6
[tx-robot] updated from transifex
2018-11-04 01:14:13 +00:00
311b29641f
[tx-robot] updated from transifex
2018-11-03 01:12:49 +00:00
a46ca94723
Merge pull request #12197 from nextcloud/backport/12188/revert-wait-for-cron
...
[stable14] Revert "Wait for cron to finish before running upgrade command"
2018-11-02 08:21:05 +01:00
fd39fba5f7
Merge pull request #12202 from brad2014/stable14
...
Fix bug #12151 : fix list formatting by correcting malformed html
2018-11-02 08:20:31 +01:00
d30918886b
[tx-robot] updated from transifex
2018-11-02 01:13:45 +00:00
Morris Jobke
John Molakvoæ (skjnldsv)
Nextcloud bot
Joas Schilling
Roeland Jago Douma
Roeland Jago Douma
Julius Härtl
Bjoern Schiessle
Yevhenii Kostiuk