summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add acceptance test for checking that the owner can see resharesDaniel Calviño Sánchez2018-11-231-0/+25
| | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Add acceptance test for resharing a file with another userDaniel Calviño Sánchez2018-11-234-0/+40
| | | | | | | | | | | | | | | | To reshare a file there must be at least three enabled users in the system; although it would be possible to run the steps to create a third user in the scenarios that need it for convenience a third enabled user besides "admin" and "user0" was added to the default setup. In a similar way, a new step was added too to login as a given user name, similar to the steps to log in as "user0" and as "admin". Finally, another actor, "Jim", was introduced for those scenarios which should be played by three standard actors (that is, without a special configuration like "Rubeus"). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Add acceptance tests for sharing a folder with another userDaniel Calviño Sánchez2018-11-231-0/+59
| | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Add acceptance tests for sharing a file with another userDaniel Calviño Sánchez2018-11-232-0/+143
| | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Merge pull request #12619 from nextcloud/bump-versionsJoas Schilling2018-11-2324-68/+68
|\ | | | | Bump versions of server and the requirements of apps
| * Bump versions of server and the requirements of appsJoas Schilling2018-11-2324-68/+68
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #12606 from ↵Roeland Jago Douma2018-11-232-4/+4
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/vue-infinite-loading-2.4.1 Bump vue-infinite-loading from 2.4.0 to 2.4.1 in /settings
| * Bump vue-infinite-loading from 2.4.0 to 2.4.1 in /settingsdependabot[bot]2018-11-222-12/+12
| | | | | | | | | | | | | | Bumps [vue-infinite-loading](https://github.com/PeachScript/vue-infinite-loading) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/PeachScript/vue-infinite-loading/releases) - [Commits](https://github.com/PeachScript/vue-infinite-loading/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #12607 from ↵Roeland Jago Douma2018-11-232-37/+135
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/@babel/core-7.1.6 Bump @babel/core from 7.1.2 to 7.1.6 in /settings
| * | Bump @babel/core from 7.1.2 to 7.1.6 in /settingsdependabot[bot]2018-11-232-37/+135
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.1.2 to 7.1.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.1.2...v7.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #12605 from ↵Roeland Jago Douma2018-11-234-104/+159
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.26.0 Bump webpack from 4.24.0 to 4.26.0 in /apps/oauth2
| * | Compile assetsRoeland Jago Douma2018-11-233-8/+13
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Bump webpack from 4.24.0 to 4.26.0 in /apps/oauth2dependabot[bot]2018-11-232-109/+159
| | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.24.0 to 4.26.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.24.0...v4.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #12611 from ↵Roeland Jago Douma2018-11-232-52/+74
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/@babel/preset-env-7.1.6 Bump @babel/preset-env from 7.1.0 to 7.1.6 in /apps/accessibility
| * | | Bump @babel/preset-env from 7.1.0 to 7.1.6 in /apps/accessibilitydependabot[bot]2018-11-222-52/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.1.0 to 7.1.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.1.0...v7.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12610 from ↵Roeland Jago Douma2018-11-232-612/+29
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/@babel/preset-env-7.1.6 Bump @babel/preset-env from 7.1.0 to 7.1.6 in /settings
| * | | Bump @babel/preset-env from 7.1.0 to 7.1.6 in /settingsdependabot[bot]2018-11-222-620/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.1.0 to 7.1.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.1.0...v7.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #12604 from ↵Roeland Jago Douma2018-11-2312-103/+221
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-4.26.0 Bump webpack from 4.24.0 to 4.26.0 in /settings
| * | | Compile assetsRoeland Jago Douma2018-11-2211-28/+33
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Bump webpack from 4.24.0 to 4.26.0 in /settingsdependabot[bot]2018-11-222-88/+201
| | |/ | |/| | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.24.0 to 4.26.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.24.0...v4.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #12608 from ↵Roeland Jago Douma2018-11-234-75/+193
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.26.0 Bump webpack from 4.24.0 to 4.26.0 in /apps/accessibility
| * | | Compile assetsRoeland Jago Douma2018-11-223-8/+13
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Bump webpack from 4.24.0 to 4.26.0 in /apps/accessibilitydependabot[bot]2018-11-222-83/+196
| |/ / | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.24.0 to 4.26.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.24.0...v4.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #12603 from ↵Roeland Jago Douma2018-11-234-88/+137
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.26.0 Bump webpack from 4.24.0 to 4.26.0 in /apps/updatenotification
| * | | Compile assetsRoeland Jago Douma2018-11-223-10/+15
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Bump webpack from 4.24.0 to 4.26.0 in /apps/updatenotificationdependabot[bot]2018-11-222-91/+135
| |/ / | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.24.0 to 4.26.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.24.0...v4.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | / [tx-robot] updated from transifexNextcloud bot2018-11-231230-17864/+5432
| |/ |/|
* | Merge pull request #12612 from ↵dependabot[bot]2018-11-222-26/+173
|\ \ | |/ |/| | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/@babel/core-7.1.6
| * Bump @babel/core from 7.1.2 to 7.1.6 in /apps/accessibilitydependabot[bot]2018-11-222-26/+173
|/ | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.1.2 to 7.1.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.1.2...v7.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* Merge pull request #12592 from patrickbaber/masterRoeland Jago Douma2018-11-221-2/+2
|\ | | | | Fix Typo in Original English String and All Translations
| * fix typo in original english string and all translationsPatrick Baber2018-11-221-2/+2
| | | | | | | | Signed-off-by: Patrick Baber <patrick@p-squared.de>
* | Merge pull request #10825 from greenido/fixing-issue-9931Morris Jobke2018-11-221-1/+50
|\ \ | | | | | | Copy a file to the same directory
| * | JSUnit tests are not compatible with let/const yetMorris Jobke2018-11-191-10/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Translate name for "(copy)"Morris Jobke2018-11-191-11/+12
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Per the last comment on having only (copy) for the first oneIdo Green2018-11-191-5/+19
| | | | | | | | | | | | Signed-off-by: Ido Green <greenido@gmail.com>
| * | Use the new naming per the comments on #9931Ido Green2018-11-191-5/+5
| | | | | | | | | | | | | | | | | | More details here: https://github.com/nextcloud/server/issues/9931#issuecomment-402318120 Signed-off-by: Ido Green <greenido@gmail.com>
| * | cleaning after comments on issue 10825Ido Green2018-11-192-5/+0
| | | | | | | | | | | | | | | | | | More: https://github.com/nextcloud/server/pull/10825#issuecomment-415800850 Signed-off-by: Ido Green <greenido@gmail.com>
| * | fixing issue 9931 - copy a file to the same directoryIdo Green2018-11-193-1/+40
| | | | | | | | | | | | | | | Signed-off-by: Ido Green <greenido@gmail.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #12581 from nextcloud/version/noid/15.0.0rc1v15.0.0RC1Morris Jobke2018-11-221-2/+2
|\ \ \ | | | | | | | | 15.0.0 RC 1
| * | | 15.0.0 RC 1Morris Jobke2018-11-221-2/+2
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #12554 from nextcloud/bugfix/12493/root-folder-switchMorris Jobke2018-11-222-3/+13
|\ \ \ | | | | | | | | Do not switch to root folder if filelist is already shown
| * | | Do not switch to root folder if filelist is already shownJulius Härtl2018-11-222-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigating to the root folder is already handled by OCA.Files.Navigation.setActiveItem in case the view doesn't change. Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #12587 from nextcloud/new-user-clear-fixMorris Jobke2018-11-2212-47/+130
|\ \ \ \ | |/ / / |/| | | Do not clear new user form on failure
| * | | Do not clear new user form on failureJohn Molakvoæ (skjnldsv)2018-11-2212-47/+130
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #12589 from nextcloud/fix/twofactor-admin-groups-explanationMorris Jobke2018-11-226-10/+16
|\ \ \ | |_|/ |/| | Add explanatory text to admin twofactor settings
| * | Add explanatory text to admin twofactor settingsChristoph Wurst2018-11-226-10/+16
| | | | | | | | | | | | | | | | | | | | | Ref #12249 Ref https://github.com/nextcloud/documentation/pull/937 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #12571 from ↵Morris Jobke2018-11-223-11/+43
|\ \ \ | | | | | | | | | | | | | | | | TheLastProject/feature/make_connectivity_check_domains_changeable Make connectivity check domains configurable
| * | | Make connectivity check domains configurableSylvia van Os2018-11-223-11/+43
| | | | | | | | | | | | | | | | Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
* | | | Merge pull request #12580 from nextcloud/app-navigation-menu-dark-fixMorris Jobke2018-11-221-1/+1
|\ \ \ \ | | | | | | | | | | Fix navigation more menu background for dark theme
| * | | | Fix navigation more menu background for dark themeJohn Molakvoæ (skjnldsv)2018-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>