wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31097 commits 157 branches 562 tags 714 MiB
Commit graph

31097 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin McCorkell
a51ece97e3 Display external storage GUI even if user mounting disabled 2016-03-16 22:06:49 +00: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
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
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
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
Thomas Müller
3661b47b6d Merge pull request #23124 from owncloud/improved-rewrite-rule 
Improved rewrite rule
 2016-03-14 16:13:50 +01:00
Thomas Müller
f6a5fe452d Merge pull request #23190 from owncloud/use-proper-url-for-search-results 
Use proper URLs for search results
 2016-03-14 16:11:17 +01:00
Thomas Müller
d219284961 Merge pull request #23191 from owncloud/fix-external-dav-storage 
Verify the getResponse returns a ResponseInterface
 2016-03-14 16:10:40 +01:00
Thomas Müller
0b6eaa863d Merge pull request #23208 from owncloud/reduce-unneeded-methods 
Replace unneded OC::needUpgrade with OCP method
 2016-03-14 16:10:19 +01:00
Thomas Müller
6023fadaf4 Merge pull request #23211 from owncloud/cleanup-federation-tests 
Only match LOCAL and REMOTE as servers, correctly make use of the sha…
 2016-03-14 16:09:57 +01:00
Thomas Müller
852acd364a Merge pull request #23218 from owncloud/memcached-not-found-on-remove-means-success 
Fix errors in memcached implementation
 2016-03-14 16:08:47 +01:00
Phiber2000
3e7b2810e2 fix broken logtimezone 2016-03-14 15:10:47 +01:00
Vincent Petry
2934b7e694 Merge pull request #23214 from owncloud/issue-23076-max-key-for-memcache-urls 
Shorter cache key for URL entries
 2016-03-14 15:03:25 +01:00
Robin Appelman
7d42bdfde0 Specify the target user when unsharing a federated share 2016-03-14 14:34:05 +01:00
Joas Schilling
2f67aa9bc4 Fix errors in memcached implementation 2016-03-14 12:39:34 +01:00
Joas Schilling
c3c491689b Shorter cache key for URL entries 2016-03-14 11:05:46 +01:00
Joas Schilling
f62a7b2447 Only match LOCAL and REMOTE as servers, correctly make use of the sharer server from the command 2016-03-14 10:55:52 +01:00
Morris Jobke
0864851001 Replace unneded OC::needUpgrade with OCP method 2016-03-14 10:10:29 +01:00
Jenkins for ownCloud
e0998c27ff [tx-robot] updated from transifex 2016-03-14 01:56:12 -04:00
Thomas Müller
31aeca32c2 Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1 
Mark testing app as compatible with 9.1
 2016-03-13 19:59:47 +01:00