1b12e7ad7b
Merge pull request #5657 from nextcloud/select-error-text
...
[Small] warning is now selecteable
2017-07-11 21:45:57 +02:00
9e2d1caba2
Merge pull request #5681 from nextcloud/upstream-fix-circles
...
upstream fix circles
2017-07-11 18:03:06 +02:00
4153e1de79
Merge pull request #5672 from nextcloud/upload-hidden-filelist
...
properly block file upload to non-active filelist
2017-07-11 15:15:49 +02:00
e1d6ca3c53
fix test
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 14:03:11 +02:00
6e7be6acfd
upstream
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 13:21:24 +02:00
23ff76975f
Merge pull request #5662 from nextcloud/comradekingu-patch-1
...
Spelling: No shouting at user, and Facebook
2017-07-11 00:13:33 +02:00
7df7d0ff3b
Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select-dropdowns
...
Fix unselecting items on multi select dropdowns
2017-07-10 23:39:43 +02:00
464e635c28
Merge pull request #5666 from nextcloud/comradekingu-patch-2
...
Spelling: No "we" for recommendations.
2017-07-10 17:34:36 +02:00
22693aec47
Merge pull request #5669 from nextcloud/fix-remote-share-activity-emails
...
Fix remote share activity emails
2017-07-10 16:16:54 +02:00
a15591347a
Merge pull request #5671 from GitHubUser4234/ldap_password_renew_nc12fix
...
Rectify variable in RenewpasswordController
2017-07-10 15:04:21 +02:00
12c9b1efb0
properly block file upload to non-active filelist
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-10 14:32:10 +02:00
0ebec6f9a4
Rectify variable $uid->$user
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:46:39 +08:00
33cb45d4a3
Fix owner cloud id in unshare activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:20:56 +02:00
b69ddfba8b
Fix activity emails for accept/decline of remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:10:36 +02:00
04edde5bbd
Spelling: No "we" for recommendations.
2017-07-10 11:04:28 +02:00
c7b28064e3
Merge pull request #5649 from nextcloud/fix-5611
...
fix alignment of radio button and its label in encryption settings
2017-07-10 09:26:05 +02:00
46e813e749
Enable the toggleSelect extension in multi-select dropdowns
...
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-10 03:38:22 +02:00
1b4e70efe3
Add select2-toggleselect to the JavaScript files to load
...
"select2-toggleselect.js" provides an extension to Select2 that makes
possible to unselect items in a multi-select dropdown by clicking on
them. It seems that its load slipped through when moving things around
in commit 6a470e59356b8c52115fe2790666027f38977604; this commit adds it
to the JavaScript files to be loaded in the same position that it should
have had in that commit (based on how the other declarations were
moved).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-10 03:38:22 +02:00
b43a74bdcd
Add acceptance tests for unselecting items in dropdown for tags
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-10 03:38:22 +02:00
4f7fafb5c5
[tx-robot] updated from transifex
2017-07-10 00:08:41 +00:00
6adda3ffe8
Spelling: No shouting at user, and Facebook
2017-07-09 16:30:56 +02:00
cf8db31bce
[tx-robot] updated from transifex
2017-07-09 00:08:31 +00:00
6d5f7fd456
warning is now selecteable
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-08 21:29:10 +02:00
71b90cdeff
Extract app navigation elements to its own context
...
The app navigation is not exclusive to the Files app but a generic
component used by other apps too, so its locators and steps should be in
its own context.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-08 15:36:01 +02:00
8deab238cc
Fix typo
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-08 15:33:03 +02:00
f59062ce83
[tx-robot] updated from transifex
2017-07-08 00:08:27 +00:00
a1c14a747c
Merge pull request #5645 from nextcloud/try-to-prevent-spam-collecting-of-emails
...
Don't show mail domain and from in config report
2017-07-07 18:38:50 +02:00
c46006934c
fix alignment of radio button and its label in encryption settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-07 16:59:28 +02:00
e76b867c2c
Merge pull request #5628 from nextcloud/only-create-the-migration-dir-when-necessary
...
Only create the migration directory when necessary
2017-07-07 14:10:32 +02:00
79d7c26b8a
Register autoloading before running migrations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 12:01:11 +02:00
c2ba5e2884
Merge pull request #5529 from michaelletzgus/optimize_js_order
...
Optimize performance / Load CSS and JS in parallel on firefox
2017-07-07 11:16:31 +02:00
b4deba2078
Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
...
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
b1520a6458
Merge pull request #5643 from nextcloud/codeowners
...
Move mention-bot notifications to code owners
2017-07-07 10:47:33 +02:00
172b4bb6d2
Merge pull request #5615 from nextcloud/issue-5286-fix-navigation-entries-for-group-restricted-apps
...
Don't load navigation entries of restricted apps
2017-07-07 10:46:45 +02:00
e6e79c34b1
Don't show mail domain and from in config report
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 09:53:55 +02:00
9c3b2a3991
Move mention-bot notifications to code owners
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 08:44:01 +02:00
d23bc9a99a
[tx-robot] updated from transifex
2017-07-07 00:08:24 +00:00
b4a221f9be
Merge pull request #5424 from nextcloud/moveFromCache-from-shared
...
fix moving folders out of a cache jail
2017-07-06 18:31:18 +02:00
ad1d4d363f
Merge pull request #5174 from nextcloud/new-encryption-default
...
Use the master key by default
2017-07-06 15:58:48 +02:00
001a9c02dd
adjust encryption tests to the new master key default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
c46b158e10
update sharing test to new master key default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
b43f6d295e
update file system tests to take the master key into account
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
f186a5cfb1
fix and extend dav test to also test the master-key setup
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
1a55ace97c
no warning on password change if no encryption module uses per-user keys
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
d668e17769
since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
66debbe18e
add occ command to disable the master key again
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
5f75468aa4
improve status messages
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
28a7e72868
after the master key was loaded we are ready to go, no re-login needed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:10 +02:00
da51ec38f4
only collect detailed access list if it is really needed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:08 +02:00
9c5ba2f12c
make master key the new default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:03 +02:00
Lukas Reschke
Morris Jobke
Robin Appelman
Maxence Lange
Roger Szabo
Joas Schilling
Allan Nordhøy
Daniel Calviño Sánchez
Nextcloud bot
Arthur Schiwon
Bjoern Schiessle