summaryrefslogtreecommitdiffstats
Commit message (Collapse)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 types
| * 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
|\ \ | | | | | | adding storage specific filename verification
| * | 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' directive
| * | | Add support for 'child-src' directiveLukas Reschke2015-02-282-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | This is required when working with stuff such as PDF.js in the files_pdfviewer application. Opt-in only. Master change only because the stable CSP policies has a failback that allows nearly anything :see_no_evil:
* | | | [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 missing
| * | | | 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 code
| * | | | | Verify CSRF token already in update.php and not the EventSource codeLukas Reschke2015-03-091-0/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue report: > Hum, well I upgraded the package then visited the web interface to trigger the update and it failed; the UI would say there was a possible CSRF attack and after that it'd be stuck in maintenance mode. Tried a few times (by editing maintenance to false in owncloud.conf) and same result each time. That smells partially like an issue caused by our EventSource implementation, due to legacy concerns the CSRF verification happens within the EventSource handling and not when the actual endpoint is called, what happens here then is: 1. User has somehow an invalid CSRF token in session (or none at all) 2. User clicks the update button 3. Invalid CSRF token is sent to update.php - no CSRF check there => Instance gets set in maintenance mode 4. Invalid CSRF token is processed by the EventSource code => Code Execution is stopped and ownCloud is stuck in maintenance mode I have a work-around for this problem, basically it verifies the CSRF token already in step 3 and cancels execution then. The same error will be shown to the user however he can work around it by refreshing the page – as stated by the error. I think that’s an acceptable behaviour for now: INSERT LINK To verify this test: 1. Delete your ownCloud cookies 2. Increment the version in version.php 3. Try to upgrade => Before the patch: Instance shows an error, is set to upgrade mode and a refresh does not help => After the patch: Instance shows an error, a refresh helps though. This is not really the best fix as a better solution would be to catch such situations when bootstrapping ownCloud, however, I don’t dare to touch base.php for this sake only, you never know what breaks then… That said: There might be other bugs as well, especially the stacktrace is somewhat confusing but then again it installing ownCloud under /usr/share/owncloud/ and I bet that is part of the whole issue ;-)
* | | | | Merge pull request #14720 from owncloud/fix-shareetagpropagationMorris Jobke2015-03-092-0/+112
|\ \ \ \ \ | | | | | | | | | | | | Fix size propagation over shared storage boundary
| * | | | | 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 ↵Morris Jobke2015-03-092-14/+76
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/14176-validate-timezone-before-using Etc timezones don't exist for .5 and .75 offsets
| * | | | | | Etc timezones don't exist for .5 and .75 offsetsJoas Schilling2015-03-032-14/+76
| | | | | | |
* | | | | | | Merge pull request #14713 from ↵Joas Schilling2015-03-091-9/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | owncloud/issue/14671-preview-delete-check-for-valid-fileid Check whether the file id is valid, before using it to delete the previews
| * | | | | | 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"
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | LDAP: set up paged search even if limit is 0
| * | | | | | 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 setup
| * | | | | | Convert 'abcpassword' to 'abcpass' during setupRobin McCorkell2015-03-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which is more consistent with config.php
* | | | | | | [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 readable
| * | | | | | 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...
| * | | | | | | Fix totally broken AppStore code...Lukas Reschke2015-03-061-2/+37
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it turned out the AppStore code was completely broken when it came from apps delivered from the appstore, this meant: 1. You could not disable and then re-enable an application that was installed from the AppStore. It simply failed hard. 2. You could not disable apps from the categories but only from the "Activated" page 3. It did not show the activation state from any category page This code is completely static and thus testing it is impossible. We really have to stop with "let's add yet another feature in already existing static code". Such stuff has to get refactored first. That said, this code works from what I can say when clicking around in the AppStore page GUI. However, it may easily be that it does not work with updates or whatsever as I have no chance to test that since the AppStore code is not open-source and it is impossible to write unit-tests for that. Fixes https://github.com/owncloud/core/issues/14711
* | | | | | | Merge pull request #14734 from owncloud/unit-test-insertIfNotExistThomas Müller2015-03-063-51/+35
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [sqlite] Use an atomic implementation on sqlite for insertIfNotExist() + use it in the file cache ...
| * | | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | Refactor \OC\Memcache\Factory
| * | | | \OC\Memcache\Cache implements \OCP\ICacheRobin McCorkell2015-03-051-1/+1
| | | | |
| * | | | Refactor \OC\Memcache\FactoryRobin McCorkell2015-03-055-43/+198
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caches divided up into two groups: distributed and local. 'Low latency' is an alias for local caches, while the standard `create()` call tries to get distributed caches first, then local caches. Memcache backend is set in `config.php`, with the keys `memcache.local` and `memcache.distributed`. If not set, `memcache.distributed` defaults to the value of `memcache.local`.
* | | | [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 tests
| * | | | Make sure we use Jasmine 2 for running JS unit testsVincent Petry2015-03-041-2/+2
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 12:52:03 +0000