upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-26 00:55:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
30994 commits 1040 branches 1229 tags 6.8 GiB
Commit graph

30994 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
d282affec2 fix writing to cache when fallback server should be used immediately 2016-03-18 20:34:23 +01:00
Thomas Müller
382b18e85e Merge pull request #23309 from owncloud/backport-23164-stable9 
[stable9] Prevent certain DBs throwing exceptions on same-value updates
 2016-03-17 20:52:11 +01:00
Thomas Müller
9e5c5c804b Merge pull request #23358 from owncloud/stable9-backport-occ-typos 
Some typo corrections in occ command output
 2016-03-17 20:50:41 +01:00
Thomas Müller
7d80b20368 Merge pull request #23355 from owncloud/stable9_backport_23346 
[Stable 9] Set proper public webdav permissions when public upload disabled
 2016-03-17 17:14:13 +01:00
Carla Schroder
e7152f495c Some typo corrections in occ command output 2016-03-17 07:05:34 -07:00
Thomas Müller
00ef623f1c Merge pull request #23259 from owncloud/backport-22998 
[stable9] Delay check till scanner is used
 2016-03-17 14:29:39 +01:00
Roeland Jago Douma
9dfcb55a2f Set proper public webdav permissions when public upload disabled 
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
 2016-03-17 13:54:53 +01:00
Thomas Müller
ec4c5a3e75 Merge pull request #23128 from owncloud/contacts_calendar_name_color-stable9 
add title and color to birthday calendar
 2016-03-17 13:08:03 +01:00
Thomas Müller
f46225fa2c Merge pull request #23335 from owncloud/ext-user-mounting-gui-stable9 
[stable9] Display external storage GUI even if user mounting disabled
 2016-03-17 12:25:53 +01:00
Thomas Müller
f28f6a3001 Merge pull request #23302 from owncloud/fed-unshare-with-9 
[9.0] Specify the target user when unsharing a federated share
 2016-03-17 10:07:19 +01:00
Thomas Müller
25027c31ff Merge pull request #23313 from owncloud/check-syntax-travis-stable9 
[stable9] Execute parallel-lint
 2016-03-17 09:29:26 +01:00
Joas Schilling
b8af6e703a Don't try to execute a dav syntax test 2016-03-17 09:07:55 +01:00
Robin McCorkell
403eb87f4d Display external storage GUI even if user mounting disabled 2016-03-16 22:10:36 +00:00
Thomas Müller
ed4ed0e26f Merge pull request #23319 from owncloud/backport-23189-1 
[stable9] Require at least libxml 2.7.0
 2016-03-16 21:53:33 +01:00
Thomas Müller
24dcdf9d5c Merge pull request #23324 from owncloud/stable9-backport-23253 
[stable9] Give swift 15 seconds after startup
 2016-03-16 21:53:09 +01:00
Morris Jobke
3a773f4eca Give swift 15 seconds after startup 2016-03-16 18:08:42 +01:00
Lukas Reschke
e71ebf334d [stable9] Execute parallel-lint 
Backport of #22994 and #23303
 2016-03-16 17:31:18 +01:00
Thomas Müller
08b9193919 Merge pull request #23315 from owncloud/travis-stable9 
Execute travis on stable9 as well
 2016-03-16 17:29:27 +01:00
Lukas Reschke
dbcb037639 Require at least libxml 2.7.0 
Fixes https://github.com/owncloud/core/issues/23168
 2016-03-16 17:13:13 +01:00
Thomas Müller
adbc5bbd1f Merge pull request #23271 from owncloud/backport-23192 
[stable9] Backport 23192
 2016-03-16 16:50:04 +01:00
Thomas Müller
4720719b08 Merge pull request #23270 from owncloud/backport-fix-support-for-php7-in-htaccess 
[stable9] Backport fix support for php7 in htaccess
 2016-03-16 16:49:38 +01:00
Morris Jobke
7b818d9442 Execute travis on stable9 as well 
Backport of #23100 to stable9
 2016-03-16 15:39:07 +01:00
Robin McCorkell
aa91d50d04 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-16 14:50:00 +01:00
Robin Appelman
8c035ae6f6 Specify the target user when unsharing a federated share 2016-03-16 13:29:04 +01:00
Thomas Müller
d54106dada Merge pull request #23264 from owncloud/fix_22907_9.0 
allow group shares, even if not all public keys are available
 2016-03-16 11:18:51 +01:00
Lukas Reschke
cdadd4cd1b Fallback for crappy ancient distributions 
Fixes https://github.com/owncloud/core/issues/23181
 2016-03-15 17:14:53 +01:00
Lukas Reschke
6f7fc6c5db always_populate_raw_post_data has been removed with PHP 7.0 2016-03-15 17:03:19 +01:00
Lukas Reschke
9ef7340dc7 Add support for custom values in integrity checker 2016-03-15 17:03:16 +01:00
Lukas Reschke
d1978a6950 Replace all required values 2016-03-15 17:03:13 +01:00
Lukas Reschke
dfc7e6b421 Duplicate block for PHP 7 2016-03-15 17:03:09 +01:00
Thomas Müller
b580d26270 Merge pull request #23237 from owncloud/backport-22901 
[stable9] Add DAV authenticated also to other scopes
 2016-03-15 16:03:35 +01:00
Thomas Müller
5466a800fa Merge pull request #23252 from owncloud/invalid-share-storage-9 
[9.0] dont break when there is an invalid share
 2016-03-15 15:59:24 +01:00
Bjoern Schiessle
0f372a2a8c allow group shares, even if not all public keys are available 2016-03-15 15:13:55 +01:00
Lukas Reschke
987146d5db Delay check till scanner is used 
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
 2016-03-15 14:39:16 +01:00
Robin Appelman
9d688e655d move failedstorage to core 2016-03-15 12:49:12 +01:00
Robin Appelman
f29440dbbc dont break when there is an invalid share 2016-03-15 12:49:06 +01:00
Thomas Müller
5a6b2956d8 Merge pull request #23022 from owncloud/stable9_backport_22602 
[stable 9]   Do not check all chunks of a chunked upload if we do not need to
 2016-03-15 12:15:45 +01:00
Thomas Müller
99de93a6c6 Merge pull request #23075 from owncloud/backport-23074-oracle-ext-storage 
[9.0] Correctly escape join statements and use selectAlias
 2016-03-15 12:13:54 +01:00
Thomas Müller
4159187a6e Merge pull request #23229 from owncloud/backport-23218-memcached-exceptions-on-success 
[9.0] Fix errors in memcached implementation
 2016-03-15 12:10:23 +01:00
Thomas Müller
6f64c99653 Merge pull request #23230 from owncloud/backport-23191 
[stable9] Verify the getResponse returns a ResponseInterface
 2016-03-15 12:09:55 +01:00
Thomas Müller
ce0f28c123 Merge pull request #23231 from owncloud/backport-23190 
[stable9] Use proper URLs for search results
 2016-03-15 12:07:45 +01:00
Thomas Müller
cca3a249fd Merge pull request #23240 from owncloud/backport-23222 
backport of #23222
 2016-03-15 12:07:15 +01:00
Thomas Müller
0608455b01 Merge pull request #23247 from owncloud/stable9_backport_23226 
[stable 9] Generate a valid URL for link notification
 2016-03-15 12:06:41 +01:00
Roeland Jago Douma
3a5e90fa03 Generate a valid URL for link notification 
fixes #23197

* Updated unit test
 2016-03-15 07:34:53 +01:00
Phiber2000
e2c557ab82 backport of #23222 (#23225) 2016-03-14 17:59:40 +01:00
Lukas Reschke
e1727477ac Add DAV authenticated also to other scopes 
Fixes https://github.com/owncloud/core/issues/22893
 2016-03-14 17:57:37 +01:00
Thomas Müller
cf232c4182 Merge pull request #23112 from owncloud/backport-23086-stable9 
[9.0] remove deprecated ldap_sort
 2016-03-14 17:16:36 +01:00
Thomas Müller
efa673136e Merge pull request #23223 from owncloud/backport-23091-case-insensitive-group-sharing 
[9.0] Case insensitive group sharing
 2016-03-14 16:33:51 +01:00
Thomas Müller
3380a3af74 Merge pull request #22949 from owncloud/stable9-fix-group-share-migration-for-calendars-and-contacts 
Fix group sharing and sharing permissions - fixes #22932
 2016-03-14 16:31:08 +01:00
Thomas Müller
80d0e43fc7 Merge pull request #22933 from owncloud/stable9-backport-22872 
[stable9] Update error text for link passwords
 2016-03-14 16:20:00 +01:00