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
98dd7c1075
Fix bug #12151 : fix list formatting by correcting malformed html
...
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
2018-11-01 15:30:03 -07:00
b292f919c6
Revert "Wait for cron to finish before running upgrade command"
...
This reverts commit 18e9631810
2018-11-01 22:09:45 +01:00
5bb7378bf3
Merge pull request #12187 from nextcloud/stable14-12163
...
[stable14] Do not set indeterminate state for file shares
2018-11-01 15:04:15 +01:00
a83a320e5d
Add tests for edit permission state on file shares
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-01 12:36:37 +01:00
94e8cd5cac
Do not set indeterminate state for file shares
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-01 12:36:26 +01:00
aa92a00129
Merge pull request #12184 from nextcloud/add-gss-to-excluded-backends-stable14
...
[stable14] add global site selector as user back-end which doesn't support password confirmation
2018-11-01 11:00:50 +01:00
d1d82fcfc8
Merge pull request #12160 from Dagefoerde/stable14-oauth-backports
...
[stable14] Bruteforce protection handling in combination with
2018-11-01 10:40:36 +01:00
c47d634837
add global site selector as user back-end which doesn't support password confirmation
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-01 10:07:12 +01:00
41c842f469
[tx-robot] updated from transifex
2018-11-01 01:13:13 +00:00
e3f3212fbc
Error out early on an expired token
...
Fixes #12131
If we hit an expired token there is no need to continue checking. Since
we know it is a token.
We also should not register this with the bruteforce throttler as it is
actually a valid token. Just expired. Instead the authentication should
fail. And buisness continues as usual.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-31 10:54:17 +01:00
f171378837
Move ExpiredTokenException to the correct namespace
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-31 10:54:17 +01:00
71d2d3ca00
Reset bruteforce on token refresh OAuth
...
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.
This resets the brute force attempts for that UID on a valid refresh of
the token.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-31 10:54:17 +01:00
4b9998533c
[tx-robot] updated from transifex
2018-10-31 01:13:03 +00:00
b80f83bf66
Merge pull request #12141 from nextcloud/backport/12054/stable14
...
[stable14] LDAP: announce display name changes so that addressbook picks it up
2018-10-30 16:06:23 +01:00
bdb8e37e93
Backport of #12054 to stable14
...
only write when the displayname differs, but then announce it
refs #5212 and fixes #9112
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
do not run into UniqueConstraintViolationException
… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 13:46:57 +01:00
500b5d8f0b
Merge pull request #12137 from nextcloud/backport/12070/stable14
...
[stable14] fixes wrong variable usage
2018-10-30 13:42:05 +01:00
1ec92c0497
Merge pull request #12040 from nextcloud/backport/12022/stable14
...
[14] Allow chunked uploads even if your quota is not sufficient
2018-10-30 12:33:13 +01:00
64fa99a974
fixes wrong variable usage
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 12:19:24 +01:00
0578126ab7
[tx-robot] updated from transifex
2018-10-30 01:13:04 +00:00
8a452dc8d0
Merge pull request #12122 from nextcloud/backport/12107/stable14
...
[stable14] remove unneeded empty search attribute values, fixes #12086
2018-10-29 20:06:28 +01:00
074672f8f2
Merge pull request #12121 from nextcloud/stable14-12104-move-acceptance-tests-that-crash-the-php-built-in-server-to-apache
...
[stable14] Move acceptance tests that crash the PHP built-in server to Apache
2018-10-29 19:18:53 +01:00
8971f7d7ba
Merge pull request #12120 from nextcloud/stable14-12063-bring-the-browser-window-of-an-actor-to-the-foreground-when-acting-as-him
...
[stable14] Bring the browser window of an actor to the foreground when acting as him
2018-10-29 19:18:33 +01:00
36b21e5e4e
remove unneeded empty search attribute values, fixes #12086
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-29 17:26:44 +01:00
Morris Jobke
Joas Schilling
Roeland Jago Douma
Yevhenii Kostiuk
Nextcloud bot
John Molakvoæ (skjnldsv)
Roeland Jago Douma
brad2014
Julius Härtl
Bjoern Schiessle
blizzz