Commit Graph

42636 Commits

Author SHA1 Message Date
Julius Härtl 7f209be51d
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:36 +02:00
Julius Härtl 541bb71513
Clear any theming prefixed cache on cache buster increase
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:35 +02:00
Julius Härtl 334d733d48
Fix search text overlapping clode button
fixes #8701

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:30:16 +02:00
Robin Appelman 6e13e31188
update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:17:56 +02:00
Robin Appelman a691b52daf
Revert "update icewind/smb to 2.0.5"
accidental push to wrong branch

This reverts commit 3b35cd0749.
2018-03-28 16:17:30 +02:00
Robin Appelman 3b35cd0749
update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:15:27 +02:00
John Molakvoæ (skjnldsv) 05f76b3469
Use app version to generate scss filename
Fixed scsscacher tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-28 16:11:10 +02:00
Nextcloud bot f2e69bd868
[tx-robot] updated from transifex 2018-03-28 00:21:41 +00:00
Nextcloud bot c2ec519bc4
[tx-robot] updated from transifex 2018-03-27 00:12:04 +00:00
Nextcloud bot f8b1acfcfd
[tx-robot] updated from transifex 2018-03-26 00:13:40 +00:00
Nextcloud bot cda89f16d8
[tx-robot] updated from transifex 2018-03-25 01:10:27 +00:00
Nextcloud bot 3604fe1ec5
[tx-robot] updated from transifex 2018-03-24 01:12:43 +00:00
Nextcloud bot 6ef65b3016
[tx-robot] updated from transifex 2018-03-23 01:11:55 +00:00
Nextcloud bot b3ffcda8ff
[tx-robot] updated from transifex 2018-03-22 01:12:05 +00:00
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
Joas Schilling 5e15c76d21
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-16 10:50: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
John Molakvoæ (skjnldsv) ae369e870d
Fixed caldav tests and metadata 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-12 12:02:14 +01:00
Joas Schilling 2609b30df0
Fix group displaynames in activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-12 12:01:37 +01:00
Joas Schilling 63089821a4
Correctly return the group name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-12 12:01:19 +01:00
Joas Schilling 97dbaa26c4
Show the displayname in the users group list
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-12 12:00:54 +01: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