aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9550 from ↵Morris Jobke2018-06-018-89/+172
|\ | | | | | | | | nextcloud/bugfix/noid/override_freebusy_sharing_rules allow admins to disable FreeBusy without modifying ShareAPI capabilities
| * allow admins to override FreeBusy capabilities without modifying ShareAPI ↵Georg Ehrke2018-05-228-89/+172
| | | | | | | | | | | | capabilities Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2018-06-0134-12/+146
| |
* | Merge pull request #9704 from nextcloud/fix/noid/remove-unneeded-importsRoeland Jago Douma2018-05-311-2/+0
|\ \ | | | | | | Remove not needed change
| * | Remove not needed changeMorris Jobke2018-05-311-2/+0
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-05-3134-166/+138
| |
* | Merge pull request #9167 from nextcloud/migration-descriptionRoeland Jago Douma2018-05-306-5/+82
|\ \ | | | | | | Add human readable description to migration steps
| * | Add since tagsRoeland Jago Douma2018-05-301-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add human readable description to migration stepsRobin Appelman2018-05-306-5/+80
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #9673 from ↵Julius Härtl2018-05-301-1/+1
|\ \ | | | | | | | | | | | | nextcloud/dependabot/composer/build/integration/guzzlehttp/guzzle-6.3.3 Update guzzlehttp/guzzle requirement to 6.3.3 in /build/integration
| * | Update guzzlehttp/guzzle requirement to 6.3.3 in /build/integrationdependabot[bot]2018-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) to permit the latest version. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md) - [Commits](https://github.com/guzzle/guzzle/commits/6.3.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #9666 from ↵John Molakvoæ2018-05-302-0/+26
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/enhancement/noid/preview_check_file_readbale Make sure the file is readable before attempting to create a preview
| * | | Make sure the file is readable before attempting to create a previewRoeland Jago Douma2018-05-302-0/+26
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9680 from ↵John Molakvoæ2018-05-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/karma-viewport-tw-1.0.2 Update karma-viewport requirement to ^1.0.2 in /build
| * | | Update karma-viewport requirement to ^1.0.2 in /builddependabot[bot]2018-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [karma-viewport](https://github.com/squidfunk/karma-viewport) to permit the latest version. - [Release notes](https://github.com/squidfunk/karma-viewport/releases) - [Changelog](https://github.com/squidfunk/karma-viewport/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/karma-viewport/commits/1.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #9682 from ↵John Molakvoæ2018-05-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/karma-tw-2.0.2 Update karma requirement to ^2.0.2 in /build
| * | | | Update karma requirement to ^2.0.2 in /builddependabot[bot]2018-05-301-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [karma](https://github.com/karma-runner/karma) to permit the latest version. - [Release notes](https://github.com/karma-runner/karma/releases) - [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md) - [Commits](https://github.com/karma-runner/karma/commits/v2.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #9681 from ↵John Molakvoæ2018-05-302-78/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-0.28.11 Bump css-loader from 0.28.9 to 0.28.11 in /apps/updatenotification
| * | | | Bump css-loader from 0.28.9 to 0.28.11 in /apps/updatenotificationdependabot[bot]2018-05-302-78/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 0.28.9 to 0.28.11. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v0.28.9...v0.28.11) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #9688 from ↵Julius Härtl2018-05-302-323/+354
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-cli-2.1.4 Bump webpack-cli from 2.1.3 to 2.1.4 in /settings
| * | | | Bump webpack-cli from 2.1.3 to 2.1.4 in /settingsdependabot[bot]2018-05-302-323/+354
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v2.1.3...v2.1.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #9685 from ↵Julius Härtl2018-05-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/node-sass-approx-4.9.0 Update node-sass requirement to ~4.9.0 in /build
| * | | | Update node-sass requirement to ~4.9.0 in /builddependabot[bot]2018-05-301-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [node-sass](https://github.com/sass/node-sass) to permit the latest version. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/commits/v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #9679 from ↵Morris Jobke2018-05-301-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/jsdoc-approx-3.5.5 Update jsdoc requirement to ~3.5.5 in /build
| * | | Update jsdoc requirement to ~3.5.5 in /builddependabot[bot]2018-05-301-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [jsdoc](https://github.com/jsdoc3/jsdoc) to permit the latest version. - [Release notes](https://github.com/jsdoc3/jsdoc/releases) - [Changelog](https://github.com/jsdoc3/jsdoc/blob/master/CHANGES.md) - [Commits](https://github.com/jsdoc3/jsdoc/commits/3.5.5) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #9675 from ↵Morris Jobke2018-05-301-1/+1
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/composer/build/integration/sabre/dav-3.2.2 Update sabre/dav requirement to 3.2.2 in /build/integration
| * | Update sabre/dav requirement to 3.2.2 in /build/integrationdependabot[bot]2018-05-301-1/+1
|/ / | | | | | | | | | | | | | | Updates the requirements on [sabre/dav](https://github.com/sabre-io/dav) to permit the latest version. - [Release notes](https://github.com/sabre-io/dav/releases) - [Changelog](https://github.com/sabre-io/dav/blob/master/CHANGELOG.md) - [Commits](https://github.com/sabre-io/dav/commits/3.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #9670 from nextcloud/drone-mysqlmb4-fixRoeland Jago Douma2018-05-301-1/+1
|\ \ | | | | | | Fix drone mysqlmb4 tests
| * | Fix drone mysqlmb4 testsJohn Molakvoæ (skjnldsv)2018-05-301-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-3064-14/+106
| | |
* | | Merge pull request #9665 from ↵Morris Jobke2018-05-292-4/+18
|\ \ \ | |/ / |/| | | | | | | | nextcloud/add-workaround-for-parameter-not-available-in-mink-extension Add workaround for parameter not available in Mink Extension
| * | Use "paths.base" parameter for the path to the custom Firefox profileDaniel Calviño Sánchez2018-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Although in the case of the acceptance tests for the server it is not strictly needed it was modified for consistency with the configuration used for the acceptance tests in apps. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add workaround for parameter not available in Mink ExtensionDaniel Calviño Sánchez2018-05-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in the Mink Extension for Behat it is not possible to use the "paths.base" parameter in the path to the custom Firefox profile. "paths.base" is a special parameter in the Behat configuration that refers to the directory in which "behat.yml" is stored. This comes in very handy to set the path to custom Firefox profiles in the acceptance tests for apps, as even if the "behat.yml" file belongs to an app its paths are relative to the directory in which the tests are run, that is, the "tests/acceptance" directory of the server. Until the bug is fixed, just before the acceptance tests are run the "paths.base" parameter in the path to the custom Firefox profile is replaced by its value in the "behat.yml" file used by the acceptance tests. Note that the file that is modified is the one inside the Docker container used to run the acceptance tests, so the original file is not touched. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract path to configuration dir to its own variableDaniel Calviño Sánchez2018-05-291-3/+5
|/ / | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #9640 from nextcloud/fix/9502/missedstatecheckblizzz2018-05-292-8/+56
|\ \ | | | | | | check user state when fetching to avoid dealing with offline objects, fixes #9502
| * | check user state when fetching to avoid dealing with offline objectsArthur Schiwon2018-05-292-8/+56
| | | | | | | | | | | | | | | | | | fixes #9502 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #9583 from nextcloud/files-home-userfolderMorris Jobke2018-05-292-7/+9
|\ \ \ | | | | | | | | use getUserFolder instead of getFileInfo when constructing FilesHome
| * | | use getUserFolder instead of getFileInfo when constructing FilesHomeRobin Appelman2018-05-242-7/+9
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #9589 from nextcloud/bugfix/noid/allow-empty-route-navigationMorris Jobke2018-05-291-1/+1
|\ \ \ \ | | | | | | | | | | Allow empty route for navigation entries
| * | | | Allow empty route for navigation entriesJulius Härtl2018-05-241-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigation entries might be handled by javascript, as the about section from https://github.com/nextcloud/firstrunwizard/pull/64 so we don't need a route for that. Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #9653 from nextcloud/bugfix/noid/oauth_basic_authRoeland Jago Douma2018-05-292-0/+89
|\ \ \ \ | | | | | | | | | | The OAuth endpoint needs to support Basic Auth
| * | | | The OAuth endpoint needs to support Basic AuthRoeland Jago Douma2018-05-292-0/+89
|/ / / / | | | | | | | | | | | | | | | | | | | | * Add test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | / / [tx-robot] updated from transifexNextcloud bot2018-05-2932-8/+44
| |/ / |/| |
* | | Merge pull request #9617 from nextcloud/users-sort-case-fixMorris Jobke2018-05-282-4/+6
|\ \ \ | | | | | | | | Ignore case when sorting users
| * | | Added case example to testsJohn Molakvoæ (skjnldsv)2018-05-261-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Ignore case when sorting usersJohn Molakvoæ (skjnldsv)2018-05-261-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #9559 from nextcloud/sabre-head-dont-open-fileMorris Jobke2018-05-281-0/+0
|\ \ \ \ | | | | | | | | | | dont open the file on dav HEAD request
| * | | | dont open the file on dav HEAD requestRobin Appelman2018-05-261-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #9268 from nextcloud/bugfix/6711Morris Jobke2018-05-2814-31/+242
|\ \ \ \ \ | | | | | | | | | | | | Do not load calendar/addressbook plugins if not needed
| * | | | | Move repairstep to a custom commandRoeland Jago Douma2018-05-286-39/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People that have issues can run it manually Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>