Commit Graph

31258 Commits

Author SHA1 Message Date
Thomas Müller de915934e6 Merge pull request #24538 from owncloud/fix-oracle-ci-stable9
[stable9] Wait a while even after successful connect ...
2016-05-11 19:20:48 +02:00
Thomas Müller 7de566b7c0
Wait a while even after successful conect ... 2016-05-11 18:25:01 +02:00
Thomas Müller d9a2b85059 Merge pull request #24502 from owncloud/stable9-updater-server-configurable
[stable9] Make update server URL configurable
2016-05-11 16:43:41 +02:00
Thomas Müller 877a8f09b4 Merge pull request #24574 from owncloud/stable9_24568
[Stable 9] Fix etag propegation test race condition
2016-05-11 16:29:08 +02:00
Roeland Jago Douma 8aebab9853
Fix test race condition
E-tag propagation replies on the mtime of the file. Order of events:

1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.

Now this goes right often when 1 and 2 happen in the same second.
However imagine

1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)

Now the mtime will be set to the same time. Thus not chaning the etag.
2016-05-11 14:54:21 +02:00
Lukas Reschke 3505776b6e
Make update server URL configurable
Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates.
2016-05-11 14:37:53 +02:00
Thomas Müller d7da0ac1dc Merge pull request #24384 from owncloud/backport-24327-memory-usage-in-callForAllUsers
[9.0] Better callForAllUsers memory usage
2016-05-11 14:37:13 +02:00
Thomas Müller 6c6cf01af1 Merge pull request #24554 from owncloud/kill-en@pirate-stable9
[stable9] Yo-ho-oh - Murder all band 'o pirates
2016-05-11 13:25:14 +02:00
Thomas Müller 750aeda8b7
Yo-ho-oh - Murder all band 'o pirates - backport of #24550 2016-05-11 11:22:08 +02:00
Thomas Müller 45413d7952 Merge pull request #24541 from owncloud/stable9-backport-23705
[stable9] Fixed 'Help Translate' link
2016-05-11 09:38:56 +02:00
Pau 5d73670686
Fixed 'Help Translate' link 2016-05-10 17:24:56 +02:00
Thomas Müller a3bdcfbb90 Merge pull request #24446 from weits/cherry_webdav
solves problem with moving files via WebDAV
2016-05-09 09:17:59 +02:00
Petr Svoboda 7fb631a13b solves problem with moving files via WebDAV
When moving files via WebDAV I sometimes got 

PHP Fatal error:  Nesting level too deep - recursive dependency? in /var/www/owncloud/lib/private/files/view.php on line 729

This small change has fixed the problem for me
2016-05-04 17:23:12 +02:00
C Montero-Luque e13d02de2d 9.0.2 2016-05-03 04:37:42 -04:00
Joas Schilling bbcef57d2a
When we iterate over all users that might be too much memory 2016-05-02 13:03:56 +02:00
Joas Schilling 13ea66e791
Don't loop over the backends, we already know where the user should be 2016-05-02 13:03:47 +02:00
C Montero-Luque fb82321090 9.0.2 RC2 2016-05-02 04:14:16 -04:00
C. Montero Luque 218a206a6e Merge pull request #24343 from owncloud/stable9_24326
[Stable 9] Make ownCloud work again in php 7.0.6
2016-05-02 04:09:23 -04:00
Roeland Jago Douma a834531aef
Make ownCloud work again in php 7.0.6
See https://bugs.php.net/bug.php?id=72117
Basically a bugfix in php caused this issue. So isset is not called more
often. We have to catch this.
2016-05-01 12:31:26 +02:00
Thomas Müller ec1a66b8a6 Merge pull request #24311 from owncloud/more-intelligent-update-detection
[stable9] Check for hash instead of file existence
2016-04-28 07:02:12 +02:00
Lukas Reschke 145810dc20
Check for hash instead of file existence
The previous logic did not necessarily trigger in every case. This logic is more error-resistant, the autoload_classmap.php file has a guaranteed different hash on 9.0.0, 9.0.1 and 9.0.2

Fixes https://github.com/owncloud/updater/issues/342
2016-04-27 15:46:24 +02:00
C Montero-Luque 795f321a19 9.0.2 RC1 2016-04-26 21:22:56 -04:00
C. Montero Luque d359311afc Merge pull request #24294 from owncloud/stable9-remove-pcntl-warning
Remove pcntl warning for 9.0.2
2016-04-26 21:19:30 -04:00
C. Montero Luque 1c23fa5d16 Merge pull request #24289 from owncloud/local-invalid-9
[9.0] error out if a local storage isn't setup correctly
2016-04-26 21:19:23 -04:00
C. Montero Luque fe753fe722 Merge branch 'stable9' into local-invalid-9 2016-04-26 16:46:23 -04:00
C. Montero Luque 62a35d3f7a Merge branch 'stable9' into stable9-remove-pcntl-warning 2016-04-26 16:46:12 -04:00
C. Montero Luque 98820f2af3 Merge pull request #24292 from owncloud/stable9-work-around-more-updater-issues
[stable9] Also exclude __apps
2016-04-26 14:51:09 -04:00
C. Montero Luque 4f5c03e310 Merge pull request #24261 from owncloud/scanner-propagate-9
[9.0] triger the propagator from the command line scanner
2016-04-26 14:50:02 -04:00
C. Montero Luque 36bba77575 Merge pull request #24282 from owncloud/backport-24262-stable9
[stable9] check whether index is set before using it
2016-04-26 14:49:51 -04:00
C. Montero Luque 438d451391 Merge pull request #24281 from owncloud/backport-disable-paste-zone
[stable9] Disable pastezone for jquery.fileupload
2016-04-26 14:49:38 -04:00
Robin Appelman 884c8215f8
add tests 2016-04-26 20:17:17 +02:00
Robin Appelman 06bfd58b2c
error out if a local storage isn't setup correctly 2016-04-26 20:17:17 +02:00
Lukas Reschke 9a1688db7c Merge pull request #24278 from owncloud/stable9-more-sanity
[stable9] Don't write empty RewriteBase
2016-04-26 20:16:23 +02:00
Lukas Reschke 7ee7d091f2
Don't write empty RewriteBase
ownCloud may be configured to live at the root folder without a
trailing slash being specified. In this case manually set the
rewrite base to `/`
2016-04-26 20:13:20 +02:00
Victor Dubiniuk ffe561df62 Remove pcntl warning for now 2016-04-26 21:08:33 +03:00
Lukas Reschke 590ed3edda
Also exclude __apps
Workaround for https://github.com/owncloud/updater/issues/331 for 9.0.2
2016-04-26 19:18:31 +02:00
Lukas Reschke a70d6f6a62
Disable pastezone for jquery.fileupload
jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS.

This implementation triggers some problems:

1. The pastezone is defined globally by default (🙈). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads.
2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>.
3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created.

Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled.

Lesson learned: Third-party JS libraries can have some weird details.
2016-04-26 14:37:40 +02:00
Arthur Schiwon e542bfd1d7
check whether index is set before using it 2016-04-26 14:36:24 +02:00
Thomas Müller 1087385cae Merge pull request #24259 from owncloud/stable9-mount-unique
[stable9] don't get the config for the same mount multiple times
2016-04-26 14:35:12 +02:00
Thomas Müller 80a31b7565 Merge pull request #24242 from owncloud/stable9-backport-24052
[stable9] Fix LDAP race conditions
2016-04-26 14:34:57 +02:00
Thomas Müller 6c861f71eb Merge pull request #24202 from owncloud/backport-stable9-23972
[9.0] Call private cache methods only for `OC\Files\Cache\Cache`
2016-04-25 23:10:51 +02:00
Thomas Müller bec8465902 Merge pull request #24250 from owncloud/scanner-locking-9
[9.0] add locks in the scanner to prevent multiple scanners running on the …
2016-04-25 23:03:20 +02:00
Thomas Müller b425a0e307 Merge pull request #24236 from owncloud/backport-24214-stable9
[stable9] on clone Connection, do not take over the existing LDAP resource
2016-04-25 23:03:05 +02:00
Robin Appelman 1397d9a93c triger the propagator from the command line scanner 2016-04-25 18:29:57 +02:00
Robin Appelman b375086c47
add test 2016-04-25 17:43:52 +02:00
Robin Appelman d436326e19
don't get the config for the same mount multiple times 2016-04-25 17:43:40 +02:00
Robin Appelman 51f5edd749 add locks in the scanner to prevent multiple scanners running on the same files 2016-04-25 15:46:04 +02:00
Daniel Jagszent 1aa8765177
[9.0] Call private cache methods only for `OC\Files\Cache\Cache` 2016-04-25 14:55:05 +02:00
Thomas Müller 5925ab99f8 Merge pull request #24241 from owncloud/backport-24240-add-missing-use-statement
Add missing use statement
2016-04-25 14:45:58 +02:00
Joas Schilling dd415b62f5
Add missing use statement 2016-04-25 13:34:20 +02:00