]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Wed, 11 Mar 2015 11:52:18 +0000 (12:52 +0100)]
Merge pull request #14791 from owncloud/fix-14516
Adding a more meaningful message for sabre dav exception
Thomas Müller [Wed, 11 Mar 2015 11:26:49 +0000 (12:26 +0100)]
Merge pull request #14788 from cmeh/patch-3
Correct "one invalid characters" to "one invalid character"
Thomas Müller [Wed, 11 Mar 2015 11:23:22 +0000 (12:23 +0100)]
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"
Thomas Müller [Wed, 11 Mar 2015 10:53:31 +0000 (11:53 +0100)]
Adding a more meaningful message for sabre dav exception - fixes #14516
Bernhard Posselt [Wed, 11 Mar 2015 10:28:28 +0000 (11:28 +0100)]
Merge pull request #14789 from owncloud/better-app-install-error-messages
display app update error messages
Thomas Müller [Wed, 11 Mar 2015 10:00:49 +0000 (11:00 +0100)]
Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master
Use occ to install ownCloud in autotest.sh
Thomas Müller [Wed, 11 Mar 2015 08:59:56 +0000 (09:59 +0100)]
display app update error messages - fixes #14611
cmeh [Wed, 11 Mar 2015 08:59:42 +0000 (09:59 +0100)]
Correct "one invalid characters" to "one invalid character"
Corrected "one invalid characters" to "one invalid character" in line 1575.
Joas Schilling [Tue, 3 Mar 2015 09:26:09 +0000 (10:26 +0100)]
Always include the installed app version in "occ app:list"
Thomas Müller [Tue, 10 Mar 2015 22:44:29 +0000 (23:44 +0100)]
Properly handle available databases at runtime and respect setup checks in command line as well
Thomas Müller [Tue, 10 Mar 2015 21:59:23 +0000 (22:59 +0100)]
No need to restart the web server in cli mode
Thomas Müller [Tue, 10 Mar 2015 14:59:07 +0000 (15:59 +0100)]
Use occ to install ownCloud in autotest.sh
Morris Jobke [Wed, 11 Mar 2015 08:23:22 +0000 (09:23 +0100)]
Merge pull request #14783 from owncloud/dont-timeout-cron-master
cron.php on cli has no time limitation - fixes #14481
Jenkins for ownCloud [Wed, 11 Mar 2015 05:55:38 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Wed, 11 Mar 2015 00:09:12 +0000 (01:09 +0100)]
cron.php on cli has no time limitation - fixes #14481
Thomas Müller [Tue, 10 Mar 2015 23:54:20 +0000 (00:54 +0100)]
Merge pull request #14640 from owncloud/rescanversionsonlyonce
Only rescan versions once in trashbin
Morris Jobke [Tue, 10 Mar 2015 15:06:01 +0000 (16:06 +0100)]
update 3rdparty master
Morris Jobke [Tue, 10 Mar 2015 15:05:12 +0000 (16:05 +0100)]
Merge pull request #14115 from owncloud/update-symphony-components
update symphony components to 2.6.4
Robin Appelman [Tue, 10 Mar 2015 13:47:08 +0000 (14:47 +0100)]
update symphony components to 2.6.4
Lukas Reschke [Tue, 10 Mar 2015 13:18:21 +0000 (14:18 +0100)]
Merge pull request #14759 from owncloud/clean-up-code
Clean-up code and use proper exception types
Lukas Reschke [Tue, 10 Mar 2015 10:02:47 +0000 (11:02 +0100)]
Merge pull request #14346 from owncloud/storage-based-path-validation
adding storage specific filename verification
Thomas Müller [Tue, 10 Mar 2015 09:30:44 +0000 (10:30 +0100)]
Merge pull request #14534 from owncloud/add-child-src
Add support for 'child-src' directive
Jenkins for ownCloud [Tue, 10 Mar 2015 05:55:39 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 9 Mar 2015 22:33:25 +0000 (23:33 +0100)]
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
Thomas Müller [Mon, 9 Mar 2015 22:06:15 +0000 (23:06 +0100)]
Merge pull request #14753 from owncloud/verify-csrf-token-earlier
Verify CSRF token already in update.php and not the EventSource code
Morris Jobke [Mon, 9 Mar 2015 15:24:06 +0000 (16:24 +0100)]
Merge pull request #14720 from owncloud/fix-shareetagpropagation
Fix size propagation over shared storage boundary
Morris Jobke [Mon, 9 Mar 2015 15:16:16 +0000 (16:16 +0100)]
Merge pull request #14429 from owncloud/issue/14176-validate-timezone-before-using
Etc timezones don't exist for .5 and .75 offsets
Vincent Petry [Mon, 9 Mar 2015 11:41:29 +0000 (12:41 +0100)]
Add unit test for size propagation across share boundaries
Joas Schilling [Mon, 9 Mar 2015 10:56:46 +0000 (11:56 +0100)]
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
Lukas Reschke [Mon, 9 Mar 2015 10:48:55 +0000 (11:48 +0100)]
Clean-up code and use proper exception types
Joas Schilling [Thu, 5 Mar 2015 15:07:42 +0000 (16:07 +0100)]
Check whether the file id is valid, before using it to delete the previews
Thomas Müller [Wed, 4 Mar 2015 13:03:47 +0000 (14:03 +0100)]
no translation service in common storage class
Thomas Müller [Tue, 24 Feb 2015 16:42:26 +0000 (17:42 +0100)]
Respect http header 'Accept-Language' on ocs and remote.php calls
Thomas Müller [Tue, 24 Feb 2015 16:20:59 +0000 (17:20 +0100)]
translate error messages
Lukas Reschke [Fri, 20 Feb 2015 17:19:14 +0000 (18:19 +0100)]
Optimize loop
Thomas Müller [Thu, 19 Feb 2015 10:23:01 +0000 (11:23 +0100)]
fixing js unit tests
Thomas Müller [Wed, 18 Feb 2015 17:35:27 +0000 (18:35 +0100)]
deprecate isValidFileName()
Thomas Müller [Wed, 18 Feb 2015 17:28:24 +0000 (18:28 +0100)]
fixing namespaces and PHPDoc
Thomas Müller [Wed, 18 Feb 2015 16:44:13 +0000 (17:44 +0100)]
adding storage specific filename verification - refs #13640
Lukas Reschke [Mon, 9 Mar 2015 09:07:30 +0000 (10:07 +0100)]
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 ;-)
Thomas Müller [Mon, 9 Mar 2015 08:55:21 +0000 (09:55 +0100)]
Merge pull request #14750 from owncloud/possible-fix-for-OC_Version
proper filename for "require version.php"
Morris Jobke [Mon, 9 Mar 2015 07:12:25 +0000 (08:12 +0100)]
Merge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limit
LDAP: set up paged search even if limit is 0
Morris Jobke [Mon, 9 Mar 2015 07:02:09 +0000 (08:02 +0100)]
proper filename for "require version.php"
Morris Jobke [Mon, 9 Mar 2015 06:54:22 +0000 (07:54 +0100)]
Merge pull request #14743 from owncloud/autoconfig-password
Convert 'abcpassword' to 'abcpass' during setup
Jenkins for ownCloud [Mon, 9 Mar 2015 05:54:36 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 8 Mar 2015 06:54:36 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Robin McCorkell [Sat, 7 Mar 2015 13:10:43 +0000 (13:10 +0000)]
Convert 'abcpassword' to 'abcpass' during setup
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
Jenkins for ownCloud [Sat, 7 Mar 2015 06:54:37 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 6 Mar 2015 22:13:44 +0000 (23:13 +0100)]
Merge pull request #14736 from owncloud/errors-list
adjust list of errors, more compact and readable
Lukas Reschke [Fri, 6 Mar 2015 17:52:12 +0000 (18:52 +0100)]
Merge pull request #14722 from owncloud/master-14711
Fix totally broken AppStore code...
Thomas Müller [Fri, 6 Mar 2015 17:20:22 +0000 (18:20 +0100)]
Merge pull request #14734 from owncloud/unit-test-insertIfNotExist
[sqlite] Use an atomic implementation on sqlite for insertIfNotExist() + use it in the file cache ...
Thomas Müller [Fri, 6 Mar 2015 14:32:58 +0000 (15:32 +0100)]
use insertIfNotExist() in cache put
Jan-Christoph Borchardt [Fri, 6 Mar 2015 14:27:21 +0000 (15:27 +0100)]
adjust list of errors, more compact and readable
Thomas Müller [Fri, 6 Mar 2015 13:51:08 +0000 (14:51 +0100)]
Fix PHPDoc on the way ....
Thomas Müller [Fri, 6 Mar 2015 13:50:51 +0000 (14:50 +0100)]
Use an atomic implementation on sqlite for insertIfNotExist()
Jenkins for ownCloud [Fri, 6 Mar 2015 06:54:52 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Lukas Reschke [Thu, 5 Mar 2015 23:16:17 +0000 (00:16 +0100)]
Fix totally broken AppStore code...
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
Vincent Petry [Thu, 5 Mar 2015 21:23:47 +0000 (22:23 +0100)]
Fix size propagation over shared storage boundary
Arthur Schiwon [Thu, 5 Mar 2015 12:15:21 +0000 (13:15 +0100)]
set up paged search when limit is 0
Lukas Reschke [Thu, 5 Mar 2015 12:05:17 +0000 (13:05 +0100)]
Merge pull request #13368 from owncloud/memcache_lowlatency
Refactor \OC\Memcache\Factory
Robin McCorkell [Fri, 16 Jan 2015 13:38:55 +0000 (13:38 +0000)]
\OC\Memcache\Cache implements \OCP\ICache
Robin McCorkell [Wed, 14 Jan 2015 18:25:00 +0000 (18:25 +0000)]
Refactor \OC\Memcache\Factory
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`.
Jenkins for ownCloud [Thu, 5 Mar 2015 06:56:35 +0000 (01:56 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 4 Mar 2015 19:36:49 +0000 (20:36 +0100)]
Merge pull request #14691 from owncloud/karma-forcejasmine2
Make sure we use Jasmine 2 for running JS unit tests
Morris Jobke [Wed, 4 Mar 2015 19:21:14 +0000 (20:21 +0100)]
Merge pull request #14672 from Crote/master
Add --show-password option to ldap:show-config
Joas Schilling [Wed, 4 Mar 2015 12:24:24 +0000 (13:24 +0100)]
Log errors and create 404 in network list when a css or js is missing
Vincent Petry [Wed, 4 Mar 2015 16:55:24 +0000 (17:55 +0100)]
Merge pull request #14693 from owncloud/fix-phpdoc
Fix PHPDoc
Lukas Reschke [Wed, 4 Mar 2015 14:35:41 +0000 (15:35 +0100)]
Fix PHPDoc
That apparently went lost when changing the signature.
Vincent Petry [Wed, 4 Mar 2015 13:50:11 +0000 (14:50 +0100)]
Merge pull request #14690 from owncloud/trash-deletelink-unittest
Add unit test for selection overlay actions in trashbin
Laurens Post [Tue, 3 Mar 2015 15:17:50 +0000 (16:17 +0100)]
Add --show-password option to ldap:show-config
Vincent Petry [Wed, 4 Mar 2015 12:50:59 +0000 (13:50 +0100)]
Make sure we use Jasmine 2 for running JS unit tests
Vincent Petry [Wed, 4 Mar 2015 12:49:19 +0000 (13:49 +0100)]
Add unit test for selection overlay actions in trashbin
Morris Jobke [Wed, 4 Mar 2015 12:19:41 +0000 (13:19 +0100)]
Merge pull request #14685 from owncloud/test-noop-scanner
Add a test for ObjectStore\NoopScanner
Thomas Müller [Wed, 4 Mar 2015 11:27:59 +0000 (12:27 +0100)]
Merge pull request #14675 from owncloud/files-external-smb-windows
adding a windows smb config for testing to ci
Joas Schilling [Wed, 4 Mar 2015 10:37:35 +0000 (11:37 +0100)]
Add a test for ObjectStore\NoopScanner
Morris Jobke [Wed, 4 Mar 2015 09:30:09 +0000 (10:30 +0100)]
Merge pull request #14582 from rullzer/avatar_fixes
Avatars in share dialog fixes
Robin McCorkell [Tue, 3 Mar 2015 09:42:25 +0000 (09:42 +0000)]
Fix slash normalization error in AmazonS3Migration unit test
Since
aa821ecc00f11b6382f6e033db18445d9e51d6b9 leading and trailing slashes are
trimmed in the file cache paths
Vincent Petry [Wed, 4 Mar 2015 09:07:42 +0000 (10:07 +0100)]
Merge pull request #14682 from owncloud/issue/14681-noop-scanner-outdated
Update scanFile() and scanChildren() to the new signature of the parent ...
Morris Jobke [Wed, 4 Mar 2015 08:58:42 +0000 (09:58 +0100)]
Merge pull request #14326 from owncloud/remove-unnessary-backslashes-from-translation
Remove unnecessary backslashes from translations
Morris Jobke [Wed, 4 Mar 2015 08:36:01 +0000 (09:36 +0100)]
Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins
Let users configure security headers in their Webserver
Joas Schilling [Wed, 4 Mar 2015 08:22:53 +0000 (09:22 +0100)]
Update scanFile() and scanChildren() to the new signature of the parent class
Jenkins for ownCloud [Wed, 4 Mar 2015 06:55:19 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Roeland Jago Douma [Tue, 24 Feb 2015 20:46:24 +0000 (21:46 +0100)]
Avatars in share dialog fixes
* Avatar for "xxxx share with you..." to the left
* Avatars for groups and remote shares (use default placeholder)
* Modified and added unit tests
* Use the same css for all the avatars in the dropdown
Joas Schilling [Tue, 3 Mar 2015 17:33:08 +0000 (18:33 +0100)]
Merge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2
Jenkins #14650
Robin McCorkell [Mon, 2 Mar 2015 14:37:42 +0000 (14:37 +0000)]
Use dummy storages instead of real storages in files_external unit tests
We were using the SMB and SFTP backends, which since Icewind's new SMB library
results in an actual attempted connection just by constructing the storage.
This commit replaces all references to real storages (except when necessary)
with a dummy storage class.
Thomas Müller [Tue, 3 Mar 2015 15:50:59 +0000 (16:50 +0100)]
adding a windows smb config for testing
Joas Schilling [Mon, 2 Mar 2015 17:02:51 +0000 (18:02 +0100)]
Fix the behaviour of getLanguageCode() to match the expectation of the name
Joas Schilling [Mon, 2 Mar 2015 17:01:51 +0000 (18:01 +0100)]
Use findLanguage() instead of creating the object first
Joas Schilling [Mon, 2 Mar 2015 17:01:17 +0000 (18:01 +0100)]
Add a test of what everyone thinks should be the result of this method
Joas Schilling [Tue, 3 Mar 2015 15:43:47 +0000 (16:43 +0100)]
Merge pull request #14660 from metaworx/replace-static-dbtableprefix-with-config-dbtableprefix
use `dbtableprefix` for temp table and index names
Thomas Müller [Tue, 3 Mar 2015 13:22:56 +0000 (14:22 +0100)]
Merge pull request #14574 from owncloud/fix-irequest-for-older-php-versions
Read from IRequest instead of reading twice
Vincent Petry [Tue, 3 Mar 2015 12:59:03 +0000 (13:59 +0100)]
Added missing done() calls for async tests
Thomas Müller [Tue, 3 Mar 2015 12:37:54 +0000 (13:37 +0100)]
Merge pull request #14638 from owncloud/issue/14538-repairstep-drop-old-tables
Add a repair step to delete old tables
Thomas Müller [Tue, 3 Mar 2015 11:59:51 +0000 (12:59 +0100)]
Merge pull request #14586 from owncloud/proper-appcodechecker-docu
proper description of appcodechecker in config sample
Joas Schilling [Tue, 3 Mar 2015 10:27:06 +0000 (11:27 +0100)]
Add a test for dropping the tables
Thomas Müller [Tue, 3 Mar 2015 10:00:13 +0000 (11:00 +0100)]
Merge pull request #14496 from owncloud/kill-substr-mssql-master
[Master] Remove hacky Substring support for MSSQL
Morris Jobke [Tue, 3 Mar 2015 09:12:48 +0000 (10:12 +0100)]
Merge pull request #14653 from sebomoto/fix_loading_feedback
fix for loading spinner reappearing after errors in db-connection
Vincent Petry [Tue, 3 Mar 2015 09:10:15 +0000 (10:10 +0100)]
Merge pull request #14652 from owncloud/kill-download-from-url
Remove "Download from URL" feature
Joas Schilling [Mon, 23 Feb 2015 11:33:15 +0000 (12:33 +0100)]
Etc timezones don't exist for .5 and .75 offsets
Jenkins for ownCloud [Tue, 3 Mar 2015 06:55:50 +0000 (01:55 -0500)]
[tx-robot] updated from transifex