summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4996 from nextcloud/stable12-versionv12.0.0RC3Lukas Reschke2017-05-201-2/+2
|\
| * 12.0.0RC3Lukas Reschke2017-05-201-2/+2
|/
* [tx-robot] updated from transifexNextcloud bot2017-05-2090-104/+212
* Merge pull request #4977 from nextcloud/rename-secure-drop-stable12Morris Jobke2017-05-192-2/+2
|\
| * rename secure drop back to files drop because of name collision with securedr...Bjoern Schiessle2017-05-192-2/+2
* | Merge pull request #4980 from nextcloud/fix-missing-argument-2-getAppContainerMorris Jobke2017-05-191-1/+1
|\ \ | |/ |/|
| * Fix missing argument 2 for Settings classesJoas Schilling2017-05-191-1/+1
|/
* Merge pull request #4976 from nextcloud/stable12-4910v12.0.0RC2Lukas Reschke2017-05-193-7/+15
|\
| * Scale logo only for custom onesJulius Härtl2017-05-193-5/+14
| * Fix logo being too big on log in page, fix #4585Jan-Christoph Borchardt2017-05-191-2/+1
* | Merge pull request #4975 from nextcloud/stable12-4974Lukas Reschke2017-05-191-0/+3
|\ \
| * | Fixes visible sidebar even if hidden is appliedMorris Jobke2017-05-191-0/+3
| |/
* | Merge pull request #4973 from nextcloud/stable12-4972Lukas Reschke2017-05-192-9/+9
|\ \
| * | Fix group restriction regressionMorris Jobke2017-05-192-9/+9
| |/
* / 12.0.0RC2Lukas Reschke2017-05-191-2/+2
|/
* Merge pull request #4957 from nextcloud/backport-4956-resource-loading-for-everLukas Reschke2017-05-193-0/+26
|\
| * Stop infinit loop on invalid settings css/js fileJoas Schilling2017-05-193-0/+26
* | 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.phpJoas Schilling2017-05-191-2/+18
|/ /
* | Merge pull request #4949 from nextcloud/workaround-4948Lukas Reschke2017-05-191-1/+1
|\ \ | |/ |/|
| * Lowercase the scriptname againLukas Reschke2017-05-191-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-05-19116-224/+270
|/
* 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