summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4957 from nextcloud/backport-4956-resource-loading-for-everLukas Reschke2017-05-193-0/+26
|\ | | | | [stable12] Stop infinit loop on invalid settings css/js file
| * Stop infinit loop on invalid settings css/js fileJoas Schilling2017-05-193-0/+26
| | | | | | | | | | | | Don't try to find dirname of false... Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4962 from nextcloud/backport-4905Lukas Reschke2017-05-191-2/+18
|\ \ | | | | | | Allow automatic DI for apps that don't register the container in app.php
| * | Allow automatic DI for apps that don't register the container in app.phpJoas Schilling2017-05-191-2/+18
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4949 from nextcloud/workaround-4948Lukas Reschke2017-05-191-1/+1
|\ \ | |/ |/| Lowercase the scriptname again
| * Lowercase the scriptname againLukas Reschke2017-05-191-1/+1
| | | | | | | | | | | | Ref https://github.com/nextcloud/server/issues/4948 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2017-05-19116-224/+270
|/
* 12.0.0RC1v12.0.0RC1Lukas Reschke2017-05-191-2/+2
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #4894 from nextcloud/generic-security-activitiesLukas Reschke2017-05-1914-54/+60
|\ | | | | Change 2FA activities to more generic security activities
| * Update autoloaderRoeland Jago Douma2017-05-182-0/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix testsRoeland Jago Douma2017-05-181-4/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix backup codes activity typeChristoph Wurst2017-05-181-1/+1
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Publish 2fa backup codes activities to the right streamChristoph Wurst2017-05-181-1/+1
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Move activities test codeChristoph Wurst2017-05-183-24/+24
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Change 2FA activities to more generic security activitiesChristoph Wurst2017-05-186-24/+24
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scannerLukas Reschke2017-05-194-2/+57
|\ \ | | | | | | Make sure we use the passed-in storage when there is one
| * | use unmasked permissions during scanningRobin Appelman2017-05-184-1/+53
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Make sure we use the passed-in storage when there is oneJoas Schilling2017-05-101-1/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4704 from nextcloud/add-oauth-code-flow-supportLukas Reschke2017-05-1846-50/+1969
|\ \ \ | | | | | | | | Add oauth code flow support
| * | | Function accepts only integersLukas Reschke2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Bearer comes first on the new endpointLukas Reschke2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Adjust realm from SabreDAV to NextcloudLukas Reschke2017-05-182-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Make legacy DAV backend use the BearerAuth backend as wellLukas Reschke2017-05-185-7/+22
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Delete token after usage in testLukas Reschke2017-05-181-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add indexesLukas Reschke2017-05-182-1/+22
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Adjust token nameLukas Reschke2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add additional test for accessing DAV using Bearer AuthLukas Reschke2017-05-181-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Use a standardized Bearer nowLukas Reschke2017-05-181-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Use Bearer backend for SabreDAVLukas Reschke2017-05-186-12/+220
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Don't ignore OAuth2 appLukas Reschke2017-05-181-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add tests for OAuth2 appLukas Reschke2017-05-189-8/+563
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add test for DefaultTokenMapperLukas Reschke2017-05-181-0/+11
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Fix style issues pointed out in reviewLukas Reschke2017-05-182-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Rename table back to lowercaseLukas Reschke2017-05-182-14/+18
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add tests for ClientFlowLoginControllerLukas Reschke2017-05-182-25/+185
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add app to autoenabled provisioning API scenarioLukas Reschke2017-05-181-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add OAuth state to sessionLukas Reschke2017-05-182-32/+27
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Cleanup codeLukas Reschke2017-05-182-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add XSD definitionsLukas Reschke2017-05-182-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | delete auth token when client gets deletedBjoern Schiessle2017-05-187-18/+79
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | use name of oauth app to identify auth tokenBjoern Schiessle2017-05-181-2/+10
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | hide client secret by defaultBjoern Schiessle2017-05-183-2/+26
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | add some spacing between the logo and the content of the pageBjoern Schiessle2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | show error page if no valid client identifier is given and if it is not a ↵Bjoern Schiessle2017-05-181-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | API request Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | handle case if no valid client identifier is givenBjoern Schiessle2017-05-181-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | remove 'Alternative login using app token' in case of oauth loginBjoern Schiessle2017-05-181-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | Remove special charactersLukas Reschke2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | It's a bearerLukas Reschke2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Fetch signle rowLukas Reschke2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Change to POSTLukas Reschke2017-05-181-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>