aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | only move real files to the trash binBjoern Schiessle2015-07-082-2/+62
* | | | | | | | Merge pull request #17500 from owncloud/encryption_migration_improvementsThomas Müller2015-07-165-8/+73
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | only create new key pair if both keys are missingBjoern Schiessle2015-07-082-7/+68
| * | | | | | | only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-083-1/+5
| |/ / / / / /
* | | | | | | Merge pull request #17046 from nicolas-grekas/fix-16654blizzz2015-07-165-26/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Do not use OC*::mb_*_replace(), they are uselessNicolas Grekas2015-07-165-26/+12
* | | | | | | Merge pull request #17660 from owncloud/properly-wait-for-oracle-dockerThomas Müller2015-07-151-2/+4
|\ \ \ \ \ \ \
| * | | | | | | [autotest] wait for oracle docker container initialization instead of waiting...Morris Jobke2015-07-151-2/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #17659 from owncloud/files-scan-user-pathVincent Petry2015-07-151-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Lock scanner to the given userRobin Appelman2015-07-151-4/+5
* | | | | | | Merge pull request #17639 from owncloud/remove-file-target-indexMorris Jobke2015-07-152-8/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove index on file_target of share tableMorris Jobke2015-07-142-8/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-152-0/+14
|/ / / / / /
* | | | | | Merge pull request #17623 from owncloud/fed-throwcorrectexceptionMorris Jobke2015-07-141-1/+1
|\ \ \ \ \ \
| * | | | | | Throw storage not available on guzzle errorVincent Petry2015-07-131-1/+1
* | | | | | | Merge pull request #17606 from owncloud/appstore-timeoutMorris Jobke2015-07-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Handle returned null value in app level codeMorris Jobke2015-07-131-2/+2
* | | | | | | | Merge pull request #17620 from owncloud/s2s-hasupdated-catch405Morris Jobke2015-07-141-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Throw StorageNotAvailable if propfind on root failedVincent Petry2015-07-131-1/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-146-0/+6
* | | | | | | | Merge pull request #17565 from owncloud/fix/remote_shareRoeland Douma2015-07-131-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | allow remote shares for users with email as usernamesFelix Böhm2015-07-101-1/+1
* | | | | | | | Merge pull request #17599 from owncloud/fix-joinpaths-trailingslashMorris Jobke2015-07-132-4/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix OC.joinPaths with empty argumentsVincent Petry2015-07-132-4/+18
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #17605 from owncloud/pwebdav-stripmountinfoVincent Petry2015-07-133-6/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Strip public webdav info about sharing and mount pointsVincent Petry2015-07-133-6/+45
| |/ / / / / / /
* | | | | | | | Merge pull request #17609 from owncloud/core-js-helpersforcurrenturlMorris Jobke2015-07-131-0/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add helper functions for host, port and webrootVincent Petry2015-07-131-0/+45
|/ / / / / / /
* | | | | | | Merge pull request #17481 from rullzer/mimetype-listMorris Jobke2015-07-134-202/+183
|\ \ \ \ \ \ \
| * | | | | | | Move to OC::$configDifRoeland Jago Douma2015-07-101-3/+3
| * | | | | | | Move mimetypemapping.json to mimetypemapping.dist.jsonRoeland Jago Douma2015-07-082-2/+12
| * | | | | | | Move mimetypes.list.php to config/mimetypemapping.jsonRoeland Jago Douma2015-07-084-202/+173
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-138-4/+26
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-126-0/+8
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-1114-2/+50
* | | | | | | | Merge pull request #17559 from owncloud/js-joinpathsutilityMorris Jobke2015-07-102-0/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | More tests for joinPathsVincent Petry2015-07-101-0/+3
| * | | | | | | | Add OC.joinPaths for convenient path joiningVincent Petry2015-07-102-0/+80
* | | | | | | | | Merge pull request #17555 from owncloud/update-test-librariesVincent Petry2015-07-104-4311/+5971
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update JS unit test libsVincent Petry2015-07-104-4311/+5971
* | | | | | | | | | Merge pull request #17509 from rullzer/mimetype-alias-distRoeland Douma2015-07-103-5/+19
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Move mimetypealiases.json to mimetypealiases.dist.jsonRoeland Jago Douma2015-07-103-5/+19
|/ / / / / / / / /
* | | | | | | | | Merge pull request #17483 from rullzer/migrate-mimetype-jsVincent Petry2015-07-109-135/+101
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix unit testsRoeland Jago Douma2015-07-093-4/+13
| * | | | | | | | MimeTypes now also supports httpd/unix-directoryRoeland Jago Douma2015-07-092-59/+61
| * | | | | | | | Make the filelist get the mimetypeicon from the mimetypeRoeland Jago Douma2015-07-091-9/+1
| * | | | | | | | Remove ajax/mimeicon.php and its routeRoeland Jago Douma2015-07-092-29/+0
| * | | | | | | | Move calls to Files.getMimeIcon to OC.MimeType.getIconUrlRoeland Jago Douma2015-07-092-30/+27
| * | | | | | | | Make getMimeIcon use OC.MimeType.getIconUrlRoeland Jago Douma2015-07-091-12/+7
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-1028-42/+78