]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoMake sure mountType is actually defined 4521/head
Roeland Jago Douma [Fri, 28 Apr 2017 08:03:31 +0000 (10:03 +0200)]
Make sure mountType is actually defined

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoallow apps to set custom mount types
Robin Appelman [Wed, 26 Apr 2017 12:53:11 +0000 (14:53 +0200)]
allow apps to set custom mount types

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4524 from nextcloud/downstream-27508
Roeland Jago Douma [Fri, 28 Apr 2017 07:37:40 +0000 (09:37 +0200)]
Merge pull request #4524 from nextcloud/downstream-27508

Keep file id on move

7 years agoMerge pull request #4569 from nextcloud/fix-icons
Roeland Jago Douma [Fri, 28 Apr 2017 06:33:45 +0000 (08:33 +0200)]
Merge pull request #4569 from nextcloud/fix-icons

Fix icons in sidebar on personal page

7 years agoMerge pull request #4570 from nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade
Lukas Reschke [Fri, 28 Apr 2017 06:33:28 +0000 (08:33 +0200)]
Merge pull request #4570 from nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade

Do not disable 3rdparty apps on occ upgrade

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 28 Apr 2017 00:07:41 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoDo not disable 3rdparty apps on occ upgrade 4570/head
Morris Jobke [Thu, 27 Apr 2017 21:11:33 +0000 (18:11 -0300)]
Do not disable 3rdparty apps on occ upgrade

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix icons in sidebar on personal page 4569/head
Morris Jobke [Thu, 27 Apr 2017 20:58:41 +0000 (17:58 -0300)]
Fix icons in sidebar on personal page

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4522 from nextcloud/downstream-27596
Morris Jobke [Thu, 27 Apr 2017 19:41:08 +0000 (16:41 -0300)]
Merge pull request #4522 from nextcloud/downstream-27596

Allow to create a user for a specific backend

7 years agoMerge pull request #4565 from nextcloud/fix-typo
Morris Jobke [Thu, 27 Apr 2017 19:33:54 +0000 (16:33 -0300)]
Merge pull request #4565 from nextcloud/fix-typo

Fix typo in HTML tags

7 years agoFix typo in HTML tags 4565/head
Morris Jobke [Thu, 27 Apr 2017 19:14:21 +0000 (16:14 -0300)]
Fix typo in HTML tags

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4561 from nextcloud/text-for-federated
Morris Jobke [Thu, 27 Apr 2017 19:07:29 +0000 (16:07 -0300)]
Merge pull request #4561 from nextcloud/text-for-federated

Add hint for federated sharing

7 years agoAdd hint for federated sharing 4561/head
Morris Jobke [Thu, 27 Apr 2017 16:08:32 +0000 (13:08 -0300)]
Add hint for federated sharing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4540 from nextcloud/settings-help
Morris Jobke [Thu, 27 Apr 2017 15:09:01 +0000 (12:09 -0300)]
Merge pull request #4540 from nextcloud/settings-help

Add more hints to settings

7 years agoFix class names 4524/head
Joas Schilling [Thu, 27 Apr 2017 13:45:41 +0000 (15:45 +0200)]
Fix class names

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix last unit tests
Joas Schilling [Thu, 27 Apr 2017 07:53:55 +0000 (09:53 +0200)]
Fix last unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't end the abstract class name with Test.php
Joas Schilling [Thu, 27 Apr 2017 07:49:37 +0000 (09:49 +0200)]
Don't end the abstract class name with Test.php

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd comment
Vincent Petry [Tue, 28 Feb 2017 09:27:24 +0000 (10:27 +0100)]
Add comment

7 years agoProperly handle missing READ permission
Vincent Petry [Fri, 24 Feb 2017 10:56:29 +0000 (11:56 +0100)]
Properly handle missing READ permission

7 years agoFix duplicate name of class
Joas Schilling [Thu, 27 Apr 2017 07:15:50 +0000 (09:15 +0200)]
Fix duplicate name of class

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse the new method in the old one to remove duplicate code 4522/head
Joas Schilling [Thu, 27 Apr 2017 06:56:51 +0000 (08:56 +0200)]
Use the new method in the old one to remove duplicate code

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3770 from nextcloud/faster-search-in-contacts
Morris Jobke [Thu, 27 Apr 2017 03:25:30 +0000 (00:25 -0300)]
Merge pull request #3770 from nextcloud/faster-search-in-contacts

Factorize query for searching contacts

7 years agoMerge pull request #4501 from nextcloud/downstream-27144
Morris Jobke [Thu, 27 Apr 2017 02:16:21 +0000 (23:16 -0300)]
Merge pull request #4501 from nextcloud/downstream-27144

Add duration of last job execution to the table

7 years agoMerge pull request #4519 from nextcloud/downstream-27703
Morris Jobke [Thu, 27 Apr 2017 02:05:08 +0000 (23:05 -0300)]
Merge pull request #4519 from nextcloud/downstream-27703

Reload file list when leaving hidden state

7 years agoMerge pull request #4515 from nextcloud/downstream-27643
Morris Jobke [Thu, 27 Apr 2017 01:58:01 +0000 (22:58 -0300)]
Merge pull request #4515 from nextcloud/downstream-27643

Adjust query/event logging code in favour of more complex owncloud/di…

7 years agoMerge pull request #4517 from nextcloud/downstream-27637
Morris Jobke [Thu, 27 Apr 2017 01:54:20 +0000 (22:54 -0300)]
Merge pull request #4517 from nextcloud/downstream-27637

Fix recovery checkbox label to properly point

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 27 Apr 2017 00:07:40 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4537 from nextcloud/change-link
Morris Jobke [Wed, 26 Apr 2017 22:29:29 +0000 (19:29 -0300)]
Merge pull request #4537 from nextcloud/change-link

Change feed to website planet link, fix wording

7 years agoMerge pull request #4526 from nextcloud/downstream-27269
Morris Jobke [Wed, 26 Apr 2017 21:21:13 +0000 (18:21 -0300)]
Merge pull request #4526 from nextcloud/downstream-27269

Don`t allow upload of files with extension .part

7 years agoMerge pull request #4454 from nextcloud/add-bundles-to-install-page
Morris Jobke [Wed, 26 Apr 2017 21:20:40 +0000 (18:20 -0300)]
Merge pull request #4454 from nextcloud/add-bundles-to-install-page

Add app bundles to the apps page and unbundle enterprise apps

7 years agoAdd more hints to settings 4540/head
Jan-Christoph Borchardt [Wed, 26 Apr 2017 20:43:58 +0000 (22:43 +0200)]
Add more hints to settings

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoMerge pull request #4461 from danxuliu/fix-closing-details-view-when-viewing-file...
Morris Jobke [Wed, 26 Apr 2017 20:42:55 +0000 (17:42 -0300)]
Merge pull request #4461 from danxuliu/fix-closing-details-view-when-viewing-file-in-folder

Fix details view not closed when viewing a file in its folder

7 years agoUpdate autoloader 4515/head
Roeland Jago Douma [Wed, 26 Apr 2017 20:25:41 +0000 (22:25 +0200)]
Update autoloader

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4529 from nextcloud/fix-filelist-checkboxes
Morris Jobke [Wed, 26 Apr 2017 19:52:46 +0000 (16:52 -0300)]
Merge pull request #4529 from nextcloud/fix-filelist-checkboxes

Fix filelist and checkbox vertical align

7 years agoChange feed to website planet link, fix wording 4537/head
Jan-Christoph Borchardt [Wed, 26 Apr 2017 19:22:08 +0000 (21:22 +0200)]
Change feed to website planet link, fix wording

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoFix tests 4454/head
Lukas Reschke [Wed, 26 Apr 2017 18:08:44 +0000 (20:08 +0200)]
Fix tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUpdate autoload map
Lukas Reschke [Wed, 26 Apr 2017 18:06:34 +0000 (20:06 +0200)]
Update autoload map

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd SocialSharingBundle
Lukas Reschke [Wed, 26 Apr 2017 14:05:58 +0000 (16:05 +0200)]
Add SocialSharingBundle

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix bundles header position
Jan-Christoph Borchardt [Wed, 26 Apr 2017 11:51:43 +0000 (13:51 +0200)]
Fix bundles header position

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoStyle app bundles
Jan-Christoph Borchardt [Wed, 26 Apr 2017 10:41:54 +0000 (12:41 +0200)]
Style app bundles

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoUse .installed layout
Lukas Reschke [Tue, 25 Apr 2017 23:50:22 +0000 (01:50 +0200)]
Use .installed layout

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoStyling fixes to bundle header
Jan-Christoph Borchardt [Tue, 25 Apr 2017 23:17:58 +0000 (01:17 +0200)]
Styling fixes to bundle header

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAdd tests for repairstep
Lukas Reschke [Tue, 25 Apr 2017 23:16:11 +0000 (01:16 +0200)]
Add tests for repairstep

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd spreed to Groupware bundle
Lukas Reschke [Tue, 25 Apr 2017 23:04:42 +0000 (01:04 +0200)]
Add spreed to Groupware bundle

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd tests for bundle code
Lukas Reschke [Tue, 25 Apr 2017 21:36:59 +0000 (23:36 +0200)]
Add tests for bundle code

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoRemove unrequired getDescription() method
Lukas Reschke [Tue, 25 Apr 2017 21:17:59 +0000 (23:17 +0200)]
Remove unrequired getDescription() method

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdjust tests
Lukas Reschke [Tue, 25 Apr 2017 21:16:52 +0000 (23:16 +0200)]
Adjust tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMake the emergency disable also accept arrays
Lukas Reschke [Tue, 25 Apr 2017 19:19:49 +0000 (21:19 +0200)]
Make the emergency disable also accept arrays

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMake disableapp.php accept arrays
Lukas Reschke [Tue, 25 Apr 2017 19:06:24 +0000 (21:06 +0200)]
Make disableapp.php accept arrays

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix styling
Lukas Reschke [Tue, 25 Apr 2017 18:32:33 +0000 (20:32 +0200)]
Fix styling

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoDon't sort on app bundles
Lukas Reschke [Tue, 25 Apr 2017 18:27:37 +0000 (20:27 +0200)]
Don't sort on app bundles

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd titles
Lukas Reschke [Tue, 25 Apr 2017 18:17:52 +0000 (20:17 +0200)]
Add titles

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd app bundles
Lukas Reschke [Sun, 23 Apr 2017 20:10:17 +0000 (22:10 +0200)]
Add app bundles

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4518 from nextcloud/downstream-25838
Roeland Jago Douma [Wed, 26 Apr 2017 17:23:27 +0000 (19:23 +0200)]
Merge pull request #4518 from nextcloud/downstream-25838

Fix share indicator handling

7 years agoMerge pull request #4374 from nextcloud/contactsmenu_popover
Lukas Reschke [Wed, 26 Apr 2017 16:31:17 +0000 (18:31 +0200)]
Merge pull request #4374 from nextcloud/contactsmenu_popover

add contacts popover

7 years agoMerge pull request #4503 from nextcloud/downstream-27281
Roeland Jago Douma [Wed, 26 Apr 2017 15:17:24 +0000 (17:17 +0200)]
Merge pull request #4503 from nextcloud/downstream-27281

fix objectstore rename

7 years agoFix missing conflict resolutions
Joas Schilling [Wed, 26 Apr 2017 15:05:59 +0000 (17:05 +0200)]
Fix missing conflict resolutions

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4516 from nextcloud/downstream-27527
Roeland Jago Douma [Wed, 26 Apr 2017 14:59:03 +0000 (16:59 +0200)]
Merge pull request #4516 from nextcloud/downstream-27527

OCC scanner commit in batches

7 years agoFix filelist and checkbox vertical align 4529/head
Jan-Christoph Borchardt [Wed, 26 Apr 2017 14:47:04 +0000 (16:47 +0200)]
Fix filelist and checkbox vertical align

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoUse regex to detect part files 4526/head
Vincent Petry [Fri, 24 Mar 2017 10:28:54 +0000 (11:28 +0100)]
Use regex to detect part files

7 years ago#7496 Don`t allow upload of files with extension .part
Ilja Neumann [Mon, 27 Feb 2017 17:30:10 +0000 (18:30 +0100)]
#7496 Don`t allow upload of files with extension .part

7 years agoFix forbidden backslash DAV integration tests
Vincent Petry [Thu, 30 Mar 2017 09:31:24 +0000 (11:31 +0200)]
Fix forbidden backslash DAV integration tests

7 years agoFix FutureFile MOVE to keep destination node
Vincent Petry [Thu, 30 Mar 2017 09:30:37 +0000 (11:30 +0200)]
Fix FutureFile MOVE to keep destination node

Sabre usually deletes the target node on MOVE before proceeding with the
actual move operation. This fix prevents this to happen in case the
source node is a FutureFile.

7 years agoAccept moving FutureFile into a Directory
Vincent Petry [Wed, 29 Mar 2017 15:01:04 +0000 (17:01 +0200)]
Accept moving FutureFile into a Directory

7 years agoMoved unit tests from ObjectTree::move to Directory
Vincent Petry [Wed, 29 Mar 2017 10:15:42 +0000 (12:15 +0200)]
Moved unit tests from ObjectTree::move to Directory

7 years agoRemove ObjectTree::move and let is use the IMoveTarget approach instead
Vincent Petry [Wed, 29 Mar 2017 09:16:41 +0000 (11:16 +0200)]
Remove ObjectTree::move and let is use the IMoveTarget approach instead

This removes the duplicated code

7 years agoPorted ObjectTree::move to IMoveTarget in new DAV endpoint
Vincent Petry [Wed, 29 Mar 2017 09:04:27 +0000 (11:04 +0200)]
Ported ObjectTree::move to IMoveTarget in new DAV endpoint

7 years agoAdded test cases from core 16825
Sergio Bertolin [Wed, 29 Mar 2017 09:21:13 +0000 (09:21 +0000)]
Added test cases from core 16825

7 years agoSimplified new endpoint move test
Vincent Petry [Mon, 27 Mar 2017 16:53:06 +0000 (18:53 +0200)]
Simplified new endpoint move test

7 years agoAdded case when final chunk move must not change file id
Vincent Petry [Mon, 27 Mar 2017 16:50:02 +0000 (18:50 +0200)]
Added case when final chunk move must not change file id

7 years agoAdded test about checking file id after a move
Sergio Bertolin [Mon, 27 Mar 2017 10:27:23 +0000 (10:27 +0000)]
Added test about checking file id after a move

7 years agoAllow to create a user for a specific backend
Joas Schilling [Wed, 26 Apr 2017 13:07:11 +0000 (15:07 +0200)]
Allow to create a user for a specific backend

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4512 from nextcloud/fix-translations-2
Morris Jobke [Wed, 26 Apr 2017 11:57:08 +0000 (08:57 -0300)]
Merge pull request #4512 from nextcloud/fix-translations-2

Fix translations

7 years agoReload file list when leaving hidden state 4519/head
Vincent Petry [Thu, 20 Apr 2017 12:59:08 +0000 (14:59 +0200)]
Reload file list when leaving hidden state

Whenever a file list is already initialized and was hidden when
switching to another file list in the navigation bar, if the user comes
back to this list it gets redisplayed. At this point the list needs to
be refreshed to be able to reflect any potential file changes done from
the other lists.

7 years agoFix share indicator handling 4518/head
Vincent Petry [Wed, 17 Aug 2016 10:25:58 +0000 (12:25 +0200)]
Fix share indicator handling

Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly

7 years agoFix recovery checkbox label to properly point 4517/head
Vincent Petry [Wed, 12 Apr 2017 16:19:09 +0000 (18:19 +0200)]
Fix recovery checkbox label to properly point

7 years agoFix scanner after review 4516/head
Vincent Petry [Mon, 3 Apr 2017 09:49:30 +0000 (11:49 +0200)]
Fix scanner after review

7 years agoOCC scanner commit in batches
Vincent Petry [Tue, 28 Mar 2017 17:18:58 +0000 (19:18 +0200)]
OCC scanner commit in batches

7 years agoAdjust query/event logging code in favour of more complex owncloud/diagnostics (...
Piotr Mrówczyński [Thu, 20 Apr 2017 09:31:00 +0000 (11:31 +0200)]
Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643)

* Adjust query/event logging code in favour of more complex owncloud/diagnostics
* Add descriptions to IQueryLogger and IEventLogger interfaces

7 years agoMerge pull request #4430 from nextcloud/refactor-auth
Roeland Jago Douma [Wed, 26 Apr 2017 08:41:53 +0000 (10:41 +0200)]
Merge pull request #4430 from nextcloud/refactor-auth

Improve readability of login logic

7 years agoMerge pull request #4478 from nextcloud/improve_settings_help
Joas Schilling [Wed, 26 Apr 2017 07:45:01 +0000 (09:45 +0200)]
Merge pull request #4478 from nextcloud/improve_settings_help

adding some documentation hints and some smaller cleanup

7 years agoFix email vs mail 4512/head
Joas Schilling [Wed, 26 Apr 2017 07:33:18 +0000 (09:33 +0200)]
Fix email vs mail

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse correct plural form and add special strings for tomorrow and today
Joas Schilling [Wed, 26 Apr 2017 07:27:55 +0000 (09:27 +0200)]
Use correct plural form and add special strings for tomorrow and today

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agohandle 404 separately 4374/head
Georg Ehrke [Tue, 25 Apr 2017 20:01:56 +0000 (22:01 +0200)]
handle 404 separately

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agounit test jquery.contactsmenu
Georg Ehrke [Mon, 24 Apr 2017 20:34:33 +0000 (22:34 +0200)]
unit test jquery.contactsmenu

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agofix CommentsTabsView js test
Georg Ehrke [Mon, 24 Apr 2017 19:04:05 +0000 (21:04 +0200)]
fix CommentsTabsView js test

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agofix ContactsStoreTest
Georg Ehrke [Mon, 24 Apr 2017 18:54:33 +0000 (20:54 +0200)]
fix ContactsStoreTest

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoadd contactsmenu popover to comments
Georg Ehrke [Mon, 24 Apr 2017 17:52:45 +0000 (19:52 +0200)]
add contactsmenu popover to comments

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agobetter detection whether or not contactsmenu target was clicked
Georg Ehrke [Mon, 24 Apr 2017 13:32:51 +0000 (15:32 +0200)]
better detection whether or not contactsmenu target was clicked

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoadd contactsmenu popover to resharer infobox
Georg Ehrke [Mon, 24 Apr 2017 13:31:44 +0000 (15:31 +0200)]
add contactsmenu popover to resharer infobox

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoContactsmenu popover: show proper message when server throws error
Georg Ehrke [Mon, 24 Apr 2017 11:09:24 +0000 (13:09 +0200)]
Contactsmenu popover: show proper message when server throws error

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agodon't toggle sharing popover together with contactsmenu popover
Georg Ehrke [Mon, 24 Apr 2017 11:04:49 +0000 (13:04 +0200)]
don't toggle sharing popover together with contactsmenu popover

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoFix past tense
Joas Schilling [Wed, 26 Apr 2017 07:27:41 +0000 (09:27 +0200)]
Fix past tense

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoclose menu again when clicking on avatar
Georg Ehrke [Mon, 24 Apr 2017 11:03:52 +0000 (13:03 +0200)]
close menu again when clicking on avatar

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoadd contactsmenu popover
Georg Ehrke [Mon, 24 Apr 2017 09:39:03 +0000 (11:39 +0200)]
add contactsmenu popover

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoMerge pull request #4467 from nextcloud/lists-for-html-mails
Roeland Jago Douma [Wed, 26 Apr 2017 06:30:30 +0000 (08:30 +0200)]
Merge pull request #4467 from nextcloud/lists-for-html-mails

Add lists to HTML emails

7 years agoMerge pull request #4061 from nextcloud/downstream-26407
Roeland Jago Douma [Wed, 26 Apr 2017 06:27:30 +0000 (08:27 +0200)]
Merge pull request #4061 from nextcloud/downstream-26407

Redis cluster support

7 years agoMerge pull request #4500 from nextcloud/downstream-27118
Morris Jobke [Wed, 26 Apr 2017 04:28:16 +0000 (01:28 -0300)]
Merge pull request #4500 from nextcloud/downstream-27118

Restrict proppatch to the proper nodes

7 years agoMerge pull request #4416 from gvmura/avoid-duplicate-files-google
Morris Jobke [Wed, 26 Apr 2017 04:26:04 +0000 (01:26 -0300)]
Merge pull request #4416 from gvmura/avoid-duplicate-files-google

Avoid duplicate files in google with the same name

7 years agoMerge pull request #4449 from stweil/mimetypes
Morris Jobke [Wed, 26 Apr 2017 04:22:49 +0000 (01:22 -0300)]
Merge pull request #4449 from stweil/mimetypes

Add mimetypes for jp2 and webp