]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoFirst process group shares and then user shares 2110/head
Vincent Petry [Wed, 2 Nov 2016 15:19:46 +0000 (16:19 +0100)]
First process group shares and then user shares

This prevents a validation failure where the code checks whether a file
is already shared with another user, but the check disables itself when
the owner is the same. Processing the groups first prevents the check
to kick in too early when the group share still has the old owner while
we try transferring the user share.

8 years agoMerge pull request #2106 from nextcloud/proper-empty-message-for-tags
Morris Jobke [Mon, 14 Nov 2016 13:02:07 +0000 (14:02 +0100)]
Merge pull request #2106 from nextcloud/proper-empty-message-for-tags

Show specific empty message for tag input fields

8 years agoMerge pull request #2068 from nextcloud/sharetypesinfolder-no-getdirectorycontent
Morris Jobke [Mon, 14 Nov 2016 10:49:24 +0000 (11:49 +0100)]
Merge pull request #2068 from nextcloud/sharetypesinfolder-no-getdirectorycontent

remove unneeded getDirectoryContent when getting share types for a folder

8 years agoShow specific empty message for tag input fields 2106/head
Morris Jobke [Mon, 14 Nov 2016 10:46:21 +0000 (11:46 +0100)]
Show specific empty message for tag input fields

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #2067 from nextcloud/fileinfo-lazy-substorages
Morris Jobke [Mon, 14 Nov 2016 10:39:02 +0000 (11:39 +0100)]
Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages

only query substorages to calculate the final mtime/size/etag when we need it

8 years agoMerge pull request #2093 from nextcloud/fix-single-author-with-details
Joas Schilling [Mon, 14 Nov 2016 08:50:57 +0000 (09:50 +0100)]
Merge pull request #2093 from nextcloud/fix-single-author-with-details

Fix single author with details

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 14 Nov 2016 01:07:06 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoFixes javascript tests for apps.js 2093/head
Roeland Jago Douma [Sun, 13 Nov 2016 13:28:32 +0000 (14:28 +0100)]
Fixes javascript tests for apps.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 13 Nov 2016 01:07:09 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 12 Nov 2016 01:07:11 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #2094 from nextcloud/prevent-downgrade-attacks
Morris Jobke [Fri, 11 Nov 2016 21:46:49 +0000 (22:46 +0100)]
Merge pull request #2094 from nextcloud/prevent-downgrade-attacks

Prevent downgrade attacks for apps

8 years agoMerge pull request #2088 from nextcloud/issue-2079-breadcrumb-padding
Lukas Reschke [Fri, 11 Nov 2016 17:55:48 +0000 (18:55 +0100)]
Merge pull request #2088 from nextcloud/issue-2079-breadcrumb-padding

Restore the padding on the home icon

8 years agoPrevent downgrade attacks for apps 2094/head
Lukas Reschke [Fri, 11 Nov 2016 17:53:26 +0000 (18:53 +0100)]
Prevent downgrade attacks for apps

We should verify the app versions when installing a new update, otherwise this could result in downgrade attacks when an attacker just copies the old signature.

Plus it prevents the case that in case of a bug in the appstore actually an older version gets installed.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #2082 from nextcloud/files_drop_sabre32
Joas Schilling [Fri, 11 Nov 2016 14:09:50 +0000 (15:09 +0100)]
Merge pull request #2082 from nextcloud/files_drop_sabre32

Fixes files_drop for sabre 3.2

8 years agoFix single author with details
Joas Schilling [Fri, 11 Nov 2016 13:11:19 +0000 (14:11 +0100)]
Fix single author with details

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2087 from nextcloud/fix-more-vendor-naming
Lukas Reschke [Fri, 11 Nov 2016 11:35:10 +0000 (12:35 +0100)]
Merge pull request #2087 from nextcloud/fix-more-vendor-naming

Replace more vendor naming

8 years agoRestore the padding on the home icon 2088/head
Joas Schilling [Fri, 11 Nov 2016 07:59:34 +0000 (08:59 +0100)]
Restore the padding on the home icon

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoReplace more vendor naming 2087/head
Joas Schilling [Fri, 11 Nov 2016 07:54:21 +0000 (08:54 +0100)]
Replace more vendor naming

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 11 Nov 2016 01:07:18 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoFixes files_drop for sabre 3.2 2082/head
Roeland Jago Douma [Thu, 10 Nov 2016 19:44:41 +0000 (20:44 +0100)]
Fixes files_drop for sabre 3.2

In the new sabre (3.2) the order of beforeMethod is switched. it used to
be that beforeMethod:METHOD was called after beforeMethod. But now it is
called before. Since we need the view this was broken.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #2077 from nextcloud/allow-sharees-to-be-used-for-other-things
Roeland Jago Douma [Thu, 10 Nov 2016 19:16:36 +0000 (20:16 +0100)]
Merge pull request #2077 from nextcloud/allow-sharees-to-be-used-for-other-things

Only check the sharing backends for file/folder items

8 years agoOnly check the sharing backends for file/folder items 2077/head
Joas Schilling [Thu, 10 Nov 2016 13:16:35 +0000 (14:16 +0100)]
Only check the sharing backends for file/folder items

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agofix tests 2068/head
Robin Appelman [Thu, 10 Nov 2016 14:06:24 +0000 (15:06 +0100)]
fix tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoMerge pull request #2070 from nextcloud/fix_admin_translations
Lukas Reschke [Thu, 10 Nov 2016 13:38:11 +0000 (14:38 +0100)]
Merge pull request #2070 from nextcloud/fix_admin_translations

Get correct L10N for Settings Manager

8 years agoonly query substorages to calculate the final mtime/size/etag lazily 2067/head
Robin Appelman [Wed, 9 Nov 2016 15:14:54 +0000 (16:14 +0100)]
only query substorages to calculate the final mtime/size/etag lazily

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoGet correct L10N for Settings Manager 2070/head
Roeland Jago Douma [Thu, 10 Nov 2016 10:08:37 +0000 (11:08 +0100)]
Get correct L10N for Settings Manager

Fixes #2022

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 10 Nov 2016 01:07:14 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoremove unneeded getDirectoryContent when getting share types for a folder
Robin Appelman [Wed, 9 Nov 2016 15:59:36 +0000 (16:59 +0100)]
remove unneeded getDirectoryContent when getting share types for a folder

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agofix phpdoc
Robin Appelman [Wed, 9 Nov 2016 15:59:03 +0000 (16:59 +0100)]
fix phpdoc

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoMerge pull request #2058 from nextcloud/better-error-message-for-installation-error
Morris Jobke [Wed, 9 Nov 2016 12:59:34 +0000 (13:59 +0100)]
Merge pull request #2058 from nextcloud/better-error-message-for-installation-error

Use a better error message and point the users to the support channels

8 years agoMerge pull request #2052 from nextcloud/ros-definitions-as-php-class
Morris Jobke [Wed, 9 Nov 2016 12:53:54 +0000 (13:53 +0100)]
Merge pull request #2052 from nextcloud/ros-definitions-as-php-class

Use a php class for the definitions to avoid loading problems

8 years agoMerge pull request #1792 from nextcloud/bump_sabre
Roeland Jago Douma [Wed, 9 Nov 2016 12:06:52 +0000 (13:06 +0100)]
Merge pull request #1792 from nextcloud/bump_sabre

Bump sabre

8 years agoAdjust third-party ref 1792/head
Lukas Reschke [Wed, 9 Nov 2016 10:53:36 +0000 (11:53 +0100)]
Adjust third-party ref

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoAdd tests
Lukas Reschke [Wed, 9 Nov 2016 10:52:40 +0000 (11:52 +0100)]
Add tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #2055 from nextcloud/js-codecov
Lukas Reschke [Wed, 9 Nov 2016 09:54:57 +0000 (10:54 +0100)]
Merge pull request #2055 from nextcloud/js-codecov

Javascript code coverage

8 years agoAdd test and adjust PHP function arguments 2052/head
Lukas Reschke [Wed, 9 Nov 2016 09:49:57 +0000 (10:49 +0100)]
Add test and adjust PHP function arguments

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoCorrectly catch the "soft errors" now 2058/head
Joas Schilling [Wed, 9 Nov 2016 09:29:25 +0000 (10:29 +0100)]
Correctly catch the "soft errors" now

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAdd tests for validity of the definitions
Joas Schilling [Wed, 9 Nov 2016 09:08:29 +0000 (10:08 +0100)]
Add tests for validity of the definitions

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoUse a better error message and point the users to the support channels
Joas Schilling [Wed, 9 Nov 2016 08:10:32 +0000 (09:10 +0100)]
Use a better error message and point the users to the support channels

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoUse a php class for the definitions to avoid loading problems
Joas Schilling [Tue, 8 Nov 2016 14:56:39 +0000 (15:56 +0100)]
Use a php class for the definitions to avoid loading problems

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoGenerate js codecov coverage 2055/head
Roeland Jago Douma [Tue, 8 Nov 2016 19:42:51 +0000 (20:42 +0100)]
Generate js codecov coverage

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #2053 from nextcloud/make-sure-we-can-backup-the-command-bus
Morris Jobke [Tue, 8 Nov 2016 19:37:22 +0000 (20:37 +0100)]
Merge pull request #2053 from nextcloud/make-sure-we-can-backup-the-command-bus

Make sure the database is not replaced while we make a backup of the …

8 years agoMerge pull request #2037 from nextcloud/fix-preview-urls
Roeland Jago Douma [Tue, 8 Nov 2016 17:29:57 +0000 (18:29 +0100)]
Merge pull request #2037 from nextcloud/fix-preview-urls

Fix preview URLs

8 years agoMerge pull request #1998 from nextcloud/share-by-mail-notification
Björn Schießle [Tue, 8 Nov 2016 16:37:46 +0000 (17:37 +0100)]
Merge pull request #1998 from nextcloud/share-by-mail-notification

add share by mail activity

8 years agoFix some typos 1998/head
Joas Schilling [Tue, 8 Nov 2016 16:05:29 +0000 (17:05 +0100)]
Fix some typos

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix preview URLs 2037/head
Joas Schilling [Mon, 7 Nov 2016 17:26:18 +0000 (18:26 +0100)]
Fix preview URLs

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMake sure the database is not replaced while we make a backup of the service 2053/head
Joas Schilling [Tue, 8 Nov 2016 15:32:41 +0000 (16:32 +0100)]
Make sure the database is not replaced while we make a backup of the service

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1618 from nextcloud/show-folder-shared-status
Morris Jobke [Tue, 8 Nov 2016 15:23:47 +0000 (16:23 +0100)]
Merge pull request #1618 from nextcloud/show-folder-shared-status

make it possible to share the current folder

8 years agoadd activity if a file was shared by mail
Bjoern Schiessle [Mon, 7 Nov 2016 14:08:56 +0000 (15:08 +0100)]
add activity if a file was shared by mail

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd new definition
Bjoern Schiessle [Thu, 3 Nov 2016 13:00:28 +0000 (14:00 +0100)]
add new definition

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd activity for share by mail
Bjoern Schiessle [Thu, 3 Nov 2016 11:06:22 +0000 (12:06 +0100)]
add activity for share by mail

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoMerge pull request #2047 from nextcloud/update-containers
Christoph Wurst [Tue, 8 Nov 2016 14:37:51 +0000 (15:37 +0100)]
Merge pull request #2047 from nextcloud/update-containers

Update containers to latest version

8 years agoMerge pull request #2038 from nextcloud/js_tests
Morris Jobke [Tue, 8 Nov 2016 14:33:24 +0000 (15:33 +0100)]
Merge pull request #2038 from nextcloud/js_tests

Bump jstests deps

8 years agoUpdate containers to latest version 2047/head
Morris Jobke [Tue, 8 Nov 2016 10:21:59 +0000 (11:21 +0100)]
Update containers to latest version

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoBump jstests deps 2038/head
Roeland Jago Douma [Mon, 7 Nov 2016 15:18:26 +0000 (16:18 +0100)]
Bump jstests deps

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #2040 from nextcloud/firefox-svg-workaround-fix
Morris Jobke [Tue, 8 Nov 2016 11:08:28 +0000 (12:08 +0100)]
Merge pull request #2040 from nextcloud/firefox-svg-workaround-fix

Apply firefox workaroud to svg filters

8 years agoFix styling of the breadcrumbs icon 1618/head
Morris Jobke [Tue, 8 Nov 2016 10:14:36 +0000 (11:14 +0100)]
Fix styling of the breadcrumbs icon

* properly center share icon
* also apply styles for public share icon

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agofix share icon position and remove debug log
Christoph Wurst [Tue, 8 Nov 2016 09:35:48 +0000 (10:35 +0100)]
fix share icon position and remove debug log

8 years agoApply firefox workaroud to svg filters 2040/head
Julius Haertl [Mon, 7 Nov 2016 23:06:40 +0000 (00:06 +0100)]
Apply firefox workaroud to svg filters

Signed-off-by: Julius Haertl <jus@bitgrid.net>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 8 Nov 2016 01:06:57 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

8 years agoAdd tests
Roeland Jago Douma [Mon, 7 Nov 2016 19:57:45 +0000 (20:57 +0100)]
Add tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoShow link icon when shared by link
Roeland Jago Douma [Mon, 7 Nov 2016 14:33:30 +0000 (15:33 +0100)]
Show link icon when shared by link

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoActually update the state
Roeland Jago Douma [Mon, 7 Nov 2016 10:27:15 +0000 (11:27 +0100)]
Actually update the state

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agodetail fixes for share current folder
Jan-Christoph Borchardt [Tue, 18 Oct 2016 08:50:39 +0000 (10:50 +0200)]
detail fixes for share current folder

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoListen to sharetab changes
Roeland Jago Douma [Fri, 14 Oct 2016 09:21:40 +0000 (11:21 +0200)]
Listen to sharetab changes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoupdate breadcrumb view whenever the share information on the directory info model...
Christoph Wurst [Mon, 10 Oct 2016 15:35:11 +0000 (17:35 +0200)]
update breadcrumb view whenever the share information on the directory info model changes

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agothe root folder must not be shared
Christoph Wurst [Mon, 10 Oct 2016 09:57:16 +0000 (11:57 +0200)]
the root folder must not be shared

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agovisually reflect sharing state of current folder
Christoph Wurst [Mon, 10 Oct 2016 09:14:51 +0000 (11:14 +0200)]
visually reflect sharing state of current folder

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agorefactor share permission logic into own method to reuse it for the share tab
Christoph Wurst [Mon, 10 Oct 2016 08:15:42 +0000 (10:15 +0200)]
refactor share permission logic into own method to reuse it for the share tab

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agolet users share the curren folder
Christoph Wurst [Tue, 4 Oct 2016 17:08:08 +0000 (19:08 +0200)]
let users share the curren folder

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agoshow whether the current folder was shared or not
Christoph Wurst [Tue, 4 Oct 2016 10:56:04 +0000 (12:56 +0200)]
show whether the current folder was shared or not

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
8 years agoMerge pull request #2036 from nextcloud/try-fixing-firefox-push-state
Roeland Jago Douma [Mon, 7 Nov 2016 12:48:18 +0000 (13:48 +0100)]
Merge pull request #2036 from nextcloud/try-fixing-firefox-push-state

Fix the push state

8 years agoMerge pull request #2034 from nextcloud/product-typo
Roeland Jago Douma [Mon, 7 Nov 2016 12:47:35 +0000 (13:47 +0100)]
Merge pull request #2034 from nextcloud/product-typo

Fix translation string

8 years agoFix the push state 2036/head
Joas Schilling [Mon, 7 Nov 2016 11:51:32 +0000 (12:51 +0100)]
Fix the push state

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix translation string 2034/head
Joas Schilling [Mon, 7 Nov 2016 10:25:53 +0000 (11:25 +0100)]
Fix translation string

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2026 from nextcloud/setting_lang
Morris Jobke [Mon, 7 Nov 2016 08:26:50 +0000 (09:26 +0100)]
Merge pull request #2026 from nextcloud/setting_lang

Move setlanguage to controller

8 years agoMerge pull request #2032 from nextcloud/noodlesegg-refactor
Roeland Jago Douma [Mon, 7 Nov 2016 08:06:09 +0000 (09:06 +0100)]
Merge pull request #2032 from nextcloud/noodlesegg-refactor

refactoring code to reduce cyclomatic complexit

8 years agorefactoring code to reduce cyclomatic complexit 2032/head
Donquixote [Sat, 29 Oct 2016 10:00:01 +0000 (18:00 +0800)]
refactoring code to reduce cyclomatic complexit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 7 Nov 2016 01:07:03 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoFix route and js 2026/head
Roeland Jago Douma [Sat, 5 Nov 2016 21:09:38 +0000 (22:09 +0100)]
Fix route and js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoAdd settings PersonalController
Roeland Jago Douma [Sat, 5 Nov 2016 20:15:02 +0000 (21:15 +0100)]
Add settings PersonalController

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 6 Nov 2016 01:07:48 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #2018 from nextcloud/firefox-svg-workaround
Morris Jobke [Sat, 5 Nov 2016 16:05:46 +0000 (17:05 +0100)]
Merge pull request #2018 from nextcloud/firefox-svg-workaround

Workaround for disappearing app icons for Firefox before version 51

8 years agoMerge pull request #2021 from henrymohn/bug-1875_Password-Hint
Morris Jobke [Sat, 5 Nov 2016 15:54:37 +0000 (16:54 +0100)]
Merge pull request #2021 from henrymohn/bug-1875_Password-Hint

Removed else statement preventing Success message from displaying cau…

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 5 Nov 2016 01:07:14 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #2014 from nextcloud/cleanup_oc_group_a_tad
Roeland Jago Douma [Fri, 4 Nov 2016 21:40:34 +0000 (22:40 +0100)]
Merge pull request #2014 from nextcloud/cleanup_oc_group_a_tad

Cleanup OC_Group usage a bit

8 years agoMerge pull request #2015 from nextcloud/swift-bucket
Lukas Reschke [Fri, 4 Nov 2016 20:46:59 +0000 (21:46 +0100)]
Merge pull request #2015 from nextcloud/swift-bucket

allow using 'bucket' to set the swift container

8 years agoRemoved else statement preventing Success message from displaying causing bug #1875 2021/head
Henry Mohn [Fri, 4 Nov 2016 19:45:46 +0000 (19:45 +0000)]
Removed else statement preventing Success message from displaying causing bug #1875
Signed-off-by: Henry Mohn <hmohniii@gmail.com>
8 years agoCleanup OC_Group usage a bit 2014/head
Roeland Jago Douma [Fri, 4 Nov 2016 12:07:16 +0000 (13:07 +0100)]
Cleanup OC_Group usage a bit

This is deprecated internal stuff. Should not be used anymore.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoFix CalendarTest
Roeland Jago Douma [Fri, 4 Nov 2016 14:40:59 +0000 (15:40 +0100)]
Fix CalendarTest

* Made sure delete from self works again (and is tested)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoWorkaround for disappearing app icons for Firefox before version 51 2018/head
Julius Haertl [Fri, 4 Nov 2016 13:51:03 +0000 (14:51 +0100)]
Workaround for disappearing app icons for Firefox before version 51

Signed-off-by: Julius Haertl <jus@bitgrid.net>
8 years agoFix plugin
Roeland Jago Douma [Fri, 4 Nov 2016 14:05:15 +0000 (15:05 +0100)]
Fix plugin

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMinor fixes
Roeland Jago Douma [Wed, 19 Oct 2016 08:49:43 +0000 (10:49 +0200)]
Minor fixes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #2007 from nextcloud/downstream-26411
Morris Jobke [Fri, 4 Nov 2016 14:03:52 +0000 (15:03 +0100)]
Merge pull request #2007 from nextcloud/downstream-26411

[oc] Fix initMountPoints to set usersSetup earlier

8 years agoallow using 'bucket' to set the swift container 2015/head
Robin Appelman [Fri, 4 Nov 2016 13:15:18 +0000 (14:15 +0100)]
allow using 'bucket' to set the swift container

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoFix tests
Roeland Jago Douma [Tue, 18 Oct 2016 21:01:44 +0000 (23:01 +0200)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years ago[3rdparty] Bump sabre/dav to 3.2
Roeland Jago Douma [Fri, 4 Nov 2016 12:35:52 +0000 (13:35 +0100)]
[3rdparty] Bump sabre/dav to 3.2

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoUpdate sabre dav to 3.2 (#26115)
Thomas Müller [Thu, 13 Oct 2016 10:15:10 +0000 (12:15 +0200)]
Update sabre dav to 3.2 (#26115)

* Update sabre/dav to 3.2.0

* Adjust code to work with sabre/dav 3.2.0 and it's dependencies

* Adding own CalDAV plugin to fix calendar home property

* Test if there is a user logged in when listing files home

* Update sabre version used by integration tests

* Disable unauthenticated DAV access

This is needed to make Sabre 3.2 behave like we did before.
Eventually we should integrate better with the ACL plugin which itself
should implement an auth failure when appropriate.

=====

* Fixed so cherry-pick was succesfull

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #2010 from nextcloud/downstream-26534
Joas Schilling [Fri, 4 Nov 2016 12:29:19 +0000 (13:29 +0100)]
Merge pull request #2010 from nextcloud/downstream-26534

[oC] Fixed disappearing of share info in file view

8 years agoMerge pull request #1880 from nextcloud/downstream-26235
Morris Jobke [Fri, 4 Nov 2016 11:09:00 +0000 (12:09 +0100)]
Merge pull request #1880 from nextcloud/downstream-26235

Integration tests refactoring