summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-09-0738-108/+256
* Merge pull request #1285 from nextcloud/deprecate-edition-stringRoeland Jago Douma2016-09-0615-71/+17
|\
| * Deprecate getEditionString()Joas Schilling2016-09-0615-71/+17
|/
* Merge pull request #1245 from nextcloud/get-external-mountsMorris Jobke2016-09-063-29/+68
|\
| * get files_external mounts more efficientlyRobin Appelman2016-09-053-29/+68
* | Merge pull request #1286 from nextcloud/add-twofactor_backupcodes-l10nRoeland Jago Douma2016-09-062-0/+6
|\ \
| * | add twofactor_backupcodes to l10nMorris Jobke2016-09-062-0/+6
* | | Merge pull request #1284 from nextcloud/allow-status.php-before-installRoeland Jago Douma2016-09-063-4/+6
|\ \ \ | |/ / |/| |
| * | Also fix "occ status"Joas Schilling2016-09-061-2/+4
| * | Don't throw 500 when not installedJoas Schilling2016-09-061-1/+1
| * | Allow to call status.php before the instance is installedJoas Schilling2016-09-061-1/+1
* | | Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanupMorris Jobke2016-09-069-79/+396
|\ \ \
| * | | Fix autoloaderRoeland Jago Douma2016-09-062-0/+6
| * | | Split OCS version handlingRoeland Jago Douma2016-09-067-79/+390
| |/ /
* | | Merge pull request #1242 from nextcloud/bump_phpunitJoas Schilling2016-09-0646-408/+546
|\ \ \
| * | | Fix getMock shareRoeland Jago Douma2016-09-062-206/+219
| * | | Fix getMock AvatarRoeland Jago Douma2016-09-061-13/+17
| * | | Fix getMock AuthenticationRoeland Jago Douma2016-09-063-16/+22
| * | | Fix getMock TwoFactorMiddlewareTestRoeland Jago Douma2016-09-061-8/+14
| * | | Fix getMock user_ldapRoeland Jago Douma2016-09-069-84/+128
| * | | Fix getMock files_versionsRoeland Jago Douma2016-09-061-1/+2
| * | | Fix getMock files_trashbinRoeland Jago Douma2016-09-062-3/+5
| * | | Fix getMock filesRoeland Jago Douma2016-09-063-7/+12
| * | | Fix getMock files_sharingRoeland Jago Douma2016-09-061-5/+7
| * | | Fix getMock files_externalRoeland Jago Douma2016-09-0610-34/+59
| * | | Fix getMock encryptionRoeland Jago Douma2016-09-0612-24/+54
| * | | Use PHPUnit 5.5.4Roeland Jago Douma2016-09-061-7/+7
* | | | Merge pull request #1235 from nextcloud/issue-1192-move-navigation-entries-wi...Morris Jobke2016-09-061-1/+9
|\ \ \ \
| * | | | Move navigation entries without order to the endJoas Schilling2016-09-021-1/+9
* | | | | Merge pull request #1279 from nextcloud/2fa-backup-codes-typoRoeland Jago Douma2016-09-061-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | translate 2fa backup stringsChristoph Wurst2016-09-061-2/+2
| * | | | fix 2fa backup codes typoChristoph Wurst2016-09-061-2/+2
|/ / / /
* | | | Merge pull request #1272 from nextcloud/theming-info-capabilitiesMorris Jobke2016-09-064-0/+287
|\ \ \ \ | |_|/ / |/| | |
| * | | Add image URLs and testsJoas Schilling2016-09-063-1/+225
| * | | Add theming information to capabilities for the clientJoas Schilling2016-09-052-0/+63
* | | | [tx-robot] updated from transifexNextcloud bot2016-09-0624-40/+104
* | | | Merge pull request #1121 from nextcloud/avatar_304Lukas Reschke2016-09-055-8/+184
|\ \ \ \
| * | | | Update autoloaderRoeland Jago Douma2016-09-052-0/+2
| * | | | Move AvatarController over to FileDisplayResponseRoeland Jago Douma2016-09-051-8/+3
| * | | | Add FileDisplayResponseRoeland Jago Douma2016-09-052-0/+179
|/ / / /
* | | | Merge pull request #1158 from nextcloud/cache_avatarsLukas Reschke2016-09-0512-36/+133
|\ \ \ \ | |/ / / |/| | |
| * | | Fix testsRoeland Jago Douma2016-08-302-14/+35
| * | | Cache avatars properlyRoeland Jago Douma2016-08-3010-22/+98
* | | | Merge pull request #1271 from nextcloud/fix-docs-for-notificationsJoas Schilling2016-09-053-7/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Null !== void, those methods are voidJoas Schilling2016-09-053-7/+0
* | | | Merge pull request #1270 from nextcloud/issue-1265-always-use-js-console-when...Morris Jobke2016-09-051-4/+1
|\ \ \ \
| * | | | Always use the js console when availableJoas Schilling2016-09-051-4/+1
| |/ / /
* | | | Merge pull request #1259 from nextcloud/language_orderJoas Schilling2016-09-055-33/+162
|\ \ \ \
| * | | | Autoloader updateRoeland Jago Douma2016-09-042-0/+2
| * | | | ACCEPT_LANGUAGE goes before default_langaugeRoeland Jago Douma2016-09-043-33/+160