]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Fri, 23 Nov 2018 07:46:07 +0000 (08:46 +0100)]
Merge pull request #12560 from nextcloud/stb14-share-menu-click-fix
[stable14] Fix share link password input
Morris Jobke [Fri, 23 Nov 2018 07:44:02 +0000 (08:44 +0100)]
Merge pull request #12593 from nextcloud/backport/12554/stable14
[stable14] Do not switch to root folder if filelist is already shown
Nextcloud bot [Fri, 23 Nov 2018 01:13:19 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 22 Nov 2018 22:43:55 +0000 (23:43 +0100)]
Merge pull request #12596 from nextcloud/backport/12448/stable14
[stable14] Load apps that have a dav type set before the dav server plugins
John Molakvoæ (skjnldsv) [Tue, 20 Nov 2018 17:59:15 +0000 (18:59 +0100)]
Fix share link password input
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Roeland Jago Douma [Thu, 22 Nov 2018 19:16:42 +0000 (20:16 +0100)]
Merge pull request #12600 from nextcloud/backport/12592/stable14
[stable14] Fix Typo in Original English String and All Translations
Patrick Baber [Thu, 22 Nov 2018 16:10:07 +0000 (17:10 +0100)]
fix typo in original english string and all translations
Signed-off-by: Patrick Baber <patrick@p-squared.de>
Julius Härtl [Wed, 14 Nov 2018 09:37:47 +0000 (10:37 +0100)]
Load apps that have a dav type set before the dav server plugins
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Tue, 20 Nov 2018 13:44:20 +0000 (14:44 +0100)]
Do not switch to root folder if filelist is already shown
Navigating to the root folder is already handled by
OCA.Files.Navigation.setActiveItem in case the view doesn't change.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Morris Jobke [Thu, 22 Nov 2018 13:54:02 +0000 (14:54 +0100)]
Merge pull request #12540 from nextcloud/backport/12450/stable14
[stable14] Throw exception if decryption fails
Morris Jobke [Thu, 22 Nov 2018 13:53:46 +0000 (14:53 +0100)]
Merge pull request #12555 from nextcloud/backport/12552/stable14
[stable14] Respect the disabled setting for lost_password_link
Morris Jobke [Thu, 22 Nov 2018 13:14:28 +0000 (14:14 +0100)]
Merge pull request #12586 from nextcloud/version/noid/14.0.4
14.0.4
Morris Jobke [Thu, 22 Nov 2018 10:05:37 +0000 (11:05 +0100)]
14.0.4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Thu, 22 Nov 2018 01:12:30 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Wed, 21 Nov 2018 07:58:02 +0000 (08:58 +0100)]
Merge pull request #12561 from nextcloud/backport/12544/stable14
[14] Handle permission in update of share better
Nextcloud bot [Wed, 21 Nov 2018 01:12:26 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Tue, 20 Nov 2018 19:06:39 +0000 (20:06 +0100)]
Merge pull request #12545 from nextcloud/backport/12543/stable14
[stable14] Bearer tokens are app token
Roeland Jago Douma [Tue, 20 Nov 2018 18:36:17 +0000 (19:36 +0100)]
Handle permission in update of share better
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Tue, 20 Nov 2018 12:28:40 +0000 (13:28 +0100)]
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>
Roeland Jago Douma [Tue, 20 Nov 2018 08:23:57 +0000 (09:23 +0100)]
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>
Morris Jobke [Tue, 20 Nov 2018 09:17:01 +0000 (10:17 +0100)]
Merge pull request #12533 from nextcloud/version/noid/14.0.4rc2
14.0.4 RC 2
Morris Jobke [Mon, 19 Nov 2018 14:45:46 +0000 (15:45 +0100)]
14.0.4 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 20 Nov 2018 08:16:26 +0000 (09:16 +0100)]
Merge pull request #12542 from nextcloud/stb14-settings-svg-icons-scss-fix
Remove unused svg api route
John Molakvoæ (skjnldsv) [Fri, 16 Nov 2018 14:39:46 +0000 (15:39 +0100)]
Remove unused sg api route
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Nextcloud bot [Tue, 20 Nov 2018 01:12:49 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Wed, 14 Nov 2018 11:47:35 +0000 (12:47 +0100)]
Throw exception if decryption fails
For #11868
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 19 Nov 2018 18:43:22 +0000 (19:43 +0100)]
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
Morris Jobke [Mon, 19 Nov 2018 09:57:51 +0000 (10:57 +0100)]
Use the proper default values
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Kyle Fazzari [Wed, 14 Nov 2018 16:41:38 +0000 (08:41 -0800)]
Verify that isPhpMailerUsed uses config as expected
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
Marc Peña Segarra [Sat, 10 Nov 2018 23:55:41 +0000 (00:55 +0100)]
Fix the warning appearing check setup when mail_smtpmode is not configured.
Closes #11107
Morris Jobke [Mon, 19 Nov 2018 14:32:46 +0000 (15:32 +0100)]
Merge pull request #12502 from nextcloud/swift-object-not-found-14
[14] forward object not found error in swift as dav 404
Robin Appelman [Fri, 16 Nov 2018 19:21:21 +0000 (20:21 +0100)]
forward object not found error in swift as dav 404
Signed-off-by: Robin Appelman <robin@icewind.nl>
Nextcloud bot [Mon, 19 Nov 2018 01:12:15 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Sun, 18 Nov 2018 19:20:49 +0000 (20:20 +0100)]
Merge pull request #12492 from nextcloud/stable14-12489
[stable14] Only use width and opacity for transition
Nextcloud bot [Sun, 18 Nov 2018 01:13:09 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 17 Nov 2018 01:12:57 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Julius Härtl [Fri, 16 Nov 2018 14:42:23 +0000 (15:42 +0100)]
Only use width and opacity for transition
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Morris Jobke [Fri, 16 Nov 2018 13:18:45 +0000 (14:18 +0100)]
Merge pull request #12482 from nextcloud/share-menu-click-fix
Fix wrong share popover opening on share link
John Molakvoæ (skjnldsv) [Fri, 16 Nov 2018 09:58:46 +0000 (10:58 +0100)]
Fix wrong share popover opening on share link
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Nextcloud bot [Fri, 16 Nov 2018 01:12:25 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 15 Nov 2018 14:44:52 +0000 (15:44 +0100)]
Merge pull request #12436 from nextcloud/version/noid/14.0.4RC1
14.0.4 RC 1
Morris Jobke [Tue, 13 Nov 2018 13:18:36 +0000 (14:18 +0100)]
14.0.4 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 15 Nov 2018 12:49:10 +0000 (13:49 +0100)]
Update autoloader dump
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 15 Nov 2018 12:41:31 +0000 (13:41 +0100)]
Merge pull request #12459 from nextcloud/bugfix-stable14/dav_shares_hickup
[stable14] fixes dav share issue with owner
Georg Ehrke [Thu, 15 Nov 2018 10:45:47 +0000 (11:45 +0100)]
fix caldav tests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Nextcloud bot [Thu, 15 Nov 2018 01:12:24 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Georg Ehrke [Wed, 14 Nov 2018 19:50:46 +0000 (20:50 +0100)]
fixes dav share issue with owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Morris Jobke [Wed, 14 Nov 2018 20:18:33 +0000 (21:18 +0100)]
Merge pull request #12441 from nextcloud/stable14-10888
[stable14] Fix missing quickaccess favorite folder on add
Morris Jobke [Wed, 14 Nov 2018 20:18:16 +0000 (21:18 +0100)]
Update PHPDoc to fix typos
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 14 Nov 2018 15:54:15 +0000 (16:54 +0100)]
Merge pull request #12432 from nextcloud/stb14-accessibility-cache-fixes
[stable14] Added cache override to ensure an always up-to-date accessibility css
Nextcloud bot [Wed, 14 Nov 2018 01:12:22 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Felix Nüsse [Mon, 27 Aug 2018 15:39:39 +0000 (17:39 +0200)]
fix for favorites-quickaccess: newly added folders dont show up when added to favorites
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
Morris Jobke [Tue, 13 Nov 2018 16:14:18 +0000 (17:14 +0100)]
Merge pull request #12440 from nextcloud/stable14-10890
[stable14] Fix app menu calculation for random size of the right header
Julius Härtl [Mon, 27 Aug 2018 16:03:42 +0000 (18:03 +0200)]
Fix app menu calculation for random size of the right header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Morris Jobke [Tue, 13 Nov 2018 14:10:17 +0000 (15:10 +0100)]
Merge pull request #12372 from nextcloud/suppress-wrong-audit-log-message-stable14
[stable14] suppress wrong audit log messages about failed login attempts
Morris Jobke [Tue, 13 Nov 2018 14:09:24 +0000 (15:09 +0100)]
Merge pull request #12375 from nextcloud/backport/12284/stable14
[14] Properly search the root of a shared external storage
Morris Jobke [Tue, 13 Nov 2018 14:08:31 +0000 (15:08 +0100)]
Merge pull request #12431 from nextcloud/stb14-ie11-width-fix
Fix IE rule for min width
Morris Jobke [Tue, 13 Nov 2018 14:04:12 +0000 (15:04 +0100)]
Merge pull request #12433 from nextcloud/backport/12411-12413/unique-constraint-fix
[stable14] Unique contraint and deadlock fixes for filecache and file_locks
John Molakvoæ (skjnldsv) [Tue, 2 Oct 2018 07:46:05 +0000 (09:46 +0200)]
Added cache override to ensure an always up-to-date accessibility css
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Morris Jobke [Mon, 12 Nov 2018 14:13:10 +0000 (15:13 +0100)]
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>
Morris Jobke [Mon, 12 Nov 2018 12:43:46 +0000 (13:43 +0100)]
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>
John Molakvoæ (skjnldsv) [Thu, 8 Nov 2018 17:19:52 +0000 (18:19 +0100)]
Fix IE rule for min width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Nextcloud bot [Tue, 13 Nov 2018 01:12:52 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 12 Nov 2018 22:13:20 +0000 (23:13 +0100)]
Merge pull request #12416 from nextcloud/stb14-admin-vue-approval-fix
[stable14] Use nextcloud-password-confirmation
Morris Jobke [Mon, 12 Nov 2018 15:23:33 +0000 (16:23 +0100)]
Merge pull request #12412 from nextcloud/backport/12358/fix-update-check
[stable14] Fix app update available check
John Molakvoæ (skjnldsv) [Mon, 12 Nov 2018 10:54:56 +0000 (11:54 +0100)]
Use nextcloud-password-confirmation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Joas Schilling [Fri, 9 Nov 2018 09:22:19 +0000 (10:22 +0100)]
Adjust unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Thu, 8 Nov 2018 14:28:58 +0000 (15:28 +0100)]
Improve style of incompatible apps list
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Joas Schilling [Thu, 8 Nov 2018 13:50:12 +0000 (14:50 +0100)]
Use the version number when checking the appstore for compatible updates
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Thu, 8 Nov 2018 13:19:46 +0000 (14:19 +0100)]
Fix overlapping update button in notifications
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Mon, 12 Nov 2018 01:12:58 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 11 Nov 2018 01:13:19 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 10 Nov 2018 01:12:35 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Fri, 9 Nov 2018 14:12:19 +0000 (15:12 +0100)]
Merge pull request #12374 from nextcloud/backport/12342/stable14
[14] Add fix for IE11 flexbox height bug
Roeland Jago Douma [Mon, 5 Nov 2018 15:27:43 +0000 (16:27 +0100)]
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>
Julius Härtl [Wed, 7 Nov 2018 18:51:00 +0000 (19:51 +0100)]
Add fix for IE11 flexbox height bug
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Bjoern Schiessle [Tue, 30 Oct 2018 21:11:17 +0000 (22:11 +0100)]
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>
Nextcloud bot [Fri, 9 Nov 2018 01:12:36 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 8 Nov 2018 21:42:23 +0000 (22:42 +0100)]
Merge pull request #12353 from nextcloud/backport/11838/fix-default-types-of-members
[stable14] Fix default types of activity event member variables
Joas Schilling [Mon, 15 Oct 2018 09:45:17 +0000 (11:45 +0200)]
Fix default types of activity event member variables
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Thu, 8 Nov 2018 09:24:45 +0000 (10:24 +0100)]
Merge pull request #12339 from nextcloud/bugfix/12007
fix - Add to favorites not working in IE11
Yevhenii Kostiuk [Sat, 27 Oct 2018 12:55:50 +0000 (15:55 +0300)]
fix - Add to favorites not working in IE11 - polyfill needed #12007
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Roeland Jago Douma [Thu, 8 Nov 2018 06:42:14 +0000 (07:42 +0100)]
Merge pull request #12341 from nextcloud/stb14-ie11-function-fix
Remove arrow function for ie compatibility
Nextcloud bot [Thu, 8 Nov 2018 01:12:28 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
John Molakvoæ (skjnldsv) [Wed, 7 Nov 2018 16:46:55 +0000 (17:46 +0100)]
Remove arrow function for ie compatibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Morris Jobke [Wed, 7 Nov 2018 15:19:55 +0000 (16:19 +0100)]
Merge pull request #12331 from nextcloud/backport/12306/stable14
[14] Disabled ldap fix
Roeland Jago Douma [Wed, 7 Nov 2018 12:20:11 +0000 (13:20 +0100)]
Build settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 09:53:40 +0000 (10:53 +0100)]
Show disabled even if empty if ldap enabled
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Nextcloud bot [Wed, 7 Nov 2018 01:12:40 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 6 Nov 2018 17:14:05 +0000 (18:14 +0100)]
Merge pull request #12297 from nextcloud/backport/12127/stable14
[14] A folder should get a folder mimetype
Morris Jobke [Tue, 6 Nov 2018 17:13:24 +0000 (18:13 +0100)]
Merge pull request #12300 from nextcloud/backport/12230/stable14
[14] Do not log FileLock as exception
Morris Jobke [Tue, 6 Nov 2018 09:15:40 +0000 (10:15 +0100)]
Merge pull request #12299 from nextcloud/backport/12177/stable14
[14] Use the proper server for the apptoken flow login
Roeland Jago Douma [Tue, 6 Nov 2018 08:59:48 +0000 (09:59 +0100)]
Merge pull request #12301 from nextcloud/backport/12231/stable14
[14] Set the filemodel before rending the detailsview
Roeland Jago Douma [Fri, 2 Nov 2018 21:45:25 +0000 (22:45 +0100)]
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>
Roeland Jago Douma [Sun, 4 Nov 2018 12:21:34 +0000 (13:21 +0100)]
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 2 Nov 2018 21:06:25 +0000 (22:06 +0100)]
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>
Roeland Jago Douma [Wed, 31 Oct 2018 22:06:08 +0000 (23:06 +0100)]
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>
Roeland Jago Douma [Mon, 29 Oct 2018 20:35:08 +0000 (21:35 +0100)]
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>
Nextcloud bot [Tue, 6 Nov 2018 01:12:48 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Mon, 5 Nov 2018 01:12:47 +0000 (01:12 +0000)]
[tx-robot] updated from transifex