Commit Graph

39269 Commits

Author SHA1 Message Date
Morris Jobke 482805d16f Merge pull request #4982 from nextcloud/stable12-oauth-not-disable
[stable12] Mark OAuth app as always enabled
2017-05-20 19:12:24 -05:00
Nextcloud bot fa47ed7979
[tx-robot] updated from transifex 2017-05-21 00:08:35 +00:00
Lukas Reschke 551a189ae8 Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-20 17:15:19 -05:00
Morris Jobke 394023949e Merge pull request #4998 from nextcloud/fix-for-sharing-stable-12
fix for sharing stable12
2017-05-20 17:03:52 -05:00
Lukas Reschke e23569ed68 Merge pull request #4996 from nextcloud/stable12-version
12.0.0RC3
2017-05-20 20:31:24 +02:00
Daniel Hansson 8817c65120 fix for sharing stable12
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 17:15:14 +02:00
Lukas Reschke e6683f4007
12.0.0RC3
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-20 14:21:47 +02:00
Nextcloud bot df61c9e283
[tx-robot] updated from transifex 2017-05-20 00:08:37 +00:00
Lukas Reschke 4bf9df9cf1 [stable12] 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:28:10 -05:00
Morris Jobke 697e14bf74 Merge pull request #4977 from nextcloud/rename-secure-drop-stable12
rename secure drop back to files drop
2017-05-19 17:06:07 -05:00
Morris Jobke d37ac1862f Merge pull request #4980 from nextcloud/fix-missing-argument-2-getAppContainer
Fix missing argument 2 for Settings classes
2017-05-19 17:05:18 -05:00
Joas Schilling fa95fb6862
Fix missing argument 2 for Settings classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 22:30:55 +02:00
Bjoern Schiessle c4dd1d970f
rename secure drop back to files drop because of name collision with securedrop.org
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-19 21:58:01 +02:00
Lukas Reschke ebd15f50d9 Merge pull request #4976 from nextcloud/stable12-4910
[stable12] Fix logo being too big on log in page
2017-05-19 21:56:11 +02:00
Lukas Reschke 6e2139f60e Merge pull request #4975 from nextcloud/stable12-4974
Fixes visible sidebar even if hidden is applied
2017-05-19 21:47:56 +02:00
Lukas Reschke e0277fa9b7 Merge pull request #4973 from nextcloud/stable12-4972
Fix group restriction regression
2017-05-19 21:46:14 +02:00
Lukas Reschke 9e667d81bb
12.0.0RC2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 21:19:07 +02:00
Julius Härtl c190dfbe53
Scale logo only for custom ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-19 21:01:41 +02:00
Jan-Christoph Borchardt 053dffb169
Fix logo being too big on log in page, fix #4585
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-19 21:01:34 +02:00
Morris Jobke 5a6af19076 Fixes visible sidebar even if hidden is applied
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 13:05:57 -05:00
Morris Jobke 5fbfebac35 Fix group restriction regression
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 12:09:49 -05:00
Lukas Reschke cc2d06606d Merge pull request #4957 from nextcloud/backport-4956-resource-loading-for-ever
[stable12] Stop infinit loop on invalid settings css/js file
2017-05-19 16:59:55 +02:00
Lukas Reschke 32558991a6 Merge pull request #4962 from nextcloud/backport-4905
Allow automatic DI for apps that don't register the container in app.php
2017-05-19 16:18:31 +02:00
Joas Schilling aa83127686
Allow automatic DI for apps that don't register the container in app.php
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 13:49:36 +02:00
Lukas Reschke 90837b9175 Merge pull request #4949 from nextcloud/workaround-4948
Lowercase the scriptname again
2017-05-19 12:37:53 +02:00
Joas Schilling 8a570aebf6
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:40:10 +02:00
Nextcloud bot e14bd212f7
[tx-robot] updated from transifex 2017-05-19 00:08:36 +00:00
Lukas Reschke 54b2286420
Lowercase the scriptname again
Ref https://github.com/nextcloud/server/issues/4948

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 01:57:26 +02:00
Lukas Reschke 94b9335936
12.0.0RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 00:59:46 +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