Commit Graph

42317 Commits

Author SHA1 Message Date
Nextcloud bot 684f6b6429
[tx-robot] updated from transifex 2018-03-21 01:12:19 +00:00
Roeland Jago Douma 52a97e826b
Merge pull request #8905 from nextcloud/stable13-8843-set-share-with-field-to-the-id-of-the-circle
[stable13] Set "share with" field to the ID of the circle
2018-03-20 23:17:25 +01:00
Roeland Jago Douma d9f512e593
Merge pull request #8900 from nextcloud/backport/8822/stable13
[stable13] the FN is optional, carrying the displayname if present
2018-03-20 23:16:59 +01:00
Daniel Calviño Sánchez 3bd92edd9c Use the display name in the avatar for a circle share
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>
2018-03-20 19:42:27 +01:00
Daniel Calviño Sánchez df5cd18394 Set "share_with" field to the ID of the circle
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>
2018-03-20 19:42:27 +01:00
Arthur Schiwon e2e27004ff
the FN is optional, carrying the displayname if present
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-20 14:35:46 +01:00
Nextcloud bot a6f1721c2d
[tx-robot] updated from transifex 2018-03-20 01:11:59 +00:00
Nextcloud bot 17ae973d6f
[tx-robot] updated from transifex 2018-03-19 01:12:01 +00:00
Nextcloud bot 2b57ddc74d
[tx-robot] updated from transifex 2018-03-18 01:12:13 +00:00
Nextcloud bot 23022d5dd7
[tx-robot] updated from transifex 2018-03-17 01:11:55 +00:00
Roeland Jago Douma 9117a982f4
Merge pull request #8849 from nextcloud/backport/8835/stable13
[stable13] group existence check works without attribute (like with users)
2018-03-16 14:25:18 +01:00
Arthur Schiwon 588ee6af06
existence check works without attribute (like with users)
cn is not necessarily given everywhere

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-16 10:26:29 +01:00
Nextcloud bot 161a0f29d9
[tx-robot] updated from transifex 2018-03-16 01:11:55 +00:00
Nextcloud bot 4939ff36a0
[tx-robot] updated from transifex 2018-03-15 01:12:05 +00:00
Nextcloud bot 66eaea9259
[tx-robot] updated from transifex 2018-03-14 01:11:56 +00:00
Morris Jobke c2cea293d5
Merge pull request #8807 from nextcloud/final-13.0.1
[stable13] 13.0.1
2018-03-13 19:46:51 +01:00
Morris Jobke ef2de71988
13.0.1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-13 18:22:12 +01:00
Nextcloud bot f66af48d49
[tx-robot] updated from transifex 2018-03-13 01:12:30 +00:00
Nextcloud bot 93f5745700
[tx-robot] updated from transifex 2018-03-12 01:12:46 +00:00
Nextcloud bot 8e27fed9d3
[tx-robot] updated from transifex 2018-03-11 01:12:36 +00:00
Nextcloud bot 8e8368ae0b
[tx-robot] updated from transifex 2018-03-10 01:12:24 +00:00
Morris Jobke 8d165d63ed
Merge pull request #8748 from nextcloud/13.0.1-RC1
13.0.1 RC1
2018-03-09 21:22:14 +01:00
Morris Jobke d1e600773c
13.0.1 RC1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 16:19:00 +01:00
Morris Jobke b0f0c26fe3
Merge pull request #8745 from nextcloud/stable13-8716
[13] Remove base url from global cache prefix
2018-03-09 16:15:48 +01:00
Morris Jobke 17f75d6797
Mock method of actual cache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 15:36:53 +01:00
Morris Jobke f17cabd63e
Merge pull request #8758 from nextcloud/stable13-8594-add-acceptance-tests-for-permissions-on-public-shared-folders
[stable13] Add acceptance tests for permissions on public shared folders
2018-03-09 15:23:09 +01:00
Roeland Jago Douma 43243380f1
Always return the depscache
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 14:43:54 +01:00
Nextcloud bot f22bae3546
[tx-robot] updated from transifex 2018-03-09 13:31:55 +00:00
Daniel Calviño Sánchez e9f5073677 Add acceptance tests for creation of subfolders in public shared folders
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-09 12:26:58 +01:00
Daniel Calviño Sánchez 4337de7559 Extract common "wait for" functions to a helper class
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-09 12:26:58 +01:00
Daniel Calviño Sánchez 05fd72937b Generalize file list steps so a specific ancestor can be used
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>
2018-03-09 12:26:58 +01:00
Daniel Calviño Sánchez 7ebbd666a8 Generalize file list locators so a specific ancestor can be used
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>
2018-03-09 12:26:58 +01:00
Daniel Calviño Sánchez 0709f4fd67 Store the name of the actor in the Actor object
This is needed to be able to easily use the actor as a key in an array.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-09 12:26:58 +01:00
Daniel Calviño Sánchez da6743277b Extract file list locators and steps to its own class
Besides the extraction some minor adjustments (sorting locators for file
action menu entries to reflect the order of the menu entries in the UI,
moving parametrized locators like "createMenuItemFor" above the locators
that use them and placing "descendantOf" calls always in a new line)
were made too.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-09 12:26:58 +01:00
Roeland Jago Douma 56a4c9d68e
Merge pull request #8755 from nextcloud/backport/8747/apps-are-updated
[stable13] Revert wording back to updates
2018-03-09 12:12:29 +01:00
Morris Jobke 6176296c80
Merge pull request #8749 from nextcloud/backport/8596/sharee-email-matches-not-limited
[stable13] Sharee email matches not limited
2018-03-09 11:29:15 +01:00
Joas Schilling 92793e9d92
Revert wording back to updates
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 11:25:25 +01:00
Morris Jobke 0f1567d8fa
Merge pull request #8752 from nextcloud/13-8112
[stable13] Fix integer overflow in ChunkingPlugin
2018-03-09 11:23:28 +01:00
Julius Härtl e2728aaf38
Merge pull request #8746 from nextcloud/8705_13
[stable13] Check if the cached js file exists
2018-03-09 10:37:15 +01:00
Morris Jobke 4fa0cac17c
Merge pull request #8725 from nextcloud/objectstore-no-part-files-13
[13]  disable part files for object stores
2018-03-09 10:34:33 +01:00
Morris Jobke ba7cc279e6
Fix integer overflow in ChunkingPlugin
Avoids errors when the size exceeds MAX_INT because of the cast to int. Better cast it to float to avoid this.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 10:27:41 +01:00
Joas Schilling a2f3f0a681
Fix calculation if there are more results
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:16:42 +01:00
Joas Schilling a31439e89d
Add tests for finding own email and user results pagination
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:16:12 +01:00
Joas Schilling 932fcc9859
Add the users result only when non empty so tests stay the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:15:25 +01:00
Joas Schilling 5b6590f1e9
Also array_slice wide email matches of local users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:15:04 +01:00
Roeland Jago Douma 85ba5adb33
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 09:44:36 +01:00
Roeland Jago Douma 2d7d8ca125
Check if the cached js file exists
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 09:44:32 +01:00
Julius Härtl 88e9542d12
Use cache prefix for theming as well
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:52 +01:00
Julius Härtl d4d3cecbf8
Fix tests to use ICacheFactory
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:50 +01:00
Julius Härtl b14e4ec6a6
Actually clear cache values for all base urls
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:07 +01:00