b3b24172e4
Merge pull request #4307 from nextcloud/sharing-emails
...
New emails for sharebymail
2017-04-12 21:23:11 +02:00
72ff33da1d
Merge pull request #4335 from nextcloud/jquery-ui-min
...
Moved to jquery-ui.custom.min.js
2017-04-12 20:58:05 +02:00
a7da2ef977
Merge pull request #4282 from nextcloud/oci-connect-string
...
use the same oci connectstring in all code paths
2017-04-12 13:11:00 -05:00
abe887cd48
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>
2017-04-12 20:03:00 +02:00
250eb34e81
Merge pull request #4306 from nextcloud/followup-3905
...
Favorites integration tests for shared files
2017-04-12 19:57:16 +02:00
124fdf8062
Merge pull request #4331 from nextcloud/query-builder-sum
...
Add sum() to the query function builder
2017-04-12 12:55:09 -05:00
ae4c2893a2
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 12:42:23 -05:00
4cf4d2f27e
Favorites integration tests for shared files
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 11:44:57 -05:00
31024b7700
Merge pull request #4329 from nextcloud/move-out-shared-folder
...
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
983210de2e
Dont add click-button text for plaintext mails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
4b639e2763
No newlines when heading is empty
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
0a464dfb61
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>
2017-04-12 17:16:27 +02:00
1c8c62272c
Use instance name as alt-text
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
506c7731a6
Don't duplicate the sentence with the header
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
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
ac45af68cd
Add sub() to the query function builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 16:09:35 +02:00
dccb8928a1
Merge pull request #4325 from nextcloud/downstream-27522
...
Optimize put - Dont try to fetch filecache for not existing filecache…
2017-04-12 16:04:03 +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
8500debe79
use unjailed path when moving files out of a shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:56:51 +02:00
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
30817fa319
Simplify the test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 13:23:55 +02:00
dc78f1251e
Optimize put - Dont try to fetch filecache for not existing filecache in encription
2017-04-12 12:54:20 +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
Roeland Jago Douma
Lukas Reschke
Morris Jobke
Roeland Jago Douma
Joas Schilling
Bjoern Schiessle
Robin Appelman
Piotr M
Nextcloud bot
Vincent Petry