Roeland Jago Douma
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
Joas Schilling
bd37021587
Fix casing of same origin frame option
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:37:32 +02:00
Joas Schilling
af42ca2025
Merge pull request #3905 from nextcloud/downstream-27069
...
Add integration test for trashbin
2017-04-12 11:09:42 +02:00
Björn Schießle
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
Björn Schießle
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
Björn Schießle
49d8716eaa
Merge pull request #4312 from nextcloud/cleanup-name
...
Update comments to Nextcloud
2017-04-12 10:54:20 +02:00
Lukas Reschke
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
Lukas Reschke
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
Lukas Reschke
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
Lukas Reschke
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
Morris Jobke
4f200040aa
[files_trashbin] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:52:27 -05:00
Morris Jobke
4d7c7b1816
[files_sharing] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:49:50 -05:00
Morris Jobke
83864d465e
[files_external] Remove unneeded update steps
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:45:19 -05:00
Morris Jobke
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
Morris Jobke
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
Nextcloud bot
633b952358
[tx-robot] updated from transifex
2017-04-12 00:07:44 +00:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
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
Morris Jobke
749046a799
Add drone.yml config
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 14:59:30 -05:00
Vincent Petry
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
Roeland Jago Douma
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
Lukas Reschke
f3a78ee39d
Remove constructor from interface
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 21:22:39 +02:00
Roeland Jago Douma
53ac842755
Merge pull request #3876 from nextcloud/downstream-26583
...
Share api expanded by tags
2017-04-11 21:01:12 +02:00
Morris Jobke
c2686be8da
Merge pull request #4285 from nextcloud/bump-md5
...
[js] Bump blueimp-md5
2017-04-11 12:07:02 -05:00
Lukas Reschke
4cf61481e5
Clear opcode cache after config change
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 18:57:40 +02:00
Michael Jobst
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
Morris Jobke
45a6e37699
Merge pull request #4293 from nextcloud/fix_4248
...
Do reload shared views
2017-04-11 11:53:01 -05:00
Lukas Reschke
280a075c9c
Adjust class references
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 17:35:59 +02:00
Lukas Reschke
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
Roeland Jago Douma
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
Lukas Reschke
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
Roeland Jago Douma
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
Lukas Reschke
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
Roeland Jago Douma
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
Morris Jobke
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
Morris Jobke
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
Nextcloud bot
4d90b0520e
[tx-robot] updated from transifex
2017-04-11 00:07:29 +00:00
Lukas Reschke
2f748f625c
Run maintenance mode tests on Drone
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 01:39:54 +02:00
Lukas Reschke
b882f65fbb
Add integration tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 01:39:54 +02:00
Lukas Reschke
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Morris Jobke
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
Roeland Jago Douma
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
Robin Appelman
a555672f21
properly quota table names in getSharesInFolder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:59:40 +02:00
Bjoern Schiessle
cbacca4202
move capabilities to share by mail app
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 17:18:13 +02:00
Björn Schießle
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
Roeland Jago Douma
e9c6fe2fd8
Merge pull request #4222 from nextcloud/dav-search-fileid
...
Allow searching file by fileid
2017-04-10 15:57:56 +02:00
Robin Appelman
a7c611039d
Dont use the permissions mask while scanning
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 15:19:21 +02:00