summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #17490 from owncloud/fix-closestThomas Müller2015-07-171-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix browser compatibility issue for element.closestHendrik Leppelsack2015-07-081-1/+1
* | | | | | | | | | Merge pull request #17670 from owncloud/timeout-oracle-docker-startupThomas Müller2015-07-171-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [autotest] timeout oracle docker startup after 2 minutesMorris Jobke2015-07-161-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #17663 from owncloud/occ-memcacheMorris Jobke2015-07-173-18/+48
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Fix memcache factory unit testsRobin McCorkell2015-07-162-4/+6
| * | | | | | | | | Fix memcache factory creation when not installedRobin McCorkell2015-07-151-4/+3
| * | | | | | | | | Missing memcache should not cause occ hard-failRobin McCorkell2015-07-152-12/+41
* | | | | | | | | | Merge pull request #17282 from owncloud/s2s-catchremotelockexceptionsMorris Jobke2015-07-171-17/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Throw lock exceptions if remote share returned 423 status codeVincent Petry2015-07-031-17/+27
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-178-42/+44
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #17474 from owncloud/fix_trashbinVincent Petry2015-07-162-2/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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