summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix replacing of 4MB Unicode Chars in cal props tableGeorg Ehrke2017-05-212-2/+2
* Merge pull request #4983 from nextcloud/master-oauth-not-disableMorris Jobke2017-05-203-6/+16
|\
| * Fix testsLukas Reschke2017-05-202-6/+15
| * Mark OAuth app as always enabledLukas Reschke2017-05-191-0/+1
* | [tx-robot] updated from transifexNextcloud bot2017-05-2120-4/+704
* | Merge pull request #4997 from nextcloud/federated-share-fixMorris Jobke2017-05-201-0/+1
|\ \
| * | fix for sharingDaniel Hansson2017-05-201-0/+1
* | | Merge pull request #4854 from michaelletzgus/deferred-script-loading-v2Morris Jobke2017-05-205-24/+44
|\ \ \
| * | | Make page loading faster by deferred script loading:Michael Letzgus2017-05-205-24/+44
* | | | Merge pull request #4995 from nextcloud/master-version-dumpLukas Reschke2017-05-201-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | 12.0.0RC3Lukas Reschke2017-05-201-2/+2
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-05-20118-104/+574
* | | Merge pull request #4981 from nextcloud/fix-missing-argument-2-getAppContaine...Morris Jobke2017-05-191-1/+1
|\ \ \
| * | | Fix missing argument 2 for Settings classesJoas Schilling2017-05-191-1/+1
* | | | Merge pull request #4943 from nextcloud/rename-secure-dropBjörn Schießle2017-05-192-2/+2
|\ \ \ \
| * | | | rename secure drop back to files drop because of name collision with securedr...Bjoern Schiessle2017-05-182-2/+2
* | | | | Merge pull request #4974 from nextcloud/fix-hidden-sidebarLukas Reschke2017-05-191-0/+3
|\ \ \ \ \
| * | | | | Fixes visible sidebar even if hidden is appliedMorris Jobke2017-05-191-0/+3
* | | | | | Merge pull request #4972 from nextcloud/fix-group-restrictionLukas 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 #4910 from nextcloud/make-the-logo-smaller-creamLukas 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-161-2/+1
* | | | | Merge pull request #4956 from nextcloud/endless-loop-on-invalid-assetRoeland Jago Douma2017-05-193-0/+26
|\ \ \ \ \
| * | | | | Stop infinit loop on invalid settings css/js fileJoas Schilling2017-05-193-0/+26
* | | | | | Merge pull request #4970 from franga2000/patch-1Lukas Reschke2017-05-191-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixed typoMiha Frangez2017-05-191-1/+1
|/ / / / /
* | | | | Merge pull request #4905 from nextcloud/auto-di-for-apps-without-app.phpJoas Schilling2017-05-191-2/+18
|\ \ \ \ \
| * | | | | Allow automatic DI for apps that don't register the container in app.phpJoas Schilling2017-05-161-2/+18
* | | | | | Merge pull request #4950 from nextcloud/master-workaround-4948Lukas Reschke2017-05-191-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Lowercase the scriptname againLukas Reschke2017-05-191-1/+1
* | | | | | Merge pull request #4951 from nextcloud/transifex-oauth2Morris Jobke2017-05-182-0/+6
|\ \ \ \ \ \
| * | | | | | Add oauth2 to transifexMorris Jobke2017-05-182-0/+6
| |/ / / / /
* / / / / / [tx-robot] updated from transifexNextcloud bot2017-05-19116-224/+270
|/ / / / /
* | | | | 12.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