summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17431 from ↵Roeland Jago Douma2019-10-082-1/+6
|\ | | | | | | | | johkoenig/bugfix/17377/trusted_domain_helper_case_insensitive make TrustedDomainHelper case insensitive
| * make TrustedDomainHelper case insensitiveJohannes Koenig2019-10-062-1/+6
| | | | | | | | Signed-off-by: Johannes Koenig <mail@jokoenig.de>
* | Merge pull request #17440 from nextcloud/enh/noid/log-json-escapeRoeland Jago Douma2019-10-081-2/+2
|\ \ | | | | | | Do not escape slashes in log json
| * | Do not escape slashes in log jsonJulius Härtl2019-10-071-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Remove duplicate code (#17451)John Molakvoæ2019-10-081-5/+1
|\ \ \ | | | | | | | | Remove duplicate code
| * | | Remove duplicate codeDaniel Kesselberg2019-10-081-5/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #17414 from gary-kim/enh/15155/delete-icon-in-trashbinRoeland Jago Douma2019-10-086-7/+10
|\ \ \ \ | | | | | | | | | | Show Delete Icon in Breadcrumb in Trashbin
| * | | | Show Delete Icon in Breadcrumb in TrashbinGary Kim2019-10-076-7/+10
| | |/ / | |/| | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-0818-10/+44
| |/ / |/| |
* | | Merge pull request #17449 from ↵Roeland Jago Douma2019-10-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix/joas-should-know-you-have-to-increaste-the-server-version-for-new-migrations Increase server version to trigger latest migration
| * | | Increase server version to trigger all migrationsChristoph Wurst2019-10-071-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Do not follow symlinks with webpack (#17448)John Molakvoæ2019-10-071-1/+2
|\ \ \ \ | |/ / / |/| | | Do not follow symlinks with webpack
| * | | Do not follow symlinks with webpackJohn Molakvoæ (skjnldsv)2019-10-071-1/+2
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #17411 from kinolaev/fix-oauth2-redirectRoeland Jago Douma2019-10-072-3/+12
|\ \ \ | |/ / |/| | Fix oauth client redirect
| * | fix oauth client redirectSergej Nikolaev2019-10-042-3/+12
| | | | | | | | | | | | Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-10-0720-22/+88
| |/ |/|
* | Merge pull request #17421 from ↵Roeland Jago Douma2019-10-062-4/+4
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/handlebars-4.4.2 Bump handlebars from 4.4.0 to 4.4.2 in /build
| * | Bump handlebars from 4.4.0 to 4.4.2 in /builddependabot-preview[bot]2019-10-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.0 to 4.4.2. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/v4.4.2/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.0...v4.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Use @nextcloud/paths and deprecate OC helpers (#17392)John Molakvoæ2019-10-0611-454/+95
|\ \ \ | | | | | | | | Use @nextcloud/paths and deprecate OC helpers
| * | | Use @nextcloud/paths and deprecate OC helpersChristoph Wurst2019-10-0511-454/+95
| |/ / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* / / [tx-robot] updated from transifexNextcloud bot2019-10-0610-34/+122
|/ /
* | Fix Axios CSRF token update (#17404)John Molakvoæ2019-10-0555-2156/+1442
|\ \ | | | | | | Fix Axios CSRF token update
| * | Switch to @nextcloud/axios for the CSRF update fixChristoph Wurst2019-10-0553-2145/+1411
| | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | Emit an event when the CSRF token changesChristoph Wurst2019-10-054-11/+31
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Allow group displaynames in the database backend (#17221)John Molakvoæ2019-10-0511-6/+237
|\ \ \ | | | | | | | | Allow group displaynames in the database backend
| * | | Do not allow to have an empty display nameJoas Schilling2019-09-272-2/+9
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Set default valueJoas Schilling2019-09-271-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix DI issueJoas Schilling2019-09-271-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Update autoloaderJoas Schilling2019-09-272-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Remove inherited docsJoas Schilling2019-09-271-16/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow to set the group display name in the database backendJoas Schilling2019-09-277-3/+121
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add a displayname to the database group backendJoas Schilling2019-09-273-3/+116
| | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #17370 from nextcloud/jospoortvliet-patch-1Roeland Jago Douma2019-10-051-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Update README.md
| * | | | | Update README.mdJos Poortvliet2019-10-051-4/+4
|/ / / / / | | | | | | | | | | | | | | | some minor readme updates
* | | | | 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>
* | | | | Merge pull request #17405 from nextcloud/enh/switch/escapeHTMLJohn Molakvoæ2019-10-0513-154/+110
|\ \ \ \ \ | | | | | | | | | | | | Move to escape-html
| * | | | | Remove the tests since the library is testedRoeland Jago Douma2019-10-041-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Move to escape-htmlRoeland Jago Douma2019-10-0414-148/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If there is a package that does exactly the same then lets us use that * Import it properly in the internals (less deprecation warnings) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-10-05122-216/+352
| |/ / / / |/| | | |
* | | | | Fix shares read permissions (#16761)John Molakvoæ2019-10-0412-85/+917
|\ \ \ \ \ | |/ / / / |/| | | | Fix shares read permissions
| * | | | Fix shares read permissionsJohn Molakvoæ (skjnldsv)2019-10-046-14/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Add assorted integration tests for sharesDaniel Calviño Sánchez2019-10-043-0/+100
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Do not expect a 200 HTTP status code when updating a shareDaniel Calviño Sánchez2019-10-043-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be needed to test scenarios in which updating a share return a different HTTP status code, like 401. The assertion for the 200 HTTP status code was added in those scenarios that tested updating a share (that is, those that were also checking the OCS status code), but not in those in which updating a share was just a preparatory step for the actual test (in the same way that the HTTP status code is not checked in those tests when creating a share). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 09:57:50 +0000