summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-10-2214-0/+56
|
* Merge pull request #17568 from ↵blizzz2019-10-2114-27/+36
|\ | | | | | | | | nextcloud/fix/noid/move-away-from-deprecated-event use OCP\EventDispatcher\Event over Symfony's deprecated Event
| * use OCP\EventDispatcher\Event over Symfony's deprecated EventArthur Schiwon2019-10-1714-27/+36
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #17593 from nextcloud/ensure-valid-theming-image-routeRoeland Jago Douma2019-10-211-4/+10
|\ \ | | | | | | make sure that the urls for theming images are valid
| * | make sure that the urls for theming images are validRobin Appelman2019-10-181-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | In some circumstances the url generation seems to fail, resulting in an empty image url which causes the browser to load the main page multiple times, leading to issues with state tokens Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #17594 from nextcloud/dont-cache-notfoundRoeland Jago Douma2019-10-211-1/+3
|\ \ \ | | | | | | | | Dont cache empty url for not found routes
| * | | Dont cache empty url for not found routesRobin Appelman2019-10-181-1/+3
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #17595 from nextcloud/fix/noid/wrong-pwd-apple-open-dirblizzz2019-10-211-1/+2
|\ \ \ | | | | | | | | treat LDAP error 50 as auth issue, prevents lost server connection errors
| * | | treat LDAP error 50 as auth issue, prevents lost server connection errorsArthur Schiwon2019-10-181-1/+2
| |/ / | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #17450 from nextcloud/fix/17368/odd-group-numbersblizzz2019-10-217-40/+53
|\ \ \ | | | | | | | | hide strange Everyone and Disabled group numbers with LDAP
| * | | Compile assetsnpmbuildbot[bot]2019-10-214-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | when adding/removing users from groups don't touch counters if LDAPArthur Schiwon2019-10-211-8/+10
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | hide strange Everyone and Disabled group numbers with LDAP, fixes 17368Arthur Schiwon2019-10-212-25/+36
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #17577 from nextcloud/bugfix/noid/about-helpRoeland Jago Douma2019-10-216-70/+109
|\ \ \ \ | | | | | | | | | | Migrate help to a Controller
| * | | | Move help to controllerJulius Härtl2019-10-176-70/+109
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #17547 from nextcloud/enh/noid/log-exception-json-escapeRoeland Jago Douma2019-10-211-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Do not escape slashes for logged exceptions
| * | | | Do not escape slashes for logged exceptionsJulius Härtl2019-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #17545 from nextcloud/bugfix/noid/workflow-catchRoeland Jago Douma2019-10-211-6/+11
|\ \ \ \ \ | | | | | | | | | | | | Ignore unavailable entity/operation classes
| * | | | | Ignore unavailable entity/operation classesJulius Härtl2019-10-151-6/+11
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #17603 from ↵Roeland Jago Douma2019-10-214-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/moment-timezone-0.5.27 Bump moment-timezone from 0.5.26 to 0.5.27
| * | | | | Bump moment-timezone from 0.5.26 to 0.5.27dependabot-preview[bot]2019-10-204-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.26 to 0.5.27. - [Release notes](https://github.com/moment/moment-timezone/releases) - [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md) - [Commits](https://github.com/moment/moment-timezone/compare/0.5.26...0.5.27) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-10-2134-4/+118
|/ / / / /
* | | | | Merge pull request #17601 from nextcloud/dependabot/npm_and_yarn/webpack-4.41.2Roeland Jago Douma2019-10-2022-66/+34
|\ \ \ \ \ | | | | | | | | | | | | Bump webpack from 4.41.1 to 4.41.2
| * | | | | Bump webpack from 4.41.1 to 4.41.2dependabot-preview[bot]2019-10-2022-75/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.41.1 to 4.41.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.41.1...v4.41.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | Merge pull request #17605 from ↵Roeland Jago Douma2019-10-202-13/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/browserslist-config-nextcloud-0.1.0 Bump browserslist-config-nextcloud from 0.0.1 to 0.1.0
| * | | | | | Bump browserslist-config-nextcloud from 0.0.1 to 0.1.0dependabot-preview[bot]2019-10-202-13/+37
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps browserslist-config-nextcloud from 0.0.1 to 0.1.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* / / / / / [tx-robot] updated from transifexNextcloud bot2019-10-2032-28/+52
|/ / / / /
* | | | | Merge pull request #17575 from ↵Roeland Jago Douma2019-10-192-3/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/include-the-share-in-the-files_sharing-loadadditionalscripts-event Include the share in the Files_Sharing::loadAdditionalScripts event
| * | | | | Include the share in the Files_Sharing::loadAdditionalScripts eventDaniel Calviño Sánchez2019-10-172-3/+14
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a better context for apps using the event, for example to load one script or another depending on whether the share is a file or a folder. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-10-1910-22/+22
| |_|/ / |/| | |
* | | | added documentation links on settings pages (#17585)John Molakvoæ2019-10-184-2/+6
|\ \ \ \ | | | | | | | | | | added documentation links on settings pages
| * | | | added documentation links on settings pagesSascha Wiswedel2019-10-174-2/+6
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | | Merge pull request #17557 from nextcloud/build/webpack-single-modulesRoeland Jago Douma2019-10-181-12/+27
|\ \ \ \ | | | | | | | | | | Allow building single webpack modules
| * | | | Allow building single webpack modulesJulius Härtl2019-10-161-12/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-10-1816-36/+164
| |/ / / |/| | |
* | | | Merge pull request #17576 from nextcloud/enhancement/occ/user-list-infoblizzz2019-10-172-6/+39
|\ \ \ \ | |_|/ / |/| | | Add detailed users listing in occ user:info command
| * | | Add detailed users listing in occ user:info commandJohn Molakvoæ (skjnldsv)2019-10-172-6/+39
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Let SCSS cleanup only run once (#17543)John Molakvoæ2019-10-171-2/+6
|\ \ \ | | | | | | | | Let SCSS cleanup only run once
| * | | Make sure the cache is only reset once at a timeJulius Härtl2019-10-151-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Use a distributed cache for the isCachedCacheJulius Härtl2019-10-151-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #17569 from nextcloud/td/di/middlewareRoeland Jago Douma2019-10-172-9/+2
|\ \ \ | | | | | | | | Allow DI in middleware
| * | | Move over OCSShareAPIMIddleware to pure DIRoeland Jago Douma2019-10-161-8/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Do DI on registered middleware as wellRoeland Jago Douma2019-10-161-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-174-0/+96
| | | |
* | | | Merge all babelrc into one file (#17570)John Molakvoæ2019-10-176-52/+3
|\ \ \ \ | | | | | | | | | | Merge all babelrc into one file
| * | | | Merge all babelrc into one fileJohn Molakvoæ (skjnldsv)2019-10-176-52/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #17548 from nextcloud/fix/saml/pass_on_directRoeland Jago Douma2019-10-175-3/+17
|\ \ \ \ | |/ / / |/| | | Pass on direct query parameter during login
| * | | Pass on direct query parameter during loginRoeland Jago Douma2019-10-165-3/+17
|/ / / | | | | | | | | | | | | | | | | | | If direct is set we should forward it again. This to make SAML direct login work again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #17559 from nextcloud/deprecate/template-managerRoeland Jago Douma2019-10-164-10/+6
|\ \ \ | |_|/ |/| | Deprecate TemplateManager
| * | Deprecate TemplateManagerJulius Härtl2019-10-164-10/+6
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>