Bjoern Schiessle
d4989c8037
remove old hook, no longer needed
2016-06-27 14:05:27 +02:00
Bjoern Schiessle
630e4b1b46
check password for link shares
2016-06-27 14:05:27 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Vincent Petry
3db5de95bd
Merge pull request #25172 from owncloud/token-login-validation
...
Token login validation
2016-06-22 13:58:56 +02:00
VicDeo
854352d9a0
occ web executor ( #24957 )
...
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
2016-06-22 13:12:36 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
Christoph Wurst
b805908dca
update session token password on user password change
2016-06-21 10:24:25 +02:00
Morris Jobke
62e6de5df3
fix unit tests
2016-06-20 13:52:51 +02:00
Christoph Wurst
56199eba37
fix unit test warning/errors
2016-06-20 10:41:23 +02:00
Christoph Wurst
fb36fd495b
fix DefaultTokenMapperTest
2016-06-20 09:25:15 +02:00
Christoph Wurst
5c68084823
fix default token provider tests
2016-06-20 09:17:19 +02:00
Christoph Wurst
8ef5431e7a
fix user session tests
2016-06-20 09:10:11 +02:00
Christoph Wurst
c4149c59c2
use token last_activity instead of session value
2016-06-17 15:42:28 +02:00
Christoph Wurst
82b50d126c
add PasswordLoginForbiddenException
2016-06-17 11:02:07 +02:00
Christoph Wurst
3521f974db
assert app is loaded in unit tests
2016-06-16 11:08:43 +02:00
Christoph Wurst
a40d64ff7f
load 2FA provider apps before querying classes
2016-06-16 10:12:16 +02:00
Vincent Petry
9c328de4ab
Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_user
...
Optimize isSharingDisabledForUser
2016-06-16 09:27:48 +02:00
Vincent Petry
1251df3e17
Merge pull request #25075 from owncloud/fix_23265
...
Remove shares of the root folder
2016-06-16 09:27:06 +02:00
Vincent Petry
05967a6904
Merge pull request #25093 from owncloud/issue-12816-clean-tags-from-deleted-users
...
Clean up tags of deleted users
2016-06-15 12:20:29 +02:00
Roeland Jago Douma
ea4c5e6e0a
Fix unit tests
2016-06-14 13:24:48 +02:00
Joas Schilling
123bf78ca8
Clean up tags of deleted users
2016-06-14 12:38:09 +02:00
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
465807490d
create session token only for clients that support cookies
2016-06-13 19:44:05 +02:00
Roeland Jago Douma
64471b5d4a
Remove shares of the root folder
...
Fixes #23265
(A possibly costly) repair job to remove cyclic shares.
2016-06-13 15:07:41 +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