Commit Graph

48155 Commits

Author SHA1 Message Date
Roeland Jago Douma 139055c1dd
Merge pull request #13880 from nextcloud/enh/expose_subadmin_to_ocp
Expose subadmin to OCP
2019-01-29 22:13:41 +01:00
Roeland Jago Douma 6b653635a7
Merge pull request #13881 from nextcloud/refactor/jquery-plugins-bundle
Move jQuery plugins into modules and add them to the bundle
2019-01-29 22:09:12 +01:00
Roeland Jago Douma 15abcff2a1
Expose subadmin to OCP
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-29 20:47:35 +01:00
Daniel Calviño Sánchez 2c151f4efb Fix updating the password of a link share when passwords are enforced
The password input was shown in the popup menu when passwords were not
enforced, or when they were enforced but no password was set, which
prevented updating/changing the password once set. As the password input
should be shown too when password are enforced and a password is set no
condition is needed, so now the password input is always shown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-29 20:26:22 +01:00
Roeland Jago Douma deb7d2364f
Merge pull request #13869 from nextcloud/enh/clean_pending_2fa_session_on_password_change
Clean pending 2FA authentication on password reset
2019-01-29 19:50:15 +01:00
Maxence Lange b8e324177e removing default value in param $chunk
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2019-01-29 17:13:29 -01:00
Maxence Lange adde9a685c +generateChunks()
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2019-01-29 16:53:49 -01:00
John Molakvoæ (skjnldsv) 812567ae58
Remove warning in case of external storage error
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-01-29 16:23:04 +01:00
Roeland Jago Douma 050b9135d5
Merge pull request #13883 from nextcloud/fix-dropping-a-folder-on-a-folder-row
Fix dropping a folder on a folder row
2019-01-29 15:44:21 +01:00
Robin Appelman 9a220214b8
add fallback for trashbin original location
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-29 15:14:04 +01:00
Morris Jobke 754932c756
Merge pull request #13865 from nextcloud/fix/noid/ldap-pagedsearch-multiplebases
fix paged search with multiple bases (LDAP)
2019-01-29 14:22:33 +01:00
Roeland Jago Douma ac8a6e2244
Clean pending 2FA authentication on password reset
When a password is reste we should make sure that all users are properly
logged in. Pending states should be cleared. For example a session where
the 2FA code is not entered yet should be cleared.

The token is now removed so the session will be killed the next time
this is checked (within 5 minutes).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-29 13:08:56 +01:00
Daniel Calviño Sánchez 038e665db9 Fix dropping a folder on a folder row
When the uploaded files have a relative path (that is, when a folder is
uploaded) it is first ensured that all the parent folders exist, which
is done by trying to create them. When a folder is created in the
currently opened folder the file list is updated and a row for the new
folder is added. However, this was done too when the folder already
existed, which caused the previous row to be removed and a new one added
to replace it.

For security reasons, some special headers need to be set in requests;
this is done automatically for jQuery by handling the "ajaxSend" event
in the document. In the case of DAV requests, if the headers are not set
the server rejects the request with "CSRF check not passed".

When a file or folder is dropped on a folder row the jQuery upload
events are chained from the initial drop event, which has the row as its
target. In order to upload the file jQuery performs a request, which
triggers the "ajaxSend" event in the row; this event then bubbles up to
the document, which is then handled by adding the special headers to the
request.

However, when a folder was dropped on a folder row that folder row was
removed when ensuring that the folder exists. The jQuery upload events
were still triggered on the row, but as it had been removed it had no
parent nodes, and thus the events did not bubble up. Due to this the
"ajaxSend" event never reached the document when triggered on the
removed row, the headers were not set, and the upload failed.

All this is simply fixed by not removing the folder row when trying to
create it if it existed already.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-29 13:04:19 +01:00
Morris Jobke d9b2b3e3c8
Merge pull request #13843 from nextcloud/bugfix/11852-add-icon-caldav
Add ico as avatar
2019-01-29 12:22:41 +01:00
Roeland Jago Douma 0fd208a83b
Merge pull request #13866 from nextcloud/s3-multipart-uploader
always use multipart uploader for s3 uploads
2019-01-29 11:14:05 +01:00
Christoph Wurst 3ced9cd83d
Move jQuery plugins into modules and add them to the bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-29 11:07:48 +01:00
Morris Jobke 2682d672d8
Merge pull request #13878 from nextcloud/refactor/oc-appconfig-eventsource-l10n
Move OC.AppConfig, OC.EventSource and OC.L10N to the server bundle
2019-01-29 10:55:30 +01:00
John Molakvoæ 34d5001e2f
Merge pull request #10874 from nextcloud/feature/10859/clear-localstorage-on-logout
Clears the local storage after logout
2019-01-29 10:39:56 +01:00
John Molakvoæ afa51d1640
Merge pull request #13791 from nextcloud/no-whiteversion-for-shadowed-icons
Do not generate dark version of the view-icons w/ shadows
2019-01-29 10:00:19 +01:00
Christoph Wurst d0cd0918b9
Move OC.L10n to the server bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-29 09:38:50 +01:00
Christoph Wurst 3695d02575
Move OC.EventSource to the server bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-29 09:33:16 +01:00
Christoph Wurst 8e9d259074
Move OC.AppConfig to the server bundle and add a deprecation verion
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-29 09:32:09 +01:00
Roeland Jago Douma ef94996fee
Merge pull request #13870 from nextcloud/refactor/oc-contactsmenu-bundle
Move OC.Contactsmenu and OC.Backbone to the server bundle
2019-01-29 09:30:28 +01:00
Michael Weimann e083e8abc6
Clears the local storage after logout
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2019-01-29 09:02:52 +01:00
Christoph Wurst 8fcb9fcfdc
Merge pull request #13855 from tomasz-grobelny/faster_file_upload
Throttle getstoragestats.php calls and allow simultaneous uploads
2019-01-29 08:51:38 +01:00
John Molakvoæ (skjnldsv) ecede42969
Popovermenu size fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-01-29 08:43:08 +01:00
Christoph Wurst aa2ff51a12
Move OC.Contactsmenu and OC.Backbone to the server bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-29 08:40:19 +01:00
John Molakvoæ (skjnldsv) bb9e282e95
Unify headers menu design, fix click area
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-01-29 08:12:03 +01:00
Arthur Schiwon c868892d2d
iterate over bases instead of doing parallel search
parallel search is not compatible with paged search, but the letter is
usually always applied.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-28 23:00:59 +01:00
Daniel Kesselberg 2764173d09
Use proper mime type for ico
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-01-28 21:41:26 +01:00
Daniel Kesselberg 4dbef1210c
Add ico as avatar
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-01-28 21:41:26 +01:00
Iglou.eu 240789f787
add background on app hover section
Avoid click on bad app, focus attention
2019-01-28 21:21:31 +01:00
Morris Jobke 198a45ff75
Merge pull request #13867 from nextcloud/refactor/oc-apps-bundle
Move OCA.Apps to the server bundle
2019-01-28 21:18:30 +01:00
Morris Jobke 554c78c9b1
Merge pull request #5881 from nextcloud/command-move-calendar
Add command to move a calendar from an user to another
2019-01-28 17:35:13 +01:00
Christoph Wurst 4921359e71
Move OCA.Apps to the server bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-28 15:06:01 +01:00
Robin Appelman 1d322d3b37
always use multipart uploader for s3 uploads
the multipart uploader handles non seekable streams while `upload` does not

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-28 14:51:19 +01:00
Morris Jobke cfdece7833
Merge pull request #13860 from nextcloud/refactor/oc-oca-namespace-bundle
Add OC and OCA namespace declarations to the bundle
2019-01-28 14:49:34 +01:00
Morris Jobke b5b8a17222
Merge pull request #13675 from imsolost/master
Fixed some LGTM alerts
2019-01-28 14:46:01 +01:00
Arthur Schiwon 4bd3916445
integration test: pages search scenario with multiple bases
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-28 14:20:03 +01:00
Arthur Schiwon 91b30ada8e
typo
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-28 14:19:31 +01:00
Christoph Wurst 87bc9f1fa1
Add OC and OCA namespace declarations to the bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-28 13:32:34 +01:00
Roeland Jago Douma 8d52a3ac4a
Merge pull request #13859 from nextcloud/dependabot/npm_and_yarn/settings/vue-loader-15.6.2
Bump vue-loader from 15.6.0 to 15.6.2 in /settings
2019-01-28 12:51:03 +01:00
Roeland Jago Douma 4fed18e6b1
Merge pull request #13839 from nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-1.16.3
Bump css-vars-ponyfill from 1.16.2 to 1.16.3
2019-01-28 12:50:03 +01:00
Roeland Jago Douma 7ce58e3904
Merge pull request #13858 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.6.2
Bump vue-loader from 15.6.0 to 15.6.2 in /apps/oauth2
2019-01-28 12:40:46 +01:00
Morris Jobke fdd81e6c6e
Merge pull request #13818 from nextcloud/design/backgroundjobs-accessibility
Contain background jobs options in fieldset to improve accessibility
2019-01-28 12:20:29 +01:00
Morris Jobke f746d36a4a
Merge pull request #13798 from nextcloud/remove-legacy-activity-stuff
Remove legacy activity stuff
2019-01-28 11:17:45 +01:00
dependabot[bot] 9d3892025a
Bump vue-loader from 15.6.0 to 15.6.2 in /apps/oauth2
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.0 to 15.6.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-28 09:50:50 +01:00
dependabot[bot] a12cab9e04
Bump vue-loader from 15.6.0 to 15.6.2 in /settings
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.0 to 15.6.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-28 09:49:53 +01:00
Christoph Wurst 7698adfc7c
Merge pull request #13838 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.6.1
Bump vue-loader from 15.6.0 to 15.6.1 in /apps/updatenotification
2019-01-28 08:55:28 +01:00
Tomasz Grobelny f99ce0d546 Throttle getstoragestats.php calls and allow simultaneous uploads
Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
2019-01-27 22:59:14 +01:00