3d9187e231
Merge pull request #23390 from owncloud/stable9-share-keepoptioncheckboxinblocks
...
[stable9] Keep share checkboxes together
2016-03-21 14:15:40 +01:00
6afac05937
Merge pull request #23389 from owncloud/backport-23287-fed-share-action-links
...
[9.0] Make sure to append the web root as per doc
2016-03-21 11:16:15 +01:00
571de654cd
Merge pull request #23378 from owncloud/stable9-backport-23370
...
[stable9] Update avatar on username change if avatar is set
2016-03-21 09:49:32 +01:00
546a0929a6
Merge pull request #23163 from owncloud/stable9-wording
...
[stable9] Adjust wording a bit
2016-03-21 09:48:49 +01:00
fefaa1fd87
Merge pull request #23293 from owncloud/backport-23108
...
[stable9] Ensure that stored version is at least 1 for cross-storage copy
2016-03-21 09:48:15 +01:00
ce0f68c7ce
Merge pull request #23382 from owncloud/backport-fix-htaccess-issues
...
[stable9] Write .htaccess update only if not already written
2016-03-21 09:42:57 +01:00
660c0da0a9
Merge pull request #23384 from owncloud/stable9-dav-sharesproperty
...
[stable9] Add webdav share-types property to fix favorites/tags share status icon
2016-03-21 09:42:36 +01:00
179ac2b98c
Merge pull request #23387 from owncloud/stable9-systemtags-create-same-prefix
...
[stable9] Allow creating tags where another one with same prefix exists
2016-03-21 09:42:18 +01:00
8ef8be6be5
Keep share checkboxes together
...
- removed leading spaces before markup which can affect rendering in
some cases
- added shareOption CSS class to group and keep share option checkbox +
label
- moved ".showCruds" arrow into the matching shareOption to keep the
arrow together with the checkbox
2016-03-18 14:16:26 +01:00
064e13511f
Make sure to append the web root as per doc
2016-03-18 13:36:51 +01:00
a7dfc70e2e
Allow creating tags where another one with same prefix exists
...
When creating a new entry, compare the full tag name and not only the
prefix.
2016-03-18 12:32:29 +01:00
df056e1299
Remove duplicated copyright
2016-03-18 11:38:02 +01:00
26deb0a897
Add intergration tests
...
Intergration tests to ensure the share-types property is set correctly.
* Unshared item
* Shared with user
* Shared with group
* Shared by link
* Shared with user & group & link
2016-03-18 11:37:56 +01:00
3c77311397
Display share status info in favorite list
...
Returns the shareTypes share status info to the favorites file list.
2016-03-18 11:36:43 +01:00
fb705fa305
Add webdav property for share info in PROPFIND response
2016-03-18 11:36:39 +01:00
1fdf790c8f
Write .htaccess update only if not already written
...
The ownCloud update routine also runs the "updateHtaccess" code in case only an application gets updated. This leads to having entries multiple time in the .htaccess file leading to unpredictable behaviour.
With 9.0 we added the "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" entry to the .htaccess file, this change uses it to ensure that only to the .htaccess gets written if the file has not been modified already. Since the .htaccess modifications are optional this is not a big deal.
Without this change updates of applications can break the rewrite rules (ending in endless redirects) as well as breaking the code integrity checker.
2016-03-18 09:18:46 +01:00
d65c3a77e2
Update avatar on username change if avatar is set
...
* fixes #20455
2016-03-18 08:51:29 +01:00
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
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
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
e7152f495c
Some typo corrections in occ command output
2016-03-17 07:05:34 -07:00
00ef623f1c
Merge pull request #23259 from owncloud/backport-22998
...
[stable9] Delay check till scanner is used
2016-03-17 14:29:39 +01:00
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
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
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
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
25027c31ff
Merge pull request #23313 from owncloud/check-syntax-travis-stable9
...
[stable9] Execute parallel-lint
2016-03-17 09:29:26 +01:00
b8af6e703a
Don't try to execute a dav syntax test
2016-03-17 09:07:55 +01:00
403eb87f4d
Display external storage GUI even if user mounting disabled
2016-03-16 22:10:36 +00:00
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
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
3a773f4eca
Give swift 15 seconds after startup
2016-03-16 18:08:42 +01:00
e71ebf334d
[stable9] Execute parallel-lint
...
Backport of #22994 and #23303
2016-03-16 17:31:18 +01:00
08b9193919
Merge pull request #23315 from owncloud/travis-stable9
...
Execute travis on stable9 as well
2016-03-16 17:29:27 +01:00
dbcb037639
Require at least libxml 2.7.0
...
Fixes https://github.com/owncloud/core/issues/23168
2016-03-16 17:13:13 +01:00
adbc5bbd1f
Merge pull request #23271 from owncloud/backport-23192
...
[stable9] Backport 23192
2016-03-16 16:50:04 +01:00
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
7b818d9442
Execute travis on stable9 as well
...
Backport of #23100 to stable9
2016-03-16 15:39:07 +01:00
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
8c035ae6f6
Specify the target user when unsharing a federated share
2016-03-16 13:29:04 +01:00
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
f9ad57ee52
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:37:41 +01:00
cdadd4cd1b
Fallback for crappy ancient distributions
...
Fixes https://github.com/owncloud/core/issues/23181
2016-03-15 17:14:53 +01:00
6f7fc6c5db
always_populate_raw_post_data has been removed with PHP 7.0
2016-03-15 17:03:19 +01:00
9ef7340dc7
Add support for custom values in integrity checker
2016-03-15 17:03:16 +01:00
d1978a6950
Replace all required values
2016-03-15 17:03:13 +01:00
dfc7e6b421
Duplicate block for PHP 7
2016-03-15 17:03:09 +01:00
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
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
0f372a2a8c
allow group shares, even if not all public keys are available
2016-03-15 15:13:55 +01:00
Thomas Müller
Vincent Petry
Joas Schilling
Roeland Jago Douma
Lukas Reschke
Morris Jobke
Carla Schroder
Robin McCorkell
Robin Appelman
Bjoern Schiessle