Commit Graph

12983 Commits

Author SHA1 Message Date
Thomas Müller e983bd7db0 Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser
In debugging mode we enable Sabre's browser plugin since it helps a l…
2016-03-21 10:13:27 +01:00
Thomas Müller c77412b1ac Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled
disable the recovery key if the master key is enabled
2016-03-21 09:49:15 +01:00
Thomas Müller 8442516e10 Merge pull request #23329 from owncloud/fix-21555
Avatar must be saved after login is done and external storages set up…
2016-03-21 09:47:50 +01:00
Jenkins for ownCloud 35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Jenkins for ownCloud 1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud 9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Jenkins for ownCloud a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Thomas Müller 0bc51b9118 Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory
Fix dropbox storage to not store the whole file in memory
2016-03-17 20:52:41 +01:00
Thomas Müller 31ee463690 Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap
fix writing to cache when fallback server should be used immediately
2016-03-17 20:52:22 +01:00
Thomas Müller d6d59fe227 Merge pull request #23346 from owncloud/fix_23325
Set proper public webdav permissions when public upload disabled
2016-03-17 20:51:54 +01:00
Thomas Müller 520724d757 Necessary code changes to make browser plugin properly work 2016-03-17 18:00:06 +01:00
Thomas Müller 7d638fdb34 In debugging mode we enable Sabre's browser plugin since it helps a lot when debugging 2016-03-17 16:51:19 +01:00
Thomas Müller 8fb3e44610 Merge pull request #23287 from owncloud/issue-22786-absolute-paths
Fix absolute path creation for remote shares with /oc webroot
2016-03-17 14:29:57 +01:00
Roeland Jago Douma 533fdb4075 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 11:35:31 +01:00
Thomas Müller 828cb08d49 Merge pull request #23334 from owncloud/ext-user-mounting-gui
Display external storage GUI even if user mounting disabled
2016-03-17 09:55:23 +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
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
Robin McCorkell a51ece97e3 Display external storage GUI even if user mounting disabled 2016-03-16 22:06:49 +00: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
Arthur Schiwon d8621c78ed Avatar must be saved after login is done and external storages set up properly, fixes #21555 2016-03-16 20:51:03 +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
Morris Jobke e7e743bdb4 Give swift 15 seconds after startup 2016-03-16 16:16:04 +01:00
Arthur Schiwon 8e0bd5630c fix writing to cache when fallback server should be used immediately 2016-03-16 14:44:18 +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 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
Joas Schilling 140d5f7df3 Make sure to append the web root as per doc 2016-03-16 09:37:48 +01:00
Jenkins for ownCloud 631ae2f0f4 [tx-robot] updated from transifex 2016-03-16 01:55:43 -04:00
Vincent Petry ab50ba7a58 Fix dropbox storage to not store the whole file in memory
Since the library can only store the full response in memory on
download, we use an alternate client lib and set the correct headers to
be able to stream the content to a temp file.
2016-03-15 18:05:27 +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
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
Jenkins for ownCloud 2c6617da60 [tx-robot] updated from transifex 2016-03-15 01:55:47 -04:00
Robin Appelman 7d42bdfde0 Specify the target user when unsharing a federated share 2016-03-14 14:34:05 +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
Thomas Müller 101e446577 Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-search
Return the correct group casing in sharee api
2016-03-13 19:51:07 +01:00
Lukas Reschke 239f1c067c Mark testing app as compatible with 9.1 2016-03-13 19:47:30 +01:00
Roeland Jago Douma 6509220f82 Fix intergration tests 2016-03-13 13:31:28 +01:00
Roeland Jago Douma 4b1fe0083a Remove the old OCS Share API code 2016-03-13 13:31:28 +01:00
Lukas Reschke 3a5f58c9b0 Fallback for crappy ancient distributions
Fixes https://github.com/owncloud/core/issues/23181
2016-03-12 23:11:31 +01:00
Jenkins for ownCloud 5862a067d9 [tx-robot] updated from transifex 2016-03-12 01:55:36 -05:00
Joas Schilling aad8aa0970 Correctly lower the search input as well 2016-03-11 14:08:13 +01:00
Joas Schilling 8cd52ed36d Return the correct group casing in sharee api 2016-03-11 14:08:12 +01:00
Robin Appelman a8db587b1f move failedstorage to core 2016-03-11 13:15:45 +01:00
Robin Appelman 3bd6fc797d dont break when there is an invalid share 2016-03-11 13:15:45 +01:00
Thomas Müller 750ec93394 Merge pull request #23080 from owncloud/use-non-localized-birthday-title
Use a birthday title which does not require translation because we ha…
2016-03-11 11:49:13 +01:00