Roeland Jago Douma
395d697598
Handle permission in update of share better
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 19:36:17 +01:00
Roeland Jago Douma
b776c3b89f
Respect the disabled setting for lost_password_link
...
Fixes #11146
As documented when it is set to disabled the user can't request a lost
password.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 14:53:19 +00:00
Roeland Jago Douma
adf1488e4e
Bearer tokens are app token
...
Fixes #12498
This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 10:50:21 +00:00
Morris Jobke
b4a410e502
Merge pull request #12533 from nextcloud/version/noid/14.0.4rc2
...
14.0.4 RC 2
2018-11-20 10:17:01 +01:00
Morris Jobke
07d25f6582
14.0.4 RC 2
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-20 09:17:38 +01:00
Morris Jobke
e03f159961
Merge pull request #12542 from nextcloud/stb14-settings-svg-icons-scss-fix
...
Remove unused svg api route
2018-11-20 09:16:26 +01:00
John Molakvoæ (skjnldsv)
761f6e6413
Remove unused sg api route
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-20 07:41:30 +01:00
Nextcloud bot
2820179e73
[tx-robot] updated from transifex
2018-11-20 01:12:49 +00:00
Roeland Jago Douma
40a3937877
Throw exception if decryption fails
...
For #11868
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-19 21:26:01 +00:00
Roeland Jago Douma
b133ca311e
Merge pull request #12529 from nextcloud/backport/12401/php-warning
...
[stable14] Fix the warning appearing in the admin section when mail_smtpmode is not configured
2018-11-19 19:43:22 +01:00
Morris Jobke
511eade1d4
Use the proper default values
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-19 15:49:49 +01:00
Kyle Fazzari
5ba33b7574
Verify that isPhpMailerUsed uses config as expected
...
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2018-11-19 15:49:49 +01:00
Marc Peña Segarra
dba617ada3
Fix the warning appearing check setup when mail_smtpmode is not configured.
...
Closes #11107
2018-11-19 15:49:49 +01:00
Morris Jobke
079e59dd4b
Merge pull request #12502 from nextcloud/swift-object-not-found-14
...
[14] forward object not found error in swift as dav 404
2018-11-19 15:32:46 +01:00
Robin Appelman
f43cfd9275
forward object not found error in swift as dav 404
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-19 11:36:33 +01:00
Nextcloud bot
3ba18cea8f
[tx-robot] updated from transifex
2018-11-19 01:12:15 +00:00
Roeland Jago Douma
b2c9dce235
Merge pull request #12492 from nextcloud/stable14-12489
...
[stable14] Only use width and opacity for transition
2018-11-18 20:20:49 +01:00
Nextcloud bot
3671606051
[tx-robot] updated from transifex
2018-11-18 01:13:09 +00:00
Nextcloud bot
4fe3f9eead
[tx-robot] updated from transifex
2018-11-17 01:12:57 +00:00
Julius Härtl
b5dd252a06
Only use width and opacity for transition
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-16 16:32:26 +01:00
Morris Jobke
a79c7c7b05
Merge pull request #12482 from nextcloud/share-menu-click-fix
...
Fix wrong share popover opening on share link
2018-11-16 14:18:45 +01:00
John Molakvoæ (skjnldsv)
5f1f9952dc
Fix wrong share popover opening on share link
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-16 10:58:48 +01:00
Nextcloud bot
cd196f31a0
[tx-robot] updated from transifex
2018-11-16 01:12:25 +00:00
Morris Jobke
d1e50a10e3
Merge pull request #12436 from nextcloud/version/noid/14.0.4RC1
...
14.0.4 RC 1
2018-11-15 15:44:52 +01:00
Morris Jobke
5bd5dc2822
14.0.4 RC 1
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-15 13:49:19 +01:00
Morris Jobke
9070de4753
Update autoloader dump
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-15 13:49:19 +01:00
Morris Jobke
7781485fb7
Merge pull request #12459 from nextcloud/bugfix-stable14/dav_shares_hickup
...
[stable14] fixes dav share issue with owner
2018-11-15 13:41:31 +01:00
Georg Ehrke
cc27fdad46
fix caldav tests
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-15 13:01:04 +01:00
Nextcloud bot
659e4746db
[tx-robot] updated from transifex
2018-11-15 01:12:24 +00:00
Georg Ehrke
94c2b66df3
fixes dav share issue with owner
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-14 21:51:40 +01:00
Morris Jobke
c4155e2f18
Merge pull request #12441 from nextcloud/stable14-10888
...
[stable14] Fix missing quickaccess favorite folder on add
2018-11-14 21:18:33 +01:00
Morris Jobke
94a5ffe394
Update PHPDoc to fix typos
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-14 21:18:16 +01:00
Morris Jobke
fc516b508e
Merge pull request #12432 from nextcloud/stb14-accessibility-cache-fixes
...
[stable14] Added cache override to ensure an always up-to-date accessibility css
2018-11-14 16:54:15 +01:00
Nextcloud bot
ee060c8231
[tx-robot] updated from transifex
2018-11-14 01:12:22 +00:00
Felix Nüsse
13a22c7224
fix for favorites-quickaccess: newly added folders dont show up when added to favorites
...
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
2018-11-13 17:22:40 +01:00
Morris Jobke
46dc5fea9d
Merge pull request #12440 from nextcloud/stable14-10890
...
[stable14] Fix app menu calculation for random size of the right header
2018-11-13 17:14:18 +01:00
Julius Härtl
a5fbbe2b0b
Fix app menu calculation for random size of the right header
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-13 15:52:15 +01:00
Morris Jobke
fb559ed05e
Merge pull request #12372 from nextcloud/suppress-wrong-audit-log-message-stable14
...
[stable14] suppress wrong audit log messages about failed login attempts
2018-11-13 15:10:17 +01:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
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
John Molakvoæ (skjnldsv)
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
Morris Jobke
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
Morris Jobke
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
John Molakvoæ (skjnldsv)
ae9f96f2c5
Fix IE rule for min width
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-13 13:51:04 +01:00
Nextcloud bot
655b7f047c
[tx-robot] updated from transifex
2018-11-13 01:12:52 +00:00
Morris Jobke
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
Morris Jobke
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
John Molakvoæ (skjnldsv)
89e5ec4183
Use nextcloud-password-confirmation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-12 15:39:02 +01:00
Joas Schilling
da2106391d
Adjust unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-12 14:29:00 +01:00