summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 12.0.0RC1v12.0.0RC1Lukas Reschke2017-05-191-2/+2
* Merge pull request #4894 from nextcloud/generic-security-activitiesLukas Reschke2017-05-1914-54/+60
|\
| * Update autoloaderRoeland Jago Douma2017-05-182-0/+6
| * Fix testsRoeland Jago Douma2017-05-181-4/+4
| * Fix backup codes activity typeChristoph Wurst2017-05-181-1/+1
| * Publish 2fa backup codes activities to the right streamChristoph Wurst2017-05-181-1/+1
| * Move activities test codeChristoph Wurst2017-05-183-24/+24
| * Change 2FA activities to more generic security activitiesChristoph Wurst2017-05-186-24/+24
* | Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scannerLukas Reschke2017-05-194-2/+57
|\ \
| * | use unmasked permissions during scanningRobin Appelman2017-05-184-1/+53
| * | Make sure we use the passed-in storage when there is oneJoas Schilling2017-05-101-1/+4
* | | Merge pull request #4704 from nextcloud/add-oauth-code-flow-supportLukas Reschke2017-05-1846-50/+1969
|\ \ \
| * | | Function accepts only integersLukas Reschke2017-05-181-1/+1
| * | | Bearer comes first on the new endpointLukas Reschke2017-05-181-1/+1
| * | | Adjust realm from SabreDAV to NextcloudLukas Reschke2017-05-182-2/+6
| * | | Make legacy DAV backend use the BearerAuth backend as wellLukas Reschke2017-05-185-7/+22
| * | | Delete token after usage in testLukas Reschke2017-05-181-0/+1
| * | | Add indexesLukas Reschke2017-05-182-1/+22
| * | | Adjust token nameLukas Reschke2017-05-181-1/+1
| * | | Add additional test for accessing DAV using Bearer AuthLukas Reschke2017-05-181-0/+4
| * | | Use a standardized Bearer nowLukas Reschke2017-05-181-2/+2
| * | | Use Bearer backend for SabreDAVLukas Reschke2017-05-186-12/+220
| * | | Don't ignore OAuth2 appLukas Reschke2017-05-181-0/+1
| * | | Add tests for OAuth2 appLukas Reschke2017-05-189-8/+563
| * | | Add test for DefaultTokenMapperLukas Reschke2017-05-181-0/+11
| * | | Fix style issues pointed out in reviewLukas Reschke2017-05-182-2/+1
| * | | Rename table back to lowercaseLukas Reschke2017-05-182-14/+18
| * | | Add tests for ClientFlowLoginControllerLukas Reschke2017-05-182-25/+185
| * | | Add app to autoenabled provisioning API scenarioLukas Reschke2017-05-181-0/+1
| * | | Add OAuth state to sessionLukas Reschke2017-05-182-32/+27
| * | | Cleanup codeLukas Reschke2017-05-182-3/+6
| * | | Add XSD definitionsLukas Reschke2017-05-182-3/+3
| * | | delete auth token when client gets deletedBjoern Schiessle2017-05-187-18/+79
| * | | use name of oauth app to identify auth tokenBjoern Schiessle2017-05-181-2/+10
| * | | hide client secret by defaultBjoern Schiessle2017-05-183-2/+26
| * | | add some spacing between the logo and the content of the pageBjoern Schiessle2017-05-181-1/+1
| * | | show error page if no valid client identifier is given and if it is not a API...Bjoern Schiessle2017-05-181-5/+24
| * | | handle case if no valid client identifier is givenBjoern Schiessle2017-05-181-0/+5
| * | | remove 'Alternative login using app token' in case of oauth loginBjoern Schiessle2017-05-181-0/+2
| * | | Remove special charactersLukas Reschke2017-05-181-1/+1
| * | | It's a bearerLukas Reschke2017-05-181-1/+1
| * | | Fetch signle rowLukas Reschke2017-05-181-1/+1
| * | | Change to POSTLukas Reschke2017-05-181-2/+1
| * | | Increase length of encrypted token in databaseLukas Reschke2017-05-182-2/+2
| * | | Get a single rowLukas Reschke2017-05-182-8/+4
| * | | Use query builderLukas Reschke2017-05-182-6/+14
| * | | Add basic implementation for OAuth 2.0 Authorization Code FlowLukas Reschke2017-05-1817-23/+838
| | |/ | |/|
* | | Merge pull request #4888 from nextcloud/theming-fallback-iconsLukas Reschke2017-05-183-37/+85
|\ \ \
| * | | Inject FileAccessHelper for proper testingJulius Härtl2017-05-182-8/+21
| * | | Add proper Content-Type to iconsJulius Härtl2017-05-172-4/+4