summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #12714 from nextcloud/backport/12708/stable15Roeland Jago Douma2018-11-282-1/+49
|\ \ \ | |/ / |/| | [stable15] Fix folder path containing leading slash when getting mount root by id
| * | Fix folder path containing leading slash when getting mount root by idRobin Appelman2018-11-282-1/+49
|/ / | | | | | | | | | | | | | | This fixes collabora on public link shared groupfolders Fixes https://github.com/nextcloud/groupfolders/issues/225 Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #12700 from nextcloud/backport/12632/stable15Daniel Kesselberg2018-11-2810-480/+991
|\ \ | | | | | | [stable15] Add acceptance tests for sharing files and folders with another user
| * | Rename "FilesSharingAppContext" to "PublicShareContext"Daniel Calviño Sánchez2018-11-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Having both "FilesAppSharingContext" and "FilesSharingAppContext" was confusing, so "FilesSharingAppContext" was renamed to a more descriptive name. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract locators and steps for sharing in Files app to their own contextDaniel Calviño Sánchez2018-11-273-489/+519
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract sharing related acceptance tests to their own feature filesDaniel Calviño Sánchez2018-11-274-416/+436
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add acceptance tests for folders that can not be resharedDaniel Calviño Sánchez2018-11-272-0/+142
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add acceptance tests for resharing a folder with another userDaniel Calviño Sánchez2018-11-271-0/+52
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add acceptance test for checking that the owner can see resharesDaniel Calviño Sánchez2018-11-271-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-274-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-271-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-272-0/+143
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-11-288-48/+776
|/ /
* | Merge pull request #12696 from nextcloud/backport/12649/stable15Daniel Kesselberg2018-11-272-2/+7
|\ \ | |/ |/| [stable15] Make acceptance tests for comments more robust
| * Wait for the comment to be added before changing to another fileDaniel Calviño Sánchez2018-11-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the server is too slow, changing to a different file immediately after sending a new comment but without waiting for the comment to be shown for the original file could cause the new comment to be shown for the current file instead. This is, indeed, a bug in the comments. However, it is not possible to test it reliably in the acceptance tests, as it depends on how fast the server adds the message and how fast the client changes to a different file; sometimes the test would fail and sometimes it would not. Therefore, now it is waited for the comment to be added before changing to another file, as in this case it can be reliably tested that changing to a different file does not cause the comments from the previous file to be shown in the current file (this was a different bug already fixed and due to which this test was added in the first place). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Wait for the empty content element to be shownDaniel Calviño Sánchez2018-11-271-2/+6
|/ | | | | | | | | | | | When the "Comments" tab is open the empty content element is always in the DOM, although it is only shown once the message collection was fetched and there were no messages. Due to this it is necessary to explicitly wait for it to be shown instead of relying on the implicit wait made to find the element; otherwise it would be found immediately and if the collection was not fetched yet it would not be visible, causing the test to fail. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Merge pull request #12683 from nextcloud/backport/12650/stable15Roeland Jago Douma2018-11-271-2/+15
|\ | | | | [stable15] Fix count on string
| * Add return typeDaniel Kesselberg2018-11-271-1/+1
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Fix count on stringDaniel Kesselberg2018-11-271-2/+15
|/ | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* [tx-robot] updated from transifexNextcloud bot2018-11-2730-34/+188
|
* Merge pull request #12638 from nextcloud/backport/12556/stable15Morris Jobke2018-11-262-2/+2
|\ | | | | [stable15] extend anonymous options to work on every dav url
| * extend anonymous options to work on every dav urlRobin Appelman2018-11-232-2/+2
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-11-2624-2/+242
| |
* | [tx-robot] updated from transifexNextcloud bot2018-11-2518-28/+64
| |
* | [tx-robot] updated from transifexNextcloud bot2018-11-24114-194/+222
|/
* Merge pull request #12615 from nextcloud/backport/12592/stable15Roeland Jago Douma2018-11-231-2/+2
|\ | | | | [stable15] 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>
* | [tx-robot] updated from transifexNextcloud bot2018-11-231230-17864/+5432
|/
* 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>
* | | | Merge pull request #12485 from nextcloud/nextcloud-talk-sessions-formatMorris Jobke2018-11-221-4/+10
|\ \ \ \ | | | | | | | | | | Format Nextcloud Talk clients sessions.
| * | | | Fix wording of client sessionsJan-Christoph Borchardt2018-11-211-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Format Nextcloud Talk clients sessions.Ivan Sein2018-11-161-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ivan Sein <ivan@nextcloud.com>
* | | | | Merge pull request #12553 from ↵Morris Jobke2018-11-222-34/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/allow-empty-string-in-getAbsoluteURL Allow empty string in get absolute url
| * | | | | Allow empty strings in getAbsoluteURLJoas Schilling2018-11-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Update the URLGenerator test to current state of artJoas Schilling2018-11-201-32/+30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #12558 from nextcloud/blurry-buttonMorris Jobke2018-11-222-7/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Apply border to primary button if on log in page (and not in a dark container) or if in header
| * | | | | | Always give primary button a border for light primary colorsJan-Christoph Borchardt2018-11-212-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | Apply border to primary button if on log in page (and not in a dark ↵Jan-Christoph Borchardt2018-11-201-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container) or if in header, fix #12294 Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Merge pull request #12559 from nextcloud/heading-menu-spacingMorris Jobke2018-11-221-57/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Better header navigation display
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-24 21:20:49 +0000