aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-0212-32/+126
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-014-4/+4
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-3132-4/+66
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-302-0/+2
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-2914-4/+46
|/ / /
* | | Revert "update icewind/smb to 2.0.5"Robin Appelman2018-03-2810-44/+24
| | | | | | | | | | | | | | | | | | accidental push to wrong branch This reverts commit 3b35cd07493a3ae05b7106808dcec41a8899deec.
* | | update icewind/smb to 2.0.5Robin Appelman2018-03-2810-24/+44
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-03-28122-116/+366
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-274-0/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-2612-0/+18
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-2520-10/+154
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-2416-0/+22
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-2334-10/+48
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-22128-354/+566
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-21136-392/+412
| |
* | Merge pull request #8905 from ↵Roeland Jago Douma2018-03-203-4/+12
|\ \ | | | | | | | | | | | | nextcloud/stable13-8843-set-share-with-field-to-the-id-of-the-circle [stable13] Set "share with" field to the ID of the circle
| * | Use the display name in the avatar for a circle shareDaniel Calviño Sánchez2018-03-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the avatar for a circle share was generated using the "share_with" field as the seed for "imageplaceholder". Due to this, when the "share_with" field is set to the circle ID the character shown in the avatar was just a random character instead of the first character of the display name. Now the "share_with" is still used as the seed for the colour, but the display name is used as the text of the avatar. This adds support for "share_with" fields set to the circle ID while being backwards compatible with "share_with" fields set to the circle name. Note that when "share_with" fields is set to the circle name the colour of the avatar is different in the list of suggested sharees and in the list of current sharees, but that also happened before these changes (due to a different seed being used in each place). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Set "share_with" field to the ID of the circleDaniel Calviño Sánchez2018-03-201-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a share is shared with a circle the "share_with" field returned by the API endpoint was always set to the name of the circle. However, the name is not enough to identify a circle. The Circles app now provides the ID of the circle in the "shared with" field of a Share, so this commit modifies the API endpoint to set the "share_with" field to the ID of the circle when provided by the Circles app. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #8900 from nextcloud/backport/8822/stable13Roeland Jago Douma2018-03-201-5/+11
|\ \ \ | |/ / |/| | [stable13] the FN is optional, carrying the displayname if present
| * | the FN is optional, carrying the displayname if presentArthur Schiwon2018-03-201-5/+11
|/ / | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2018-03-2022-42/+160
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-192-40/+120
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-186-6/+8
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-1742-4/+60
| |
* | Merge pull request #8849 from nextcloud/backport/8835/stable13Roeland Jago Douma2018-03-161-1/+2
|\ \ | | | | | | [stable13] group existence check works without attribute (like with users)
| * | existence check works without attribute (like with users)Arthur Schiwon2018-03-161-1/+2
|/ / | | | | | | | | | | cn is not necessarily given everywhere Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2018-03-168-12/+36
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-15156-224/+252
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-14152-758/+848
| |
* | Merge pull request #8807 from nextcloud/final-13.0.1v13.0.1Morris Jobke2018-03-131-2/+2
|\ \ | | | | | | [stable13] 13.0.1
| * | 13.0.1Morris Jobke2018-03-131-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / [tx-robot] updated from transifexNextcloud bot2018-03-1376-2/+130
|/
* [tx-robot] updated from transifexNextcloud bot2018-03-12288-444/+514
|
* [tx-robot] updated from transifexNextcloud bot2018-03-1118-0/+50
|
* [tx-robot] updated from transifexNextcloud bot2018-03-1028-64/+154
|
* Merge pull request #8748 from nextcloud/13.0.1-RC1v13.0.1RC1Morris Jobke2018-03-091-2/+2
|\ | | | | 13.0.1 RC1
| * 13.0.1 RC1Morris Jobke2018-03-091-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8745 from nextcloud/stable13-8716Morris Jobke2018-03-0910-35/+59
|\ | | | | [13] Remove base url from global cache prefix
| * Mock method of actual cacheMorris Jobke2018-03-091-5/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Always return the depscacheRoeland Jago Douma2018-03-091-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Use cache prefix for theming as wellJulius Härtl2018-03-091-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Fix tests to use ICacheFactoryJulius Härtl2018-03-096-17/+41
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Actually clear cache values for all base urlsJulius Härtl2018-03-093-10/+20
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Use JSCombiner from server container when searching for JS filesJulius Härtl2018-03-091-7/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Move base url from global cache prefix to frontend related onesJulius Härtl2018-03-092-4/+4
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #8758 from ↵Morris Jobke2018-03-099-299/+638
|\ \ | | | | | | | | | | | | nextcloud/stable13-8594-add-acceptance-tests-for-permissions-on-public-shared-folders [stable13] Add acceptance tests for permissions on public shared folders
| * | Add acceptance tests for creation of subfolders in public shared foldersDaniel Calviño Sánchez2018-03-093-0/+121
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract common "wait for" functions to a helper classDaniel Calviño Sánchez2018-03-093-46/+86
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Generalize file list steps so a specific ancestor can be usedDaniel Calviño Sánchez2018-03-094-3/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "FileListContext" provides steps to interact with and check the behaviour of a file list. However, the "FileListContext" does not know the right file list ancestor that has to be used by the file list steps, so until now the file list steps were explicitly wired to the Files app and they could be used only in that case. Instead of duplicating the steps with a slightly different name (for example, "I create a new folder named :folderName in the public shared folder" instead of "I create a new folder named :folderName") the steps were generalized; now contexts that "know" that certain file list ancestor has to be used by the FileListContext steps performed by certain actor from that point on (until changed again) set it explicitly. For example, when the current page is the Files app then the ancestor of the file list is the main view of the current section of the Files app, but when the current page is a shared link then the ancestor is set to null (because there will be just one file list, and thus its ancestor is not relevant to differentiate between instances) A helper trait, "FileListAncestorSetter", was introduced to reduce the boilerplate needed to set the file list ancestor from other contexts. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Generalize file list locators so a specific ancestor can be usedDaniel Calviño Sánchez2018-03-092-54/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file list is used in other places besides the Files app (for example, the File sharing app); in those cases the locators for the file list elements are the same, but not for the ancestor of the file list. To make possible to reuse the file list locators in those cases too now they receive the ancestor to use. Note that the locators for the file actions menu were not using an ancestor locator because it is expected that there is only one file actions menu at a time in the whole page; that may change in the future, but for the time being it is a valid assumption and thus the ancestor was not added to those locators in this commit. Although the locators were generalized the steps themselves still use the "FilesAppContext::currentSectionMainView" locator as ancestor; the steps will be generalized in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>