upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-16 02:19:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 51
31019 commits 966 branches 1208 tags 8.1 GiB
Commit graph

12922 commits

Author SHA1 Message Date
Thomas Müller
da95db78d0 Merge pull request #23436 from owncloud/backport-23388-infinite-cronjob 
[9.0] Do not create a new job when it failed to connect atm
 2016-03-21 18:05:30 +01:00
Joas Schilling
1a239b2f0d Do not create a new job when it failed to connect atm 2016-03-21 14:00:29 +01:00
Thomas Müller
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
Joas Schilling
064e13511f Make sure to append the web root as per doc 2016-03-18 13:36:51 +01:00
Roeland Jago Douma
df056e1299 Remove duplicated copyright 2016-03-18 11:38:02 +01:00
Vincent Petry
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
Vincent Petry
fb705fa305 Add webdav property for share info in PROPFIND response 2016-03-18 11:36:39 +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
Robin McCorkell
403eb87f4d Display external storage GUI even if user mounting disabled 2016-03-16 22:10:36 +00:00
Morris Jobke
3a773f4eca Give swift 15 seconds after startup 2016-03-16 18:08:42 +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
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
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
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
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
2609bf3500 Merge pull request #23114 from owncloud/no-fatal-error-if-DSTART-is-not-set-stable9 
No fatal error if dstart is not set stable9
 2016-03-14 16:14:03 +01:00
Thomas Müller
884a3b9bb4 Merge pull request #23105 from owncloud/readonly-birthday-cal-stable9 
The birthday_calendar is read-only
 2016-03-14 16:07:42 +01:00
Joas Schilling
a9ed80869a Correctly lower the search input as well 2016-03-14 13:48:45 +01:00
Joas Schilling
5b593450c3 Return the correct group casing in sharee api 2016-03-14 13:48:13 +01:00
Thomas Müller
dac69225d2 Merge pull request #23102 from owncloud/stable9-backport-23094 
[stable9] Fake LOCK statement for Windows 7, 8 and 10 network mounts
 2016-03-13 19:51:26 +01:00
Thomas Müller
b752a08d63 Merge pull request #23127 from owncloud/fix-getOwner-on-fileshome-stable9 
getOwner is not available on FileHome - fixes #23116
 2016-03-11 15:05:20 +01:00
Thomas Müller
e3de44ea51 Merge pull request #23060 from owncloud/stable9_backport_23056 
[stable 9] Add mimetype to OCS Share API output
 2016-03-11 14:51:21 +01:00
Thomas Müller
aeb480a8c3 Merge pull request #23113 from owncloud/allow-migrating-all-calendars-stable9 
Allow to migrate calendars of all users
 2016-03-10 23:10:41 +01:00
Georg Ehrke
b0c7eba7d0 add title and color to birthday calendar 2016-03-10 22:55:32 +01:00
Thomas Müller
e89f27e191 getOwner is not available on FileHome - fixes #23116 2016-03-10 22:51:02 +01:00
Thomas Müller
62a36ee884 The birthday_calendar is read-only 2016-03-10 21:36:11 +01:00
Thomas Müller
a58e374956 Merge pull request #22909 from owncloud/backport-22244-prevent-calendar-proppatch 
[9.0] Prevent calendar proppatch for share recipients
 2016-03-10 21:32:38 +01:00
Thomas Müller
36b543c490 fixes #23004 2016-03-10 17:59:02 +01:00
Thomas Müller
8465f9b6c6 fixes #23020 2016-03-10 17:58:53 +01:00
Joas Schilling
7126b64088 Allow to migrate calendars of all users 2016-03-10 17:47:08 +01:00
Arthur Schiwon
38d137c34c remove deprecated ldap_sort 2016-03-10 17:08:25 +01:00
Morris Jobke
098ce188b7 Fake LOCK statement for Windows 7, 8 and 10 network mounts 
* fixes #22596
 2016-03-10 15:57:33 +01:00
Joas Schilling
09febaad49 Correctly escape join statements and use selectAlias 2016-03-10 10:28:39 +01:00
Thomas Müller
4e90bc017e Merge pull request #22825 from owncloud/backport-22778-stable9 
[backport] [stable9] untangle different user manager instances, fixes #22770
 2016-03-10 08:26:11 +01:00
Thomas Müller
b017434302 Merge pull request #23024 from owncloud/stable9-backport-22986 
[stable9] Remove disabled autocorrect for new file names
 2016-03-09 21:44:47 +01:00
Roeland Jago Douma
48cdf38d00 Add mimetype to OCS Share API output 
Fixes #23044
 2016-03-09 21:28:38 +01:00