d0bae447fb
Use new email design for sharebymail emails
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
33e077c1c1
Properly escape heading, body and button text
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
050ce1d40b
Add addBodyButton to add a single button to email templates
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
b90e91144b
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
...
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
3cf2f6e31b
Merge pull request #4323 from nextcloud/downstream-27613
...
Allow file upload when storage is unlimited
2017-04-12 15:56:15 +02:00
c996e91d59
Merge pull request #4324 from nextcloud/downstream-27581-27602
...
Fix casing of same origin frame option
2017-04-12 15:54:46 +02:00
bd37021587
Fix casing of same origin frame option
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:37:32 +02:00
a3c3124762
Allow file upload when storage is unlimited
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:27:47 +02:00
af42ca2025
Merge pull request #3905 from nextcloud/downstream-27069
...
Add integration test for trashbin
2017-04-12 11:09:42 +02:00
53787a29e1
Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update
...
[files_trashbin] Remove unneeded update steps
2017-04-12 10:57:09 +02:00
35188899e9
Merge pull request #4316 from nextcloud/cleanup-files_sharing-update
...
[files_sharing] Remove unneeded update steps
2017-04-12 10:56:25 +02:00
49d8716eaa
Merge pull request #4312 from nextcloud/cleanup-name
...
Update comments to Nextcloud
2017-04-12 10:54:20 +02:00
39468f627f
Merge pull request #4315 from nextcloud/cleanup-files_external-update
...
[files_external] Remove unneeded update steps
2017-04-12 10:16:42 +02:00
b5d31e4e65
Merge pull request #4309 from nextcloud/remove-unused-code
...
Removes unused code for link share emails
2017-04-12 10:15:59 +02:00
d127f47801
Merge pull request #4310 from nextcloud/allow-plain-text-email
...
Allow to set text versions for the plain text email
2017-04-12 10:15:06 +02:00
feb594e212
Merge pull request #4314 from nextcloud/remove-not-needed-update.php
...
Remove update.php of files app
2017-04-12 10:14:04 +02:00
4f200040aa
[files_trashbin] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:52:27 -05:00
4d7c7b1816
[files_sharing] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:49:50 -05:00
83864d465e
[files_external] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:45:19 -05:00
5d444f493e
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>
2017-04-12 00:35:12 -05:00
1729e4471f
Update comments to Nextcloud
...
* based on PR by @Ardinis
* see #4311
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
633b952358
[tx-robot] updated from transifex
2017-04-12 00:07:44 +00:00
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
Morris Jobke
Björn Schießle
Roeland Jago Douma
Joas Schilling
Lukas Reschke
Nextcloud bot
Vincent Petry
Michael Jobst
Roeland Jago Douma