Commit Graph

31113 Commits

Author SHA1 Message Date
Thomas Müller 8237baba68 Merge pull request #23303 from owncloud/exclude-only-specific-third-party
Exclude only known failing third-party files
2016-03-17 09:50:02 +01:00
Thomas Müller 48a7f126fd Merge pull request #23326 from owncloud/manishbisht-combined-database-errors
[CI] Installation: Combined database errors
2016-03-17 09:33:26 +01:00
Thomas Müller b5c56a7322 Merge pull request #23336 from owncloud/occ-typos
Some typo corrections in occ command output
2016-03-17 09:31:11 +01:00
Thomas Müller a20cf140c3 Merge pull request #23340 from owncloud/dont-try-to-test-syntax-as-dav-test
Don't try to execute a dav syntax test
2016-03-17 09:28:44 +01:00
Joas Schilling a400c5963b Don't try to execute a dav syntax test 2016-03-17 08:58:03 +01:00
Jenkins for ownCloud ace1812026 [tx-robot] updated from transifex 2016-03-17 01:56:06 -04:00
Carla Schroder 0c9eaede41 Some typo corrections in occ command output 2016-03-16 16:14:25 -07:00
Thomas Müller f3f08cf910 Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff
Fallback for crappy ancient distributions
2016-03-16 21:56:36 +01:00
Thomas Müller 8b5a1bbe3e Merge pull request #23258 from owncloud/sharee-tests
Add integration tests for sharee endpoint
2016-03-16 21:54:20 +01:00
Manish Bisht 07e7d4836e Update oci.php
Error Fixed

combined the database errors

Merged Database Errors
2016-03-16 19:21:14 +01:00
Thomas Müller b4ea527fb2 Merge pull request #23253 from owncloud/give-swift-more-time
Give swift 15 seconds after startup
2016-03-16 17:32:55 +01:00
Thomas Müller d188ed938c Merge pull request #23082 from owncloud/contacts_calendar_name_color
add title and color to birthday calendar
2016-03-16 17:17:21 +01:00
Thomas Müller 596bc3bab2 Merge pull request #23300 from owncloud/smb-not-available
handle connection errors as storage not available in smb
2016-03-16 16:50:35 +01:00
Morris Jobke e7e743bdb4 Give swift 15 seconds after startup 2016-03-16 16:16:04 +01:00
Lukas Reschke ea9d225a1f Exclude only known failing third-party files
This way we can also scan the third-party folder for incompatibilities with a used PHP version. Since there are some polyfills that would otherwise fail I had to exclude them manually here.
2016-03-16 13:32:36 +01:00
Robin Appelman d498282e12 handle connection errors as storage not available in smb 2016-03-16 13:15:54 +01:00
Thomas Müller 2f5b929ee9 Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1
Ensure that stored version is at least 1 for cross-storage copy
2016-03-16 13:14:36 +01:00
Thomas Müller 09a5b4076b Merge pull request #22994 from owncloud/check-syntax-on-travis
Check the syntax on travis
2016-03-16 13:13:34 +01:00
Thomas Müller 5f00724e5b Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0
Require at least libxml 2.7.0
2016-03-16 13:11:59 +01:00
Lukas Reschke dc364222d9 Execute PHP Parallel Linter on Travis 2016-03-16 12:17:58 +01:00
Thomas Müller 225eebd8f9 Merge pull request #23155 from owncloud/fed-unshare-with
Specify the target user when unsharing a federated share
2016-03-16 11:19:09 +01:00
Lukas Reschke 676041ba7e Ensure that stored version is at least 1 for cross-storage copy
In case of a move operation from an unencrypted to an encrypted
storage the old encrypted version would stay with "0" while the
correct value would be "1". Thus we manually set the value to "1"
for those cases.

See also https://github.com/owncloud/core/issues/23078
2016-03-16 10:36:15 +01:00
Jenkins for ownCloud 631ae2f0f4 [tx-robot] updated from transifex 2016-03-16 01:55:43 -04:00
Thomas Müller f7140294f2 Merge pull request #23157 from owncloud/remove-share-prop-entries
remove old share propagation entries from appconfig
2016-03-15 16:04:17 +01:00
Thomas Müller 27760ae54e Merge pull request #23164 from owncloud/db-connection-precondition-fix
Prevent certain DBs throwing exceptions on same-value updates
2016-03-15 16:03:55 +01:00
Thomas Müller 7b06dd485d Merge pull request #23250 from owncloud/fix-support-for-php7-in-htaccess
Fix several .htaccess and .user.ini related problems
2016-03-15 16:03:18 +01:00
Thomas Müller 8feb42c22e Merge pull request #23251 from owncloud/fix_22907
allow group shares, even if not all public keys are available
2016-03-15 16:00:47 +01:00
Joas Schilling cb56dfec6b Split the context so we don't reset the config on each test 2016-03-15 14:53:16 +01:00
Joas Schilling c4b0a1cdfd Add tests for user enumeration and sharing in group only 2016-03-15 14:24:51 +01:00
Joas Schilling 4e9c3b3d64 Always use the admin when putting poeple in a group 2016-03-15 14:24:21 +01:00
Joas Schilling 8eb9638490 Make the app config code ready for reuse 2016-03-15 14:23:41 +01:00
Robin McCorkell 1b2f1cc272 Prevent certain DBs throwing exceptions on same-value updates
A PreconditionNotMetException must only be thrown if explicit
preconditions are specified for setValues(), not if the value is merely
the same as was already in the DB.
2016-03-15 13:02:19 +01:00
Thomas Müller ad9a0804f3 Merge pull request #23226 from owncloud/fix_23190
Generate a valid URL for link notification
2016-03-15 12:55:13 +01:00
Robin Appelman 0aa83511a1 remove old share propagation entries from appconfig 2016-03-15 12:50:22 +01:00
Thomas Müller d4a8d5d2ea Merge pull request #22998 from owncloud/delay-loading-the-scanner
Delay check till scanner is used
2016-03-15 12:16:02 +01:00
Thomas Müller 0f6ea9fd29 Merge pull request #23039 from owncloud/invalid-share-storage
dont break when there is an invalid share
2016-03-15 12:15:05 +01:00
Thomas Müller e9eeb3607f Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilder-api
Correctly escape join statements and use selectAlias
2016-03-15 12:14:17 +01:00
Bjoern Schiessle 9de4a8338e allow group shares, even if not all public keys are available 2016-03-15 11:33:19 +01:00
Lukas Reschke ee84017192 always_populate_raw_post_data has been removed with PHP 7.0 2016-03-15 11:28:14 +01:00
Roeland Jago Douma 1db82073a4 Generate a valid URL for link notification
fixes #23197

* Updated unit test
2016-03-15 11:10:24 +01:00
Lukas Reschke 5278bfe0e4 Add support for custom values in integrity checker 2016-03-15 10:41:17 +01:00
Lukas Reschke c7abd307c0 Replace all required values 2016-03-15 10:41:17 +01:00
Lukas Reschke 2cfde7cd0b Duplicate block for PHP 7 2016-03-15 10:41:17 +01:00
Lukas Reschke f8180579d0 Merge pull request #23243 from owncloud/revert-23171-master
Revert "Removed unnecessary check 'installed' system value' call."
2016-03-15 10:40:59 +01:00
Lukas Reschke 0b0077e62d Revert "Removed unnecessary check 'installed' system value' call." 2016-03-15 10:23:40 +01:00
Jenkins for ownCloud 2c6617da60 [tx-robot] updated from transifex 2016-03-15 01:55:47 -04:00
Thomas Müller 9657f9a01b Merge pull request #23171 from maxolasersquad/master
Removed unnecessary check 'installed' system value' call.
2016-03-14 17:18:36 +01:00
Joas Schilling 928138f11c Deduplicate the existing background 2016-03-14 17:16:09 +01:00
Thomas Müller a058bb0d7e Merge pull request #23225 from owncloud/Phiber2000-fix_logtimezone
fix broken logtimezone
2016-03-14 17:08:48 +01:00
Thomas Müller b25077748e Merge pull request #22901 from owncloud/add-dav-authenticated
Add DAV authenticated also to other scopes
2016-03-14 16:33:09 +01:00