be9a514dff
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>
2017-04-11 17:50:06 -05:00
8fa5141aaa
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>
2017-04-11 17:32:48 -05:00
6bd1c50dc3
Merge pull request #4304 from nextcloud/add-email-template-to-ocp
...
Add IEMailTemplate to public OCP API
2017-04-11 15:09:27 -05:00
749046a799
Add drone.yml config
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 14:59:30 -05:00
d1081e7940
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>
2017-04-11 14:59:21 -05:00
8175ac6ecd
Merge pull request #4302 from nextcloud/test-integration-test
...
[Integration Tests] Clear opcode cache after config change
2017-04-11 21:29:58 +02:00
f3a78ee39d
Remove constructor from interface
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 21:22:39 +02:00
53ac842755
Merge pull request #3876 from nextcloud/downstream-26583
...
Share api expanded by tags
2017-04-11 21:01:12 +02:00
c2686be8da
Merge pull request #4285 from nextcloud/bump-md5
...
[js] Bump blueimp-md5
2017-04-11 12:07:02 -05:00
4cf61481e5
Clear opcode cache after config change
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 18:57:40 +02:00
81b1dc4930
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>
2017-04-11 11:54:13 -05:00
45a6e37699
Merge pull request #4293 from nextcloud/fix_4248
...
Do reload shared views
2017-04-11 11:53:01 -05:00
280a075c9c
Adjust class references
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 17:35:59 +02:00
3600dd4f52
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>
2017-04-11 16:35:46 +02:00
42f40659f6
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:15 +02:00
53bca14a27
Do proper DI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
3bc72f7224
give old end-points a seperate name
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
e2d7bffcda
fix constructor
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
449011dae7
remove discovery manager in favour of the OCSDiscoveryService
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
0dea31d48b
add tests for discovery service
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
821e287805
adjust existing tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
d5dec527c9
get addressbook url and carddav user from remote server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
930c507d89
use discovered end-point for trusted servers
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
45aee2e479
provide public discovery service to discover OCS end-points on another server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:03:59 +02:00
bd6273ee1c
Merge pull request #4280 from nextcloud/share_via_display
...
Show 'shared via' in share list for reshares
2017-04-11 14:46:22 +02:00
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
58f959864a
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>
2017-04-11 13:56:03 +02:00
5ca5ebe584
Merge pull request #2618 from nextcloud/2fa-challenge-text
...
Move log out and backup codes link into 2fa box for better readability
2017-04-11 11:41:55 +02:00
8c01e45d6b
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>
2017-04-11 09:33:27 +02:00
1846e1262d
Merge pull request #4289 from nextcloud/maintenance-mode-also-on-dav
...
Add missing maintenance plugin to new DAV endpoint
2017-04-11 00:44:20 -05:00
11d6fe1023
Merge pull request #4283 from nextcloud/shares-by-folder-quote
...
properly quota table names in getSharesInFolder
2017-04-10 19:39:19 -05:00
4d90b0520e
[tx-robot] updated from transifex
2017-04-11 00:07:29 +00:00
2f748f625c
Run maintenance mode tests on Drone
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 01:39:54 +02:00
b882f65fbb
Add integration tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 01:39:54 +02:00
aacbb560ae
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>
2017-04-11 01:31:57 +02:00
3810e89449
[js] Bump blueimp-md5 a major version
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-10 20:56:56 +02:00
7d1745d1e7
[js] Bump blueimp-md5
...
* bumped to latest
* moved to min
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-10 20:37:07 +02:00
a045f3c4d7
Merge pull request #4146 from nextcloud/unread-comments-folder
...
Allow getting the unread comment count for an entire folder at once
2017-04-10 13:21:39 -05:00
a750436ebc
Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilities
...
move share by mail capabilities to the share provider
2017-04-10 19:50:13 +02:00
a555672f21
properly quota table names in getSharesInFolder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:59:40 +02:00
421ca6439f
use the same oci connectstring in all code paths
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:58:52 +02:00
cbacca4202
move capabilities to share by mail app
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 17:18:13 +02:00
18580395d4
Merge pull request #4277 from nextcloud/permissions-mask-scanner
...
Dont use the permissions mask while scanning
2017-04-10 16:04:12 +02:00
e9c6fe2fd8
Merge pull request #4222 from nextcloud/dav-search-fileid
...
Allow searching file by fileid
2017-04-10 15:57:56 +02:00
a7c611039d
Dont use the permissions mask while scanning
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 15:19:21 +02:00
afea05d296
Merge pull request #4210 from nextcloud/downstream-26643
...
Removed path to datadir in exception
2017-04-10 12:43:46 +02:00
87bca38413
Merge pull request #4271 from nextcloud/also-send-the-new-data-with-the-event
...
Also send the new account data with the event
2017-04-10 11:14:39 +02:00
9e3a3eebf9
Lowercase "data" correctly
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-10 11:13:46 +02:00
235563f0a0
Merge pull request #4250 from nextcloud/disable-lookupserver-upload
...
allow admin to disable lookupserver upload
2017-04-10 11:04:19 +02:00
09c66c93c5
Merge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendars
...
don't remove owner property for public calendars
2017-04-10 10:41:13 +02:00
Morris Jobke
Vincent Petry
Roeland Jago Douma
Lukas Reschke
Michael Jobst
Roeland Jago Douma
Bjoern Schiessle
Nextcloud bot
Robin Appelman
Joas Schilling