aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update symphony components to 2.6.4Robin Appelman2015-03-101-0/+0
* Merge pull request #14759 from owncloud/clean-up-codeLukas Reschke2015-03-101-6/+48
|\
| * Clean-up code and use proper exception typesLukas Reschke2015-03-091-6/+48
* | Merge pull request #14346 from owncloud/storage-based-path-validationLukas Reschke2015-03-1026-156/+678
|\ \
| * | no translation service in common storage classThomas Müller2015-03-095-19/+94
| * | Respect http header 'Accept-Language' on ocs and remote.php callsThomas Müller2015-03-093-37/+48
| * | translate error messagesThomas Müller2015-03-092-9/+16
| * | Optimize loopLukas Reschke2015-03-091-6/+9
| * | fixing js unit testsThomas Müller2015-03-093-31/+0
| * | deprecate isValidFileName()Thomas Müller2015-03-092-0/+2
| * | fixing namespaces and PHPDocThomas Müller2015-03-099-45/+76
| * | adding storage specific filename verification - refs #13640Thomas Müller2015-03-0913-61/+485
* | | Merge pull request #14534 from owncloud/add-child-srcThomas Müller2015-03-102-2/+34
|\ \ \
| * | | Add support for 'child-src' directiveLukas Reschke2015-02-282-2/+34
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-1010-40/+338
* | | | Merge pull request #14689 from owncloud/better-missing-resource-handlingThomas Müller2015-03-096-41/+146
|\ \ \ \
| * | | | Log errors and create 404 in network list when a css or js is missingJoas Schilling2015-03-046-41/+146
* | | | | Merge pull request #14753 from owncloud/verify-csrf-token-earlierThomas Müller2015-03-091-0/+2
|\ \ \ \ \
| * | | | | Verify CSRF token already in update.php and not the EventSource codeLukas Reschke2015-03-091-0/+2
| | |_|/ / | |/| | |
* | | | | 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