Daniel Kesselberg
bfa49410a2
Drop support for xcache
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-08-12 17:14:08 +02:00
Roeland Jago Douma
7aad5b7721
Merge pull request #10543 from nextcloud/ignore-deactivated-users
...
Do not show deactivated users in sharees and contacts
2018-08-10 15:01:14 +02:00
Christoph Wurst
5c70aa2a22
Remove unused import
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-10 09:30:17 +02:00
Christoph Wurst
1124b87bc0
Fix 2FA being enforced if only backup codes provider is active
...
Fixes https://github.com/nextcloud/server/issues/10634 .
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-10 09:26:40 +02:00
Roeland Jago Douma
8c1e75e052
Do not use file as template parameter
...
Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-09 16:45:25 +02:00
Christoph Wurst
8db66d5dfb
Fix double-inserts of the same provider state
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-09 13:56:04 +02:00
Christoph Wurst
85bc5edb5e
Add integration/unit test for the double-insert of same values
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-09 13:43:00 +02:00
Roeland Jago Douma
0757c52980
Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect
...
Fix login redirection if only one 2FA provider is active
2018-08-09 12:27:29 +02:00
Björn Schießle
6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares
...
Add support for room shares
2018-08-09 10:44:11 +02:00
Christoph Wurst
d8197f2b97
Rename providerset method to get primary providers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 20:28:21 +02:00
Björn Schießle
11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix
...
make file cache updates more robust
2018-08-08 18:27:18 +02:00
Christoph Wurst
c6e47e8a51
Fix login redirection if only one 2FA provider is active
...
Fixes https://github.com/nextcloud/server/issues/10500 .
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 15:25:59 +02:00
Daniel Calviño Sánchez
4b7fa4ac2e
Add support for tokens in room shares
...
Tokens will be used to give access to a share to guests in public rooms.
Although the token itself is created in the provider of room shares and
no changes are needed for that, due to the code structure it is
necessary to explicitly call the provider from the manager when getting
a room share by token.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:44 +02:00
Roeland Jago Douma
6b1ba9cdaf
Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now
...
Disable Oracle enforcement for now until the following issues are sol…
2018-08-08 14:10:18 +02:00
Roeland Jago Douma
fe286e21ca
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-08 12:58:50 +02:00
Christoph Wurst
d248a0bd1e
Fix 2FA provider registry population on login
...
If the 2FA provider registry has not been populated yet, we have to make
sure all available providers are loaded and queried on login. Otherwise
previously active 2FA providers aren't detected as enabled.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 06:57:52 +02:00
Thomas Citharel
03f1fef160
Ignore deactivated users in collaborators user search plugin
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-06 09:55:24 +02:00
Julius Härtl
1b4d502bfd
Adjust acceptance test to check if the correct sidebar view is shown
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-03 14:06:04 +02:00
Roeland Jago Douma
01298cfa72
Merge pull request #10480 from nextcloud/bugfix/10420/settings
...
Settings design polishing
2018-08-02 20:23:21 +02:00
Julius Härtl
0dd519cff1
Fix encryption admin section tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-02 10:26:09 +02:00
Roeland Jago Douma
fae7e516b5
Merge pull request #10481 from nextcloud/feature/noid/make-info-available-if-the-avatar-was-uploaded
...
Make the info available if the avatar was uploaded or generated
2018-08-01 22:54:38 +02:00
Joas Schilling
38fffffe18
Fix unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-01 14:46:44 +02:00
Julius Härtl
6ce474518c
Append cache bump parameter to scss files URL
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-01 12:42:49 +02:00
Julius Härtl
03971d3695
Move encryption settings to security
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-01 09:41:09 +02:00
Daniel Calviño Sánchez
029b33a664
Add acceptance test for creating a user with a custom display name
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-07-31 13:40:47 +02:00
Bjoern Schiessle
a9e22c5f1c
make file cache updates more robust
...
only update the encrypted version after the write operation is finished and the stream is closed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-31 12:24:38 +02:00
blizzz
c39bc1638b
Merge pull request #10444 from nextcloud/feature/noid/allow-to-filter-unread-count-by-verb
...
Allow to filter the unread count by verb
2018-07-31 12:05:52 +02:00
Christoph Wurst
fc149bab3c
Fix duplicate inserts in the 2fa provider registry DAO
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-07-31 06:43:44 +02:00
Roeland Jago Douma
f208ce920d
Merge pull request #10221 from nextcloud/bugfix/noid/prevent-too-long-identifiers
...
Prevent too long identifier names
2018-07-30 21:00:53 +02:00
Julius Härtl
412002906f
Keep timestamp replacements at the beginning
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-30 15:24:46 +02:00
Joas Schilling
66945f9574
Allow to filter the unread count by verb
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-30 09:41:51 +02:00
Julius Härtl
5ef077840f
Improve test duration
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Reincrement network idle to 3 s
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-30 00:40:07 +02:00
Julius Härtl
d40f26b4c5
Add custom network idle waiting and some JS injection to make tests more stable
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-29 22:52:53 +02:00
Julius Härtl
f7d2cdbd97
Fix new settings and login tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-29 22:52:35 +02:00
Julius Härtl
33f26c8da2
Frontend regression testing with puppeteer
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-29 22:51:58 +02:00
Joas Schilling
008c8dde1a
Ignore custom prefixes which are longer
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-27 14:45:22 +02:00
Joas Schilling
960961148e
Fix calculation of default name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-27 14:45:21 +02:00
Joas Schilling
14682dfa7c
Add unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-27 14:45:21 +02:00
Julius Härtl
f77cc11a28
Fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-26 22:26:05 +02:00
Morris Jobke
61397ee091
Merge pull request #9222 from nextcloud/feature/noid/search-for-files-by-comments
...
Allow to search files by comments
2018-07-25 20:30:00 +02:00
Joas Schilling
ac2314e3d0
Add pagination support
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 18:53:45 +02:00
Joas Schilling
8c7969e730
Allow to search by comments
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 18:53:44 +02:00
Morris Jobke
8255faada4
Merge pull request #10377 from nextcloud/sccs-cache-iscached
...
cache isCached state for scss resources
2018-07-25 17:33:01 +02:00
Morris Jobke
801e5a4523
Fix unit tests to pass the folder now via the appData dependency
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-25 16:57:36 +02:00
Julius Härtl
4c773891d7
Fix app navigation controller to return an array
...
This is required to not break compatibility with existing consumers of that endpoint like the apps management or the client
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-25 13:50:46 +02:00
Roeland Jago Douma
71028fde6b
Merge pull request #10322 from weeman1337/feature-9978-improve-disabled-user-login-message
...
Login: Implements the "user disabled" message like the "wrong password" message
2018-07-24 20:00:20 +02:00
Michael Weimann
801bf81317
Adds disabled user acceptance tests
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-07-24 17:31:03 +02:00
Robin Appelman
6686ca9b2a
cache isCached state for scss resources
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-24 17:30:39 +02:00
Morris Jobke
9b9d729acf
Merge pull request #10238 from nextcloud/add-support-for-sending-the-password-for-a-share-by-nextcloud-talk
...
Add support for sending the password for a share by Nextcloud Talk
2018-07-24 17:06:56 +02:00
Daniel Calviño Sánchez
d582a66bea
Honour "sendPasswordByTalk" property in mail shares
...
When a password was set for a mail share an e-mail was sent to the
recipient with the password. Now the e-mail is no longer sent if the
password is meant to be sent by Talk.
However, before the e-mail was not sent when the share was updated but
the password was not changed. Now an e-mail is sent in that case too if
switching from a password sent by Talk to a password sent by mail.
On the other hand, when switching from a password sent by mail to a
password sent by Talk it is mandatory to change the password; otherwise
the recipient would already have access to the share without having to
call the sharer to verify her identity.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-07-24 13:56:29 +02:00