]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoDon't load handlebars in template 4344/head
Lukas Reschke [Thu, 13 Apr 2017 12:01:21 +0000 (14:01 +0200)]
Don't load handlebars in template

It's already loaded in core.json

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4340 from nextcloud/remove-invalid-route
Roeland Jago Douma [Thu, 13 Apr 2017 09:26:05 +0000 (11:26 +0200)]
Merge pull request #4340 from nextcloud/remove-invalid-route

Remove invalid route

7 years agoRemove invalid route 4340/head
Lukas Reschke [Thu, 13 Apr 2017 09:05:44 +0000 (11:05 +0200)]
Remove invalid route

Said file doesn't exist anymore and accessing it would just return a 500

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3966 from nextcloud/downstream-26570
Lukas Reschke [Thu, 13 Apr 2017 08:51:09 +0000 (10:51 +0200)]
Merge pull request #3966 from nextcloud/downstream-26570

Override config.php values through environment variables

7 years agoMerge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login
Morris Jobke [Thu, 13 Apr 2017 06:04:11 +0000 (01:04 -0500)]
Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login

Dont create a log entry on email login

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 13 Apr 2017 00:08:02 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4338 from nextcloud/handlebars-min
Lukas Reschke [Wed, 12 Apr 2017 21:14:12 +0000 (23:14 +0200)]
Merge pull request #4338 from nextcloud/handlebars-min

Move to handlebars.min.js

7 years agoMove to handlebars.min.js 4338/head
Roeland Jago Douma [Wed, 12 Apr 2017 20:22:38 +0000 (22:22 +0200)]
Move to handlebars.min.js

core.js is now below 1mb!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4307 from nextcloud/sharing-emails
Roeland Jago Douma [Wed, 12 Apr 2017 19:23:11 +0000 (21:23 +0200)]
Merge pull request #4307 from nextcloud/sharing-emails

New emails for sharebymail

7 years agoMerge pull request #4335 from nextcloud/jquery-ui-min
Lukas Reschke [Wed, 12 Apr 2017 18:58:05 +0000 (20:58 +0200)]
Merge pull request #4335 from nextcloud/jquery-ui-min

Moved to jquery-ui.custom.min.js

7 years agoMerge pull request #4282 from nextcloud/oci-connect-string
Morris Jobke [Wed, 12 Apr 2017 18:11:00 +0000 (13:11 -0500)]
Merge pull request #4282 from nextcloud/oci-connect-string

use the same oci connectstring in all code paths

7 years agoMoved to jquery-ui.custom.min.js 4335/head
Roeland Jago Douma [Wed, 12 Apr 2017 18:03:00 +0000 (20:03 +0200)]
Moved to jquery-ui.custom.min.js

Shaves off about 200kb of the default loaded js libs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4306 from nextcloud/followup-3905
Roeland Jago Douma [Wed, 12 Apr 2017 17:57:16 +0000 (19:57 +0200)]
Merge pull request #4306 from nextcloud/followup-3905

Favorites integration tests for shared files

7 years agoMerge pull request #4331 from nextcloud/query-builder-sum
Morris Jobke [Wed, 12 Apr 2017 17:55:09 +0000 (12:55 -0500)]
Merge pull request #4331 from nextcloud/query-builder-sum

Add sum() to the query function builder

7 years agoFix unit tests 4307/head
Morris Jobke [Wed, 12 Apr 2017 17:34:42 +0000 (12:34 -0500)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFavorites integration tests for shared files 4306/head
Morris Jobke [Tue, 11 Apr 2017 20:00:37 +0000 (15:00 -0500)]
Favorites integration tests for shared files

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4329 from nextcloud/move-out-shared-folder
Morris Jobke [Wed, 12 Apr 2017 16:44:26 +0000 (11:44 -0500)]
Merge pull request #4329 from nextcloud/move-out-shared-folder

Fix moving files out of a shared folder

7 years agoDont add click-button text for plaintext mails
Joas Schilling [Wed, 12 Apr 2017 13:33:35 +0000 (15:33 +0200)]
Dont add click-button text for plaintext mails

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoNo newlines when heading is empty
Joas Schilling [Wed, 12 Apr 2017 13:33:14 +0000 (15:33 +0200)]
No newlines when heading is empty

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agomake the plain text footer standard compliant and add a space after '--'. It also...
Bjoern Schiessle [Wed, 12 Apr 2017 10:43:55 +0000 (12:43 +0200)]
make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoUse instance name as alt-text
Joas Schilling [Wed, 12 Apr 2017 09:52:58 +0000 (11:52 +0200)]
Use instance name as alt-text

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't duplicate the sentence with the header
Joas Schilling [Wed, 12 Apr 2017 09:52:33 +0000 (11:52 +0200)]
Don't duplicate the sentence with the header

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse new email design for sharebymail emails
Morris Jobke [Tue, 11 Apr 2017 21:18:31 +0000 (16:18 -0500)]
Use new email design for sharebymail emails

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoProperly escape heading, body and button text
Morris Jobke [Tue, 11 Apr 2017 21:17:44 +0000 (16:17 -0500)]
Properly escape heading, body and button text

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd addBodyButton to add a single button to email templates
Morris Jobke [Tue, 11 Apr 2017 21:13:34 +0000 (16:13 -0500)]
Add addBodyButton to add a single button to email templates

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd sub() to the query function builder 4331/head
Robin Appelman [Wed, 12 Apr 2017 14:09:35 +0000 (16:09 +0200)]
Add sub() to the query function builder

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4325 from nextcloud/downstream-27522
Roeland Jago Douma [Wed, 12 Apr 2017 14:04:03 +0000 (16:04 +0200)]
Merge pull request #4325 from nextcloud/downstream-27522

Optimize put - Dont try to fetch filecache for not existing filecache…

7 years agoMerge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
Björn Schießle [Wed, 12 Apr 2017 14:01:07 +0000 (16:01 +0200)]
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints

Discover federatedsharing endpoints

7 years agoMerge pull request #4323 from nextcloud/downstream-27613
Roeland Jago Douma [Wed, 12 Apr 2017 13:56:15 +0000 (15:56 +0200)]
Merge pull request #4323 from nextcloud/downstream-27613

Allow file upload when storage is unlimited

7 years agoMerge pull request #4324 from nextcloud/downstream-27581-27602
Roeland Jago Douma [Wed, 12 Apr 2017 13:54:46 +0000 (15:54 +0200)]
Merge pull request #4324 from nextcloud/downstream-27581-27602

Fix casing of same origin frame option

7 years agouse unjailed path when moving files out of a shared storage 4329/head
Robin Appelman [Wed, 12 Apr 2017 12:56:51 +0000 (14:56 +0200)]
use unjailed path when moving files out of a shared storage

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agorename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
Robin Appelman [Wed, 12 Apr 2017 12:55:47 +0000 (14:55 +0200)]
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoSimplify the test 4325/head
Joas Schilling [Wed, 12 Apr 2017 11:23:55 +0000 (13:23 +0200)]
Simplify the test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoOptimize put - Dont try to fetch filecache for not existing filecache in encription
Piotr M [Tue, 28 Mar 2017 12:49:06 +0000 (14:49 +0200)]
Optimize put - Dont try to fetch filecache for not existing filecache in encription

7 years agoFix casing of same origin frame option 4324/head
Joas Schilling [Wed, 12 Apr 2017 10:37:32 +0000 (12:37 +0200)]
Fix casing of same origin frame option

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAllow file upload when storage is unlimited 4323/head
Joas Schilling [Wed, 12 Apr 2017 10:27:47 +0000 (12:27 +0200)]
Allow file upload when storage is unlimited

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3905 from nextcloud/downstream-27069
Joas Schilling [Wed, 12 Apr 2017 09:09:42 +0000 (11:09 +0200)]
Merge pull request #3905 from nextcloud/downstream-27069

Add integration test for trashbin

7 years agoMerge pull request #4317 from nextcloud/cleanup-files_trashbin-update
Björn Schießle [Wed, 12 Apr 2017 08:57:09 +0000 (10:57 +0200)]
Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update

[files_trashbin] Remove unneeded update steps

7 years agoMerge pull request #4316 from nextcloud/cleanup-files_sharing-update
Björn Schießle [Wed, 12 Apr 2017 08:56:25 +0000 (10:56 +0200)]
Merge pull request #4316 from nextcloud/cleanup-files_sharing-update

[files_sharing] Remove unneeded update steps

7 years agoMerge pull request #4312 from nextcloud/cleanup-name
Björn Schießle [Wed, 12 Apr 2017 08:54:20 +0000 (10:54 +0200)]
Merge pull request #4312 from nextcloud/cleanup-name

Update comments to Nextcloud

7 years agoMerge pull request #4315 from nextcloud/cleanup-files_external-update
Lukas Reschke [Wed, 12 Apr 2017 08:16:42 +0000 (10:16 +0200)]
Merge pull request #4315 from nextcloud/cleanup-files_external-update

[files_external] Remove unneeded update steps

7 years agoMerge pull request #4309 from nextcloud/remove-unused-code
Lukas Reschke [Wed, 12 Apr 2017 08:15:59 +0000 (10:15 +0200)]
Merge pull request #4309 from nextcloud/remove-unused-code

Removes unused code for link share emails

7 years agoMerge pull request #4310 from nextcloud/allow-plain-text-email
Lukas Reschke [Wed, 12 Apr 2017 08:15:06 +0000 (10:15 +0200)]
Merge pull request #4310 from nextcloud/allow-plain-text-email

Allow to set text versions for the plain text email

7 years agoMerge pull request #4314 from nextcloud/remove-not-needed-update.php
Lukas Reschke [Wed, 12 Apr 2017 08:14:04 +0000 (10:14 +0200)]
Merge pull request #4314 from nextcloud/remove-not-needed-update.php

Remove update.php of files app

7 years ago[files_trashbin] Remove unneeded update steps 4317/head
Morris Jobke [Wed, 12 Apr 2017 05:52:27 +0000 (00:52 -0500)]
[files_trashbin] Remove unneeded update steps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[files_sharing] Remove unneeded update steps 4316/head
Morris Jobke [Wed, 12 Apr 2017 05:49:50 +0000 (00:49 -0500)]
[files_sharing] Remove unneeded update steps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[files_external] Remove unneeded update steps 4315/head
Morris Jobke [Wed, 12 Apr 2017 05:45:19 +0000 (00:45 -0500)]
[files_external] Remove unneeded update steps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemove update.php of files app 4314/head
Morris Jobke [Wed, 12 Apr 2017 05:35:12 +0000 (00:35 -0500)]
Remove update.php of files app

* contains only update steps for 8.1/8.2 to 9.0 update

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate comments to Nextcloud 4312/head
Morris Jobke [Wed, 12 Apr 2017 04:16:27 +0000 (23:16 -0500)]
Update comments to Nextcloud

* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 12 Apr 2017 00:07:44 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoAllow to set text versions for the plain text email 4310/head
Morris Jobke [Tue, 11 Apr 2017 22:45:05 +0000 (17:45 -0500)]
Allow to set text versions for the plain text email

* allows different texts for HTML and text version of the email

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemoves unused code for link share emails 4309/head
Morris Jobke [Tue, 11 Apr 2017 22:32:48 +0000 (17:32 -0500)]
Removes unused code for link share emails

* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4304 from nextcloud/add-email-template-to-ocp
Morris Jobke [Tue, 11 Apr 2017 20:09:27 +0000 (15:09 -0500)]
Merge pull request #4304 from nextcloud/add-email-template-to-ocp

Add IEMailTemplate to public OCP API

7 years agoAdd drone.yml config 3905/head
Morris Jobke [Fri, 17 Mar 2017 05:54:13 +0000 (23:54 -0600)]
Add drone.yml config

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd integration test for trashbin
Vincent Petry [Wed, 1 Feb 2017 09:54:10 +0000 (10:54 +0100)]
Add integration test for trashbin

Add test for basic deletion.
Add test when deleting from shared folder as recipient.
Add test to check that metadata stays when moving out of shared folder
as recipient.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4302 from nextcloud/test-integration-test
Roeland Jago Douma [Tue, 11 Apr 2017 19:29:58 +0000 (21:29 +0200)]
Merge pull request #4302 from nextcloud/test-integration-test

[Integration Tests] Clear opcode cache after config change

7 years agoRemove constructor from interface 4304/head
Lukas Reschke [Tue, 11 Apr 2017 19:22:39 +0000 (21:22 +0200)]
Remove constructor from interface

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3876 from nextcloud/downstream-26583
Roeland Jago Douma [Tue, 11 Apr 2017 19:01:12 +0000 (21:01 +0200)]
Merge pull request #3876 from nextcloud/downstream-26583

Share api expanded by tags

7 years agoMerge pull request #4285 from nextcloud/bump-md5
Morris Jobke [Tue, 11 Apr 2017 17:07:02 +0000 (12:07 -0500)]
Merge pull request #4285 from nextcloud/bump-md5

[js] Bump blueimp-md5

7 years agoClear opcode cache after config change 4302/head
Lukas Reschke [Tue, 11 Apr 2017 11:58:18 +0000 (13:58 +0200)]
Clear opcode cache after config change

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoshare api expanded by tags (#26583) 3876/head
Michael Jobst [Thu, 10 Nov 2016 08:13:25 +0000 (09:13 +0100)]
share api expanded by tags (#26583)

* share api expanded by tags

* Modified files_sharing JS Unit tests

* modified tests. renamed request parameter. refactoring

* Update Share20OCS.php

Added missing function description

* Update Helper.php

Added missing function description

* Update Helper.php

implicit boolean conversion to !empty()

* Update Share20OCSTest.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4293 from nextcloud/fix_4248
Morris Jobke [Tue, 11 Apr 2017 16:53:01 +0000 (11:53 -0500)]
Merge pull request #4293 from nextcloud/fix_4248

Do reload shared views

7 years agoAdjust class references
Lukas Reschke [Tue, 11 Apr 2017 15:35:59 +0000 (17:35 +0200)]
Adjust class references

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd IEMailTemplate to public OCP API
Lukas Reschke [Tue, 11 Apr 2017 14:35:46 +0000 (16:35 +0200)]
Add IEMailTemplate to public OCP API

Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUpdate autoloader 3614/head
Roeland Jago Douma [Tue, 11 Apr 2017 13:04:15 +0000 (15:04 +0200)]
Update autoloader

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDo proper DI
Roeland Jago Douma [Wed, 5 Apr 2017 20:35:59 +0000 (22:35 +0200)]
Do proper DI

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agogive old end-points a seperate name
Bjoern Schiessle [Mon, 13 Mar 2017 09:55:08 +0000 (10:55 +0100)]
give old end-points a seperate name

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agofix constructor
Bjoern Schiessle [Mon, 13 Mar 2017 09:35:44 +0000 (10:35 +0100)]
fix constructor

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoremove discovery manager in favour of the OCSDiscoveryService
Bjoern Schiessle [Fri, 10 Mar 2017 14:37:21 +0000 (15:37 +0100)]
remove discovery manager in favour of the OCSDiscoveryService

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoadd tests for discovery service
Bjoern Schiessle [Thu, 9 Mar 2017 15:32:13 +0000 (16:32 +0100)]
add tests for discovery service

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoadjust existing tests
Bjoern Schiessle [Thu, 9 Mar 2017 10:36:54 +0000 (11:36 +0100)]
adjust existing tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoget addressbook url and carddav user from remote server
Bjoern Schiessle [Fri, 24 Feb 2017 15:09:52 +0000 (16:09 +0100)]
get addressbook url and carddav user from remote server

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agouse discovered end-point for trusted servers
Bjoern Schiessle [Fri, 24 Feb 2017 14:33:09 +0000 (15:33 +0100)]
use discovered end-point for trusted servers

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoprovide public discovery service to discover OCS end-points on another server
Bjoern Schiessle [Fri, 24 Feb 2017 11:50:43 +0000 (12:50 +0100)]
provide public discovery service to discover OCS end-points on another server

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #4280 from nextcloud/share_via_display
Roeland Jago Douma [Tue, 11 Apr 2017 12:46:22 +0000 (14:46 +0200)]
Merge pull request #4280 from nextcloud/share_via_display

Show 'shared via' in share list for reshares

7 years agoMerge pull request #4256 from nextcloud/theming
Lukas Reschke [Tue, 11 Apr 2017 12:39:46 +0000 (14:39 +0200)]
Merge pull request #4256 from nextcloud/theming

Move OC_Defaults to OCP\Defaults

7 years agoShow 'shared via' in share list for reshares 4280/head
Roeland Jago Douma [Mon, 10 Apr 2017 15:07:45 +0000 (17:07 +0200)]
Show 'shared via' in share list for reshares

Fixes #1330

userA shares a file to userB
userB shares that file to userC

userA can see both userB and userC.
Now they can also see that userB shared it to user C

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2618 from nextcloud/2fa-challenge-text
Lukas Reschke [Tue, 11 Apr 2017 09:41:55 +0000 (11:41 +0200)]
Merge pull request #2618 from nextcloud/2fa-challenge-text

Move log out and backup codes link into 2fa box for better readability

7 years agoDo reload shared views 4293/head
Roeland Jago Douma [Tue, 11 Apr 2017 07:33:27 +0000 (09:33 +0200)]
Do reload shared views

Fixes #4248

The magic introduced in #3686 caused the shared views not to be updated
properly. Thus we just overwrite the _onUrlChange method in the
sharedfilelist.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4289 from nextcloud/maintenance-mode-also-on-dav
Morris Jobke [Tue, 11 Apr 2017 05:44:20 +0000 (00:44 -0500)]
Merge pull request #4289 from nextcloud/maintenance-mode-also-on-dav

Add missing maintenance plugin to new DAV endpoint

7 years agoMerge pull request #4283 from nextcloud/shares-by-folder-quote
Morris Jobke [Tue, 11 Apr 2017 00:39:19 +0000 (19:39 -0500)]
Merge pull request #4283 from nextcloud/shares-by-folder-quote

properly quota table names in getSharesInFolder

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 11 Apr 2017 00:07:29 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoRun maintenance mode tests on Drone 4289/head
Lukas Reschke [Mon, 10 Apr 2017 23:34:26 +0000 (01:34 +0200)]
Run maintenance mode tests on Drone

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd integration tests
Lukas Reschke [Mon, 10 Apr 2017 23:30:32 +0000 (01:30 +0200)]
Add integration tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd missing maintenance plugin to new DAV endpoint
Lukas Reschke [Mon, 10 Apr 2017 22:57:31 +0000 (00:57 +0200)]
Add missing maintenance plugin to new DAV endpoint

The `/remote.php/dav/` endpoint was not implementing the MaintenancePlugin. Thus when the instance was put into maintenance mode the endpoints were still accessible and delivered empty content. Sync clients really do love this.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[js] Bump blueimp-md5 a major version 4285/head
Roeland Jago Douma [Mon, 10 Apr 2017 18:56:56 +0000 (20:56 +0200)]
[js] Bump blueimp-md5 a major version

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[js] Bump blueimp-md5
Roeland Jago Douma [Mon, 10 Apr 2017 18:37:07 +0000 (20:37 +0200)]
[js] Bump blueimp-md5

* bumped to latest
* moved to min

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4146 from nextcloud/unread-comments-folder
Morris Jobke [Mon, 10 Apr 2017 18:21:39 +0000 (13:21 -0500)]
Merge pull request #4146 from nextcloud/unread-comments-folder

Allow getting the unread comment count for an entire folder at once

7 years agoMerge pull request #4274 from nextcloud/fix-share-by-mail-capabilities
Roeland Jago Douma [Mon, 10 Apr 2017 17:50:13 +0000 (19:50 +0200)]
Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilities

move share by mail capabilities to the share provider

7 years agoproperly quota table names in getSharesInFolder 4283/head
Robin Appelman [Mon, 10 Apr 2017 15:59:40 +0000 (17:59 +0200)]
properly quota table names in getSharesInFolder

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agouse the same oci connectstring in all code paths 4282/head
Robin Appelman [Mon, 10 Apr 2017 15:58:52 +0000 (17:58 +0200)]
use the same oci connectstring in all code paths

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agomove capabilities to share by mail app 4274/head
Bjoern Schiessle [Mon, 10 Apr 2017 09:00:19 +0000 (11:00 +0200)]
move capabilities to share by mail app

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #4277 from nextcloud/permissions-mask-scanner
Björn Schießle [Mon, 10 Apr 2017 14:04:12 +0000 (16:04 +0200)]
Merge pull request #4277 from nextcloud/permissions-mask-scanner

Dont use the permissions mask while scanning

7 years agoMerge pull request #4222 from nextcloud/dav-search-fileid
Roeland Jago Douma [Mon, 10 Apr 2017 13:57:56 +0000 (15:57 +0200)]
Merge pull request #4222 from nextcloud/dav-search-fileid

Allow searching file by fileid

7 years agoDont use the permissions mask while scanning 4277/head
Robin Appelman [Mon, 10 Apr 2017 13:19:21 +0000 (15:19 +0200)]
Dont use the permissions mask while scanning

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4210 from nextcloud/downstream-26643
Roeland Jago Douma [Mon, 10 Apr 2017 10:43:46 +0000 (12:43 +0200)]
Merge pull request #4210 from nextcloud/downstream-26643

Removed path to datadir in exception

7 years agoMerge pull request #4271 from nextcloud/also-send-the-new-data-with-the-event
Joas Schilling [Mon, 10 Apr 2017 09:14:39 +0000 (11:14 +0200)]
Merge pull request #4271 from nextcloud/also-send-the-new-data-with-the-event

Also send the new account data with the event

7 years agoLowercase "data" correctly 4210/head
Joas Schilling [Mon, 10 Apr 2017 09:13:46 +0000 (11:13 +0200)]
Lowercase "data" correctly

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4250 from nextcloud/disable-lookupserver-upload
Björn Schießle [Mon, 10 Apr 2017 09:04:19 +0000 (11:04 +0200)]
Merge pull request #4250 from nextcloud/disable-lookupserver-upload

allow admin to disable lookupserver upload

7 years agoMerge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendars
Lukas Reschke [Mon, 10 Apr 2017 08:41:13 +0000 (10:41 +0200)]
Merge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendars

don't remove owner property for public calendars