summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-10-064-10/+30
|
* Fix Axios CSRF token update (#17404)John Molakvoæ2019-10-0541-186/+186
|\ | | | | Fix Axios CSRF token update
| * Switch to @nextcloud/axios for the CSRF update fixChristoph Wurst2019-10-0541-186/+186
| | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Allow group displaynames in the database backend (#17221)John Molakvoæ2019-10-052-1/+24
|\ \ | | | | | | Allow group displaynames in the database backend
| * | Allow to set the group display name in the database backendJoas Schilling2019-09-272-1/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #17387 from nextcloud/fix/remove/federated_shareRoeland Jago Douma2019-10-051-0/+5
|\ \ \ | | | | | | | | Allow removing federated shares of locally reshared files
| * | | Allow removing federated shares of locally reshared filesRoeland Jago Douma2019-10-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * UserA shares a folder to UserB * UserB does a federated share to userC@serverC * UserB now tries to revoke the federated share Before we always tried to notify the remote cloud. The case that the file was reshared locally was not considered. This patch makes sure not to try to notify a federated server if both users are local users. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Fix updating and deleting authtokens (#17397)John Molakvoæ2019-10-052-2/+51
|\ \ \ \ | | | | | | | | | | Fix updating and deleting authtokens
| * | | | fix updating and deleting authtokensSergej Nikolaev2019-10-052-2/+51
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
* | | | allow trash backends to overwrite the tooltip for trash items (#17374)John Molakvoæ2019-10-058-24/+43
|\ \ \ \ | |/ / / |/| | | allow trash backends to overwrite the tooltip for trash items
| * | | allow trash backends to overwrite the tooltip for trash itemsRobin Appelman2019-10-058-24/+43
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-05118-216/+266
|/ / /
* | | Fix shares read permissionsJohn Molakvoæ (skjnldsv)2019-10-044-10/+88
| | | | | | | | | | | | | | | | | | | | | A user with reshare permissions on a file is now able to get any share of that file (just like the owner). Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Add checks for whether a user with access to a share can delete itJohn Molakvoæ (skjnldsv)2019-10-042-12/+292
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Extract check for whether a user with access to a share can edit itJohn Molakvoæ (skjnldsv)2019-10-041-1/+28
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #17357 from nextcloud/enh/oauth/no_oc_bindingRoeland Jago Douma2019-10-041-2/+3
|\ \ \ | | | | | | | | Import router in oauth js
| * | | fixup! Import routerRoeland Jago Douma2019-10-031-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Import routerRoeland Jago Douma2019-10-031-2/+3
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #17359 from nextcloud/bugfix/noid/dont-call-basename-on-nullRoeland Jago Douma2019-10-041-1/+1
|\ \ \ | | | | | | | | Don't call basename on null
| * | | Don't call basename on nullJoas Schilling2019-10-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Prevent non owners to update others link sharesJohn Molakvoæ (skjnldsv)2019-10-041-50/+50
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Use same settings for mail share as link sharesJohn Molakvoæ (skjnldsv)2019-10-041-20/+13
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Split drone webpack testsJohn Molakvoæ (skjnldsv)2019-10-0422-49/+154
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Fix master testing and update eslint-configJohn Molakvoæ (skjnldsv)2019-10-043-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-04130-1076/+1088
| |/ / |/| |
* | | Remove users management settings cleaning leftovers (#17360)John Molakvoæ2019-10-0310-1252/+1
|\ \ \ | | | | | | | | Remove users management settings cleaning leftovers
| * | | Remove users management settings cleaning leftoversJohn Molakvoæ (skjnldsv)2019-10-0110-1252/+1
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-10-036-4/+10
| | |
* | | Merge pull request #17002 from nextcloud/fix/noid/ldap-dont-process-known-avasblizzz2019-10-022-2/+113
|\ \ \ | | | | | | | | Don't process known avatars from LDAP
| * | | Don't process known avatars from LDAPArthur Schiwon2019-09-042-2/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * avoids useless FS operation * avoids useless DB writes * avoids useless addressbook updates * addendum to #17001 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-02150-4162/+4338
| |/ / |/| |
* | | Comply to eslintJohn Molakvoæ (skjnldsv)2019-10-01138-5362/+7158
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-10-01170-15846/+16134
| | |
* | | Merge pull request #17001 from nextcloud/fix/noid/addressbookchanges-avatarblizzz2019-10-011-1/+1
|\ \ \ | | | | | | | | reduce adressbook change events and handling
| * | | reduce adressbook change events and handlingArthur Schiwon2019-09-041-1/+1
| |/ / | | | | | | | | | | | | | | | ... from four to one on avatar updates Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Bump dompurify from 2.0.1 to 2.0.3dependabot-preview[bot]2019-09-304-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.0.1 to 2.0.3. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.0.1...2.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Bump webpack from 4.40.2 to 4.41.0dependabot-preview[bot]2019-09-2920-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.40.2 to 4.41.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.40.2...v4.41.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Move oauth admin settings to initialstateRoeland Jago Douma2019-09-2815-206/+185
| | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Move settings to an appChristoph Wurst2019-09-28280-3/+81859
| | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Remove input id on login form (#17294)John Molakvoæ2019-09-287-50/+51
|\ \ \ | | | | | | | | Remove input id on login form
| * | | Remove input id on login formJohn Molakvoæ (skjnldsv)2019-09-287-50/+51
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-09-2816-6/+104
| |_|/ |/| |
* | | Merge pull request #17258 from nextcloud/smb-timeout-configRoeland Jago Douma2019-09-272-1/+11
|\ \ \ | | | | | | | | add (hidden) option to configure smb timeout
| * | | Update apps/files_external/lib/Lib/Backend/SMB.phpRobin Appelman2019-09-251-1/+1
| | | | | | | | | | | | Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | add (hidden) option to configure smb timeoutRobin Appelman2019-09-252-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hidden from ui to prevent clutter ```occ files_external:config <mount> timeout 30``` Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #17286 from ↵Joas Schilling2019-09-271-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/bugfix/noid/correctly-detect-mimetype-from-uploads Correctly detect the mimetype from uploads
| * | | Correctly detect the mimetype from uploadsJoas Schilling2019-09-261-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Fix "Cannot add a NOT NULL column with default value NULL"Joas Schilling2019-09-263-3/+12
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #14913 from nextcloud/bugfix/6954/scan-external-s3Roeland Jago Douma2019-09-261-4/+51
|\ \ \ | | | | | | | | Fix directory detection for s3
| * | | Use local variable for directory nameDaniel Kesselberg2019-09-231-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>