summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* let insertIfNotExist() throw the native DBALException - no need to hide the r...Thomas Müller2015-03-098-57/+25
* Adding unit test which shows insertIfNotExists to fall apart in certain situa...Thomas Müller2015-03-092-11/+91
* Get the id before using itJoas Schilling2015-03-091-1/+2
* Better save then sorryJoas Schilling2015-03-091-0/+2
* insertIfNotExists() for storage insertionJoas Schilling2015-03-091-3/+9
* Only check unique keys for the comparison on filecache insert & update otherwiseJoas Schilling2015-03-091-1/+6
* Allow specifying the compare-array for insertIfNotExists()Joas Schilling2015-03-098-21/+34
* Merge pull request #14720 from owncloud/fix-shareetagpropagationMorris Jobke2015-03-092-0/+112
|\
| * Add unit test for size propagation across share boundariesVincent Petry2015-03-091-0/+90
| * Fix size propagation over shared storage boundaryVincent Petry2015-03-051-0/+22
* | Merge pull request #14429 from owncloud/issue/14176-validate-timezone-before-...Morris Jobke2015-03-092-14/+76
|\ \
| * | Etc timezones don't exist for .5 and .75 offsetsJoas Schilling2015-03-032-14/+76
* | | Merge pull request #14713 from owncloud/issue/14671-preview-delete-check-for-...Joas Schilling2015-03-091-9/+10
|\ \ \
| * | | Check whether the file id is valid, before using it to delete the previewsJoas Schilling2015-03-091-9/+10
| | |/ | |/|
* | | Merge pull request #14750 from owncloud/possible-fix-for-OC_VersionThomas Müller2015-03-091-1/+1
|\ \ \
| * | | proper filename for "require version.php"Morris Jobke2015-03-091-1/+1
* | | | Merge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limitMorris Jobke2015-03-091-0/+11
|\ \ \ \
| * | | | set up paged search when limit is 0Arthur Schiwon2015-03-051-0/+11
* | | | | Merge pull request #14743 from owncloud/autoconfig-passwordMorris Jobke2015-03-091-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Convert 'abcpassword' to 'abcpass' during setupRobin McCorkell2015-03-071-0/+8
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0926-82/+230
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0824-16/+58
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0722-14/+40
* | | | Merge pull request #14736 from owncloud/errors-listMorris Jobke2015-03-063-3/+9
|\ \ \ \
| * | | | adjust list of errors, more compact and readableJan-Christoph Borchardt2015-03-063-3/+9
* | | | | Merge pull request #14722 from owncloud/master-14711Lukas Reschke2015-03-061-2/+37
|\ \ \ \ \
| * | | | | Fix totally broken AppStore code...Lukas Reschke2015-03-061-2/+37
| | |_|/ / | |/| | |
* | | | | Merge pull request #14734 from owncloud/unit-test-insertIfNotExistThomas Müller2015-03-063-51/+35
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | use insertIfNotExist() in cache putThomas Müller2015-03-061-5/+11
| * | | | Fix PHPDoc on the way ....Thomas Müller2015-03-061-13/+15
| * | | | Use an atomic implementation on sqlite for insertIfNotExist()Thomas Müller2015-03-061-33/+9
|/ / / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-03-0648-0/+120
|/ / /
* | | Merge pull request #13368 from owncloud/memcache_lowlatencyLukas Reschke2015-03-056-44/+199
|\ \ \ | |/ / |/| |
| * | \OC\Memcache\Cache implements \OCP\ICacheRobin McCorkell2015-03-051-1/+1
| * | Refactor \OC\Memcache\FactoryRobin McCorkell2015-03-055-43/+198
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-05220-750/+32
* | | Merge pull request #14691 from owncloud/karma-forcejasmine2Morris Jobke2015-03-041-2/+2
|\ \ \
| * | | Make sure we use Jasmine 2 for running JS unit testsVincent Petry2015-03-041-2/+2
* | | | Merge pull request #14672 from Crote/masterMorris Jobke2015-03-041-3/+10
|\ \ \ \
| * | | | Add --show-password option to ldap:show-configLaurens Post2015-03-041-3/+10
* | | | | Merge pull request #14693 from owncloud/fix-phpdocVincent Petry2015-03-042-2/+2
|\ \ \ \ \
| * | | | | Fix PHPDocLukas Reschke2015-03-042-2/+2
* | | | | | Merge pull request #14690 from owncloud/trash-deletelink-unittestVincent Petry2015-03-041-0/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add unit test for selection overlay actions in trashbinVincent Petry2015-03-041-0/+22
| | |/ / / | |/| | |
* | | | | Merge pull request #14685 from owncloud/test-noop-scannerMorris Jobke2015-03-041-0/+76
|\ \ \ \ \
| * | | | | Add a test for ObjectStore\NoopScannerJoas Schilling2015-03-041-0/+76
| | |_|/ / | |/| | |
* | | | | Merge pull request #14675 from owncloud/files-external-smb-windowsThomas Müller2015-03-044-42/+136
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix slash normalization error in AmazonS3Migration unit testRobin McCorkell2015-03-041-3/+3
| * | | | Use dummy storages instead of real storages in files_external unit testsRobin McCorkell2015-03-031-39/+81
| * | | | adding a windows smb config for testingThomas Müller2015-03-032-0/+52
| | |/ / | |/| |