Arthur Schiwon
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614
2016-06-14 01:06:25 +02:00
Christoph Wurst
5daa9a5417
fail hard if 2fa provider can not be loaded ( #25061 )
2016-06-13 12:46:45 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
Lukas Reschke
842cc2a788
Merge pull request #19 from nextcloud/files-drop
...
add "hide file list" option
2016-06-10 18:29:09 +02:00
Vincent Petry
52a0c939ab
Merge pull request #24863 from owncloud/propagator-batching
...
Propagator batching for the file scanner
2016-06-10 17:45:52 +02:00
Joas Schilling
60225284f3
Add not-null columns for oracle
2016-06-10 12:44:49 +02:00
Roeland Jago Douma
1b66db72d9
Repair job to fix permissions for avatars
...
Fixes #22978
On some older installations the permissions for the userRoot and the
avatars are not correct. This breaks since we now use the Node API in
the avatar code.
This repair job makes sure that the permissions are set correctly.
* Unit tests added
2016-06-10 12:44:49 +02:00
Vincent Petry
d81dac24aa
Merge pull request #25025 from owncloud/clear_old_calendar_shares
...
Add repair step to clean old calendar shares
2016-06-10 10:42:04 +02:00
Arthur Schiwon
a636e4ff28
Downstream 2016-06-09
...
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
blizzz
51fd2602a7
Revert "Downstream 2016-06-08"
2016-06-09 17:41:57 +02:00
Thomas Müller
232d735893
Do not leak the login name - fixes #25047
2016-06-09 16:44:31 +02:00
Roeland Jago Douma
7d51fd0310
Add repair step to clean old calendar/contact shares
...
fixes #21889
2016-06-09 15:48:45 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
Joas Schilling
7f88645eab
Allow to cancel 2FA after login
2016-06-09 14:00:02 +02:00
Robin Appelman
bee918693a
dissalow symlinks in local storages that point outside the datadir
2016-06-09 14:00:01 +02:00
Joas Schilling
4f27c2c433
Allow to decrypt user '0' files only
2016-06-09 14:00:00 +02:00
Christoph Wurst
60e15e934c
do not generate device token if 2FA is enable for user
2016-06-09 14:00:00 +02:00
Joas Schilling
0041d89dc2
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-09 13:59:58 +02:00
Robin Appelman
67c2c85b05
allow deleting "ghost files" trough the View and Node api
2016-06-09 13:59:58 +02:00
Vincent Petry
826e276a79
Merge pull request #24973 from owncloud/token-password-session-token
...
When creating a session token, make sure it's the login password and …
2016-06-09 11:58:04 +02:00
Vincent Petry
aca4ea12c1
Merge pull request #24826 from owncloud/cors-client-login
...
use client login method on CORS routes
2016-06-09 10:31:14 +02:00
Joas Schilling
e49307014c
Do not log token or challenge with exception stacktrace ( #25026 )
...
* Make the filtering better readable
* Add some more methods to the sensitive list
2016-06-08 16:32:58 +02:00
Christoph Wurst
9997c431c3
use client login method on CORS routes
2016-06-08 15:18:53 +02:00
Christoph Wurst
ec929f07f2
When creating a session token, make sure it's the login password and not a device token
2016-06-08 13:31:55 +02:00
Vincent Petry
7dcc47dc94
Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa
...
Allow to cancel 2FA after login
2016-06-08 10:27:21 +02:00
Vincent Petry
8d0948977e
Merge pull request #24899 from owncloud/local-storage-symlinks
...
dissalow symlinks in local storages that point outside the datadir
2016-06-08 10:19:24 +02:00
Vincent Petry
ed92f4c427
Merge pull request #24983 from owncloud/issue-23776-do-not-allow-boolean-user-config
...
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-08 10:14:08 +02:00
Vincent Petry
12683b786d
Merge pull request #24991 from owncloud/2fa-do-not-generate-token
...
do not generate device token if 2FA is enable for user
2016-06-08 10:13:04 +02:00
Vincent Petry
b7935dcebd
Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only
...
Allow to decrypt user '0' files only
2016-06-08 10:12:28 +02:00
Joas Schilling
3e3b326c85
Allow to cancel 2FA after login
2016-06-07 18:17:29 +02:00
Morris Jobke
38451c85f1
skip failing tests
2016-06-07 17:54:40 +02:00
Robin Appelman
7b1b723e5b
dissalow symlinks in local storages that point outside the datadir
2016-06-07 14:01:53 +02:00
Joas Schilling
d4ba982131
Allow to decrypt user '0' files only
2016-06-07 09:13:11 +02:00
Christoph Wurst
8f7a4aaa4d
do not generate device token if 2FA is enable for user
2016-06-07 09:09:51 +02:00
Joas Schilling
911fd3ead4
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-06 12:38:20 +02:00
Robin Appelman
63408fa6ef
allow deleting "ghost files" trough the View and Node api
2016-06-03 13:30:59 +02:00
Vincent Petry
1ab7ee5e23
Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicode
...
Add keepUnicode value in the cache key of normalizedPathCache
2016-06-02 15:18:13 +02:00
Robin Appelman
11900baaf3
add tests for propagator batching
2016-06-02 15:09:15 +02:00
Christoph Wurst
5e71d23ded
remember redirect_url when solving the 2FA challenge
2016-06-01 14:43:47 +02:00
Vincent Petry
5b1eb416d8
Fix TestCase::invokePrivate to work with static classes
2016-06-01 14:28:59 +02:00
Vincent Petry
5ad8fa7675
Add keepUnicode value in the cache key of normalizedPathCache
2016-06-01 14:28:59 +02:00
Christoph Wurst
c58d8159d7
Create session tokens for apache auth users
2016-05-31 17:07:49 +02:00
Vincent Petry
a441220f24
Merge pull request #24628 from owncloud/decryptall-checkifneedsprocessing
...
[decrypt_all] Check if file needs to decrypted or not for speed up large oc setups.
2016-05-31 10:12:03 +02:00
Torben Dannhauer
718f0757e4
Fix for #23066 ( #24689 )
2016-05-31 06:53:28 +02:00
Björn Schießle
b15babd061
fix unit tests
2016-05-30 14:49:27 +02:00
Joas Schilling
4b1e8a1184
One more PSR-4 fix ( #24852 )
2016-05-26 16:31:26 +02:00
Vincent Petry
379f8a1e45
Merge pull request #24604 from owncloud/user_ldap-psr4
...
Move user_ldap to PSR-4
2016-05-25 17:11:10 +02:00
Joas Schilling
2c0743c46b
Fix the tests again
2016-05-25 16:51:02 +02:00
Vincent Petry
2bddf71f22
Merge pull request #24842 from owncloud/files-storage-wrapper-encoding-psr4
...
Move Test\Files\Storage\Wrapper\EncodingTest to PSR-4
2016-05-25 16:32:43 +02:00
Vincent Petry
299954c03d
Merge pull request #24840 from owncloud/fix-missing-ext-str-import
...
Fix missing use statements in ext. str. tests
2016-05-25 16:31:32 +02:00