Commit graph

39366 commits

Author SHA1 Message Date
Lukas Reschke
3487f62d55 Mark OAuth app as always enabled
At the moment we don't support disabling the OAuth app

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 17:24:41 -05:00
Morris Jobke
fe8c67ad23 Merge pull request #4981 from nextcloud/fix-missing-argument-2-getAppContainer-master
Fix missing argument 2 for Settings classes
2017-05-19 17:05:49 -05:00
Joas Schilling
a411adee6c
Fix missing argument 2 for Settings classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 22:32:50 +02:00
Björn Schießle
d7eb58f09d Merge pull request #4943 from nextcloud/rename-secure-drop
rename secure drop back to files drop
2017-05-19 21:56:36 +02:00
Lukas Reschke
5cecaae91f Merge pull request #4974 from nextcloud/fix-hidden-sidebar
Fixes visible sidebar even if hidden is applied
2017-05-19 21:48:32 +02:00
Lukas Reschke
2e10812898 Merge pull request #4972 from nextcloud/fix-group-restriction
Fix group restriction regression
2017-05-19 21:46:10 +02:00
Lukas Reschke
86a790a544
12.0.0RC2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 21:18:51 +02:00
Lukas Reschke
c1c676f602 Merge pull request #4910 from nextcloud/make-the-logo-smaller-cream
Fix logo being too big on log in page, fix #4585
2017-05-19 20:50:09 +02:00
Morris Jobke
3636672fa5 Fixes visible sidebar even if hidden is applied
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 13:03:54 -05:00
Morris Jobke
c7ade85982 Fix group restriction regression
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 12:05:09 -05:00
Roeland Jago Douma
7eb8b3cec1 Merge pull request #4956 from nextcloud/endless-loop-on-invalid-asset
Stop infinit loop on invalid settings css/js file
2017-05-19 16:51:49 +02:00
Lukas Reschke
494cd2de5f Merge pull request #4970 from franga2000/patch-1
Fixed typo
2017-05-19 16:19:52 +02:00
Julius Härtl
52f10c436e
Scale logo only for custom ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-19 16:18:09 +02:00
Miha Frangez
0d6493a0c7 Fixed typo 2017-05-19 15:58:13 +02:00
Joas Schilling
edb4956290
Fix username and avatar for external users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 15:45:14 +02:00
Joas Schilling
bcddca9a64 Merge pull request #4905 from nextcloud/auto-di-for-apps-without-app.php
Allow automatic DI for apps that don't register the container in app.php
2017-05-19 13:48:01 +02:00
Lukas Reschke
dd29e5ab9d Merge pull request #4950 from nextcloud/master-workaround-4948
Lowercase the scriptname again
2017-05-19 12:37:32 +02:00
Joas Schilling
4792867357
Stop infinit loop on invalid settings css/js file
Don't try to find dirname of false...

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 11:41:08 +02:00
Morris Jobke
770f37a01c Merge pull request #4951 from nextcloud/transifex-oauth2
Add oauth2 to transifex
2017-05-18 19:11:28 -05:00
Morris Jobke
f53c6b146c Add oauth2 to transifex
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-18 19:10:55 -05:00
Nextcloud bot
e24105feba
[tx-robot] updated from transifex 2017-05-19 00:08:26 +00:00
Lukas Reschke
eab9468109
Lowercase the scriptname again
Ref https://github.com/nextcloud/server/issues/4948

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 01:59:00 +02:00
Lukas Reschke
44c9080f51
12.0.0RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 00:59:34 +02:00
Lukas Reschke
7976927628 Merge pull request #4894 from nextcloud/generic-security-activities
Change 2FA activities to more generic security activities
2017-05-19 00:50:44 +02:00
Lukas Reschke
8c624bdef9 Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scanner
Make sure we use the passed-in storage when there is one
2017-05-19 00:49:58 +02:00
Lukas Reschke
0eb4970ec8 Merge pull request #4704 from nextcloud/add-oauth-code-flow-support
Add oauth code flow support
2017-05-18 23:30:44 +02:00
Lukas Reschke
c605472950 Merge pull request #4888 from nextcloud/theming-fallback-icons
Fallback to default favicon
2017-05-18 23:30:02 +02:00
Lukas Reschke
10930c9ff2 Merge pull request #4813 from nextcloud/accounts-table-migration-from-owncloud
Add a migration step to save the data from the accounts table before …
2017-05-18 22:31:36 +02:00
Roeland Jago Douma
19a1e01d6c
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-18 22:11:29 +02:00
Roeland Jago Douma
e43649e67e
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-18 22:10:57 +02:00
Christoph Wurst
258c8720dd
Fix backup codes activity type
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst
58683f11ac
Publish 2fa backup codes activities to the right stream
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst
1632bb4557
Move activities test code
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst
0928b5f621
Change 2FA activities to more generic security activities
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Lukas Reschke
f4189699e7
Function accepts only integers
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:59:22 +02:00
Lukas Reschke
b8de3f40ee
Bearer comes first on the new endpoint
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:57:07 +02:00
Lukas Reschke
639ba526d0
Adjust realm from SabreDAV to Nextcloud
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:38:55 +02:00
Lukas Reschke
f93db724d7
Make legacy DAV backend use the BearerAuth backend as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:19:39 +02:00
Lukas Reschke
ba7b6bd973
Delete token after usage in test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:05 +02:00
Lukas Reschke
fa6ec47a5c
Add indexes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:04 +02:00
Lukas Reschke
7927aed991
Adjust token name
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:11 +02:00
Lukas Reschke
538112181f
Add additional test for accessing DAV using Bearer Auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:11 +02:00
Lukas Reschke
f2a01e1b08
Use a standardized Bearer now
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke
df3909a7c3
Use Bearer backend for SabreDAV
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke
30552090bc
Don't ignore OAuth2 app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke
691646bdae
Add tests for OAuth2 app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke
59e968977c
Add test for DefaultTokenMapper
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Lukas Reschke
d90eba3f85
Fix style issues pointed out in review
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Lukas Reschke
77827ebf11
Rename table back to lowercase
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Lukas Reschke
26ee889fec
Add tests for ClientFlowLoginController
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00