0d0f9a52d2
Merge pull request #14788 from cmeh/patch-3
...
Correct "one invalid characters" to "one invalid character"
2015-03-11 12:26:49 +01:00
b3bb65eae5
Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist
...
Add an option to include the installed app version in "occ app:list"
2015-03-11 12:23:22 +01:00
abb726c994
Merge pull request #14789 from owncloud/better-app-install-error-messages
...
display app update error messages
2015-03-11 11:28:28 +01:00
3df1d9338e
Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master
...
Use occ to install ownCloud in autotest.sh
2015-03-11 11:00:49 +01:00
ffe06ac5c7
display app update error messages - fixes #14611
2015-03-11 09:59:56 +01:00
4a0c649c8a
Correct "one invalid characters" to "one invalid character"
...
Corrected "one invalid characters" to "one invalid character" in line 1575.
2015-03-11 09:59:42 +01:00
560137ca23
Always include the installed app version in "occ app:list"
2015-03-11 09:47:41 +01:00
6c1a1234f8
Properly handle available databases at runtime and respect setup checks in command line as well
2015-03-11 09:27:12 +01:00
81fa9550a0
No need to restart the web server in cli mode
2015-03-11 09:27:12 +01:00
7181840665
Use occ to install ownCloud in autotest.sh
2015-03-11 09:27:12 +01:00
cfaee93552
Merge pull request #14783 from owncloud/dont-timeout-cron-master
...
cron.php on cli has no time limitation - fixes #14481
2015-03-11 09:23:22 +01:00
01ea056ac8
[tx-robot] updated from transifex
2015-03-11 01:55:38 -04:00
b4cf6e62bf
cron.php on cli has no time limitation - fixes #14481
2015-03-11 01:09:12 +01:00
1757d01604
Merge pull request #14640 from owncloud/rescanversionsonlyonce
...
Only rescan versions once in trashbin
2015-03-11 00:54:20 +01:00
9a9633f84f
update 3rdparty master
2015-03-10 16:06:01 +01:00
f5a56355fd
Merge pull request #14115 from owncloud/update-symphony-components
...
update symphony components to 2.6.4
2015-03-10 16:05:12 +01:00
bb97256a79
update symphony components to 2.6.4
2015-03-10 15:34:45 +01:00
284bd6647c
Merge pull request #14759 from owncloud/clean-up-code
...
Clean-up code and use proper exception types
2015-03-10 14:18:21 +01:00
6dc59019af
Merge pull request #14346 from owncloud/storage-based-path-validation
...
adding storage specific filename verification
2015-03-10 11:02:47 +01:00
214fa44400
Merge pull request #14534 from owncloud/add-child-src
...
Add support for 'child-src' directive
2015-03-10 10:30:44 +01:00
e069d9d3f9
[tx-robot] updated from transifex
2015-03-10 01:55:39 -04:00
c8ed88f4d6
Merge pull request #14689 from owncloud/better-missing-resource-handling
...
Log errors and create 404 in network list when a css or js is missing
2015-03-09 23:33:25 +01:00
2f61884956
Merge pull request #14753 from owncloud/verify-csrf-token-earlier
...
Verify CSRF token already in update.php and not the EventSource code
2015-03-09 23:06:15 +01:00
94b7fa17c5
Merge pull request #14720 from owncloud/fix-shareetagpropagation
...
Fix size propagation over shared storage boundary
2015-03-09 16:24:06 +01:00
d34662122d
Merge pull request #14429 from owncloud/issue/14176-validate-timezone-before-using
...
Etc timezones don't exist for .5 and .75 offsets
2015-03-09 16:16:16 +01:00
ec19d9c267
Add unit test for size propagation across share boundaries
2015-03-09 12:56:22 +01:00
01cd83a902
Merge pull request #14713 from owncloud/issue/14671-preview-delete-check-for-valid-fileid
...
Check whether the file id is valid, before using it to delete the previews
2015-03-09 11:56:46 +01:00
2ac6f3a4f5
Clean-up code and use proper exception types
2015-03-09 11:48:55 +01:00
a12e16e985
Check whether the file id is valid, before using it to delete the previews
2015-03-09 11:25:18 +01:00
3623f14e73
no translation service in common storage class
2015-03-09 10:38:38 +01:00
2367797c17
Respect http header 'Accept-Language' on ocs and remote.php calls
2015-03-09 10:38:38 +01:00
33b11682f9
translate error messages
2015-03-09 10:38:38 +01:00
2f18a09a20
Optimize loop
2015-03-09 10:38:38 +01:00
abacfd84da
fixing js unit tests
2015-03-09 10:38:38 +01:00
e28d314b53
deprecate isValidFileName()
2015-03-09 10:38:38 +01:00
49e1a81eba
fixing namespaces and PHPDoc
2015-03-09 10:38:37 +01:00
4bac595068
adding storage specific filename verification - refs #13640
2015-03-09 10:38:37 +01:00
c0a02f1615
Verify CSRF token already in update.php and not the EventSource code
...
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 ;-)
2015-03-09 10:07:30 +01:00
fccede8f50
Merge pull request #14750 from owncloud/possible-fix-for-OC_Version
...
proper filename for "require version.php"
2015-03-09 09:55:21 +01:00
348fe105b1
Merge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limit
...
LDAP: set up paged search even if limit is 0
2015-03-09 08:12:25 +01:00
d550143ba0
proper filename for "require version.php"
2015-03-09 08:03:28 +01:00
674654c210
Merge pull request #14743 from owncloud/autoconfig-password
...
Convert 'abcpassword' to 'abcpass' during setup
2015-03-09 07:54:22 +01:00
174f8cef64
[tx-robot] updated from transifex
2015-03-09 01:54:36 -04:00
377165ae51
[tx-robot] updated from transifex
2015-03-08 01:54:36 -05:00
f43b047636
Convert 'abcpassword' to 'abcpass' during setup
...
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
2015-03-07 13:10:43 +00:00
73c2157171
[tx-robot] updated from transifex
2015-03-07 01:54:37 -05:00
81dc550af0
Merge pull request #14736 from owncloud/errors-list
...
adjust list of errors, more compact and readable
2015-03-06 23:13:44 +01:00
60c507cd4e
Merge pull request #14722 from owncloud/master-14711
...
Fix totally broken AppStore code...
2015-03-06 18:52:12 +01:00
a77a6f3b48
Merge pull request #14734 from owncloud/unit-test-insertIfNotExist
...
[sqlite] Use an atomic implementation on sqlite for insertIfNotExist() + use it in the file cache ...
2015-03-06 18:20:22 +01:00
1b08b7c726
use insertIfNotExist() in cache put
2015-03-06 15:32:58 +01:00
Thomas Müller
Bernhard Posselt
cmeh
Joas Schilling
Morris Jobke
Jenkins for ownCloud
Robin Appelman
Lukas Reschke
Vincent Petry
Joas Schilling
Robin McCorkell