Commit Graph

503 Commits

Author SHA1 Message Date
Nextcloud bot 241e5705cb
[tx-robot] updated from transifex 2018-07-24 00:12:01 +00:00
Bjoern Schiessle eab4d96c4c
some small template fixes
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-21 15:02:19 +02:00
Bjoern Schiessle b81962e3e8
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-21 15:02:19 +02:00
Bjoern Schiessle 1ce519ad38
add direct link to the share
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-21 15:02:18 +02:00
Bjoern Schiessle a29261175d
fix mail templates
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-21 15:02:18 +02:00
Bjoern Schiessle 73b88deeb8
add note to share object when reading it from the db
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-21 15:02:18 +02:00
Bjoern Schiessle c116d116fa
improve mail template and escape html code
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-21 15:02:18 +02:00
Bjoern Schiessle a93f2a648b
allow to add a personal note to a share
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-21 15:02:18 +02:00
Nextcloud bot 0e0dd2a90b
[tx-robot] updated from transifex 2018-07-11 00:12:15 +00:00
Nextcloud bot a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Roeland Jago Douma d805959e81
Add API to undelete delete group shares
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.

This endpoint makes it possible to get back the share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:56 +02:00
Nextcloud bot a4b5ff8420
[tx-robot] updated from transifex 2018-06-24 00:12:06 +00:00
Nextcloud bot f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00:00
Nextcloud bot 5ecfd80f07
[tx-robot] updated from transifex 2018-06-13 00:12:59 +00:00
Nextcloud bot d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Nextcloud bot ae3bdb4fb9
[tx-robot] updated from transifex 2018-06-09 00:13:06 +00:00
Nextcloud bot d3fceb9b83
[tx-robot] updated from transifex 2018-06-01 00:12:28 +00:00
Nextcloud bot 7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Nextcloud bot f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Nextcloud bot 60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00:00
Nextcloud bot 514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Nextcloud bot ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Nextcloud bot 6ee00a8be5
[tx-robot] updated from transifex 2018-04-28 00:11:58 +00:00
Nextcloud bot 9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00:00
Arthur Schiwon 38a90130ce
move log constants to ILogger
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 10:45:52 +02:00
Nextcloud bot 3c250b1a35
[tx-robot] updated from transifex 2018-04-17 00:13:08 +00:00
Nextcloud bot af3ab1de10
[tx-robot] updated from transifex 2018-03-21 01:11:55 +00:00
Nextcloud bot b7e7ae5d6d
[tx-robot] updated from transifex 2018-03-16 01:11:31 +00:00
Nextcloud bot 055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Nextcloud bot a20e9d7891
[tx-robot] updated from transifex 2018-03-09 01:12:12 +00:00
Nextcloud bot 3867a74f0d
[tx-robot] updated from transifex 2018-03-06 01:12:16 +00:00
Nextcloud bot 6975cef00b
[tx-robot] updated from transifex 2018-03-04 01:12:42 +00:00
Nextcloud bot 3b000d4f91
[tx-robot] updated from transifex 2018-03-03 01:12:14 +00:00
Nextcloud bot 533e8351ad
[tx-robot] updated from transifex 2018-02-28 01:12:31 +00:00
Joas Schilling 226e63695f
Merge pull request #8026 from nextcloud/feature/noid/allow-custom-html-in-html-emails
Allow custom HTML in HTML Emails
2018-02-26 13:38:39 +01:00
Joas Schilling f095001e4b
Fix info.xml files of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-16 10:24:03 +01:00
Joas Schilling 339e320064
Fix existing usages
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-15 12:18:51 +01:00
Nextcloud bot 01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Morris Jobke d3d045dd5c
Remove unused import statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
Nextcloud bot 3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot 91c67eb667
[tx-robot] updated from transifex 2018-02-12 21:33:37 +00:00
Nextcloud bot b78da27d0a
[tx-robot] updated from transifex 2018-02-01 18:28:02 +00:00
Morris Jobke eb51f06a3b
Use ::class statement instead of string
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 12:03:47 +01:00
Morris Jobke 4dbee99b7b
Remove useless return statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:50:40 +01:00
Morris Jobke 2a38605545
Properly log the full exception instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +01:00
Roeland Jago Douma db411f8771
Bump apps
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 11:40:53 +01:00
Morris Jobke f578b69729
Update composer
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 23:16:10 +01:00
Nextcloud bot 2e683d3502
[tx-robot] updated from transifex 2018-01-06 01:11:09 +00:00
Roeland Jago Douma 0280cff66f
Composer updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-04 16:31:16 +01:00
Nextcloud bot 298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
Roeland Jago Douma 49b095b78e
Use proper authorative-autoloader for app autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 08:31:31 +01:00
Nextcloud bot 96b15cec83
[tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
Nextcloud bot 8e3861563b
[tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Nextcloud bot 6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Nextcloud bot ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Nextcloud bot aa525d89e8
[tx-robot] updated from transifex 2017-11-09 01:09:13 +00:00
Nextcloud bot f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Nextcloud bot 81ac1ec977
[tx-robot] updated from transifex 2017-11-06 01:09:07 +00:00
Nextcloud bot 7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Joas Schilling ce12cd91db
Merge pull request #6875 from nextcloud/app_autoloaders
Move server apps to dedicated autoloader
2017-11-01 11:15:27 +01:00
Nextcloud bot 84f3d247f2
[tx-robot] updated from transifex 2017-10-28 00:08:32 +00:00
Morris Jobke ab36980d20
Use ::class in test mocks of dav app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 10:16:12 +02:00
Roeland Jago Douma dd9d2bcb19
ShareByMail Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Morris Jobke 43e498844e
Use ::class in test mocks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
Nextcloud bot 1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Nextcloud bot db1096bcfd
[tx-robot] updated from transifex 2017-10-23 00:08:39 +00:00
Nextcloud bot 2b31b82891
[tx-robot] updated from transifex 2017-10-22 00:08:36 +00:00
Nextcloud bot 07b6e234bd
[tx-robot] updated from transifex 2017-10-19 00:08:27 +00:00
Joas Schilling 3119fd41ce
Set the data from the template
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling 8b37fe7f65
Set the subject with the email template to allow theming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Nextcloud bot de2dc3c919
[tx-robot] updated from transifex 2017-09-27 00:08:23 +00:00
Stephan Müller f7790c2960
expect call of getSlogan() exactly twice
Signed-off-by: Stephan Müller <mail@stephanmueller.eu>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 09:20:46 +02:00
Stephan Müller 86265320b8
do not show hyphen after instance name in emails if slogan does not exist
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 09:20:46 +02:00
Nextcloud bot d603d78630
[tx-robot] updated from transifex 2017-09-19 00:08:27 +00:00
Nextcloud bot 7698781a1e
[tx-robot] updated from transifex 2017-09-14 00:08:12 +00:00
Nextcloud bot 5ce3c7003b
[tx-robot] updated from transifex 2017-09-13 00:08:12 +00:00
Nextcloud bot 194f880073
[tx-robot] updated from transifex 2017-09-08 00:08:16 +00:00
Joas Schilling 6dbb64c4a2
Merge setMetaData into constructor
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-04 15:07:41 +02:00
Nextcloud bot 45f687a279
[tx-robot] updated from transifex 2017-09-01 00:08:27 +00:00
Morris Jobke 404bd1be60
Implement metadata for email templates of remaining emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-30 22:56:14 +02:00
Nextcloud bot 1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Morris Jobke 3cfe91bf0f
Add shareWith to email template metadata
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-29 16:09:25 +02:00
Morris Jobke be23f7e1de
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:49:16 +02:00
Morris Jobke 2bf15eda26 Merge pull request #6255 from nextcloud/email-meta-data
Add meta information to emails for better customisation
2017-08-26 18:53:52 +02:00
Morris Jobke f0c34a3e89
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-26 17:57:24 +02:00
Nextcloud bot 7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Joas Schilling 09747b296a
Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-24 17:54:22 +02:00
Nextcloud bot a7f2dc6dd6
[tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Nextcloud bot ae0789ef43
[tx-robot] updated from transifex 2017-08-22 00:08:20 +00:00
Nextcloud bot 9e1884b27c
[tx-robot] updated from transifex 2017-08-21 00:08:13 +00:00
Nextcloud bot 8c458de4c2
[tx-robot] updated from transifex 2017-08-20 00:08:15 +00:00
Nextcloud bot 6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Nextcloud bot 0ceb06fde5
[tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Nextcloud bot cc40f02684
[tx-robot] updated from transifex 2017-08-15 00:08:15 +00:00
Nextcloud bot d1f3e1de96
[tx-robot] updated from transifex 2017-08-14 00:08:21 +00:00
Nextcloud bot a2e3c8ede5
[tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Nextcloud bot 21dd85678f
[tx-robot] updated from transifex 2017-08-03 00:08:06 +00:00
Nextcloud bot 456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Nextcloud bot 98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Joas Schilling 3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens
Only use readable chars in Share Tokens
2017-07-19 16:40:18 +02:00
Lukas Reschke d8ec399454
Run phan over code base
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
Joas Schilling 984933e586
Only use readable chars in Share Tokens
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-18 15:44:34 +02:00
Nextcloud bot 3865c77279
[tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Nextcloud bot 261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Nextcloud bot 13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Morris Jobke b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
Nextcloud bot d23bc9a99a
[tx-robot] updated from transifex 2017-07-07 00:08:24 +00:00
Nextcloud bot 2afb4857cc
[tx-robot] updated from transifex 2017-06-30 00:08:23 +00:00
Nextcloud bot 928b6a376e
[tx-robot] updated from transifex 2017-06-29 00:08:26 +00:00
Nextcloud bot 665ded38aa
[tx-robot] updated from transifex 2017-06-25 00:08:18 +00:00
Joas Schilling 90fa27694a
Use PNG version of the icons for shipped activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
Nextcloud bot 76d10bc46b
[tx-robot] updated from transifex 2017-06-19 00:08:20 +00:00
Nextcloud bot 26d6c4a64a
[tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Nextcloud bot 74654288e6
[tx-robot] updated from transifex 2017-06-16 00:08:44 +00:00
Nextcloud bot dc61fb999d
[tx-robot] updated from transifex 2017-06-14 00:08:39 +00:00
Bjoern Schiessle 1ef8ea5a7e
use the email address configured in Nextcloud as sender instead of the users email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-08 11:46:52 +02:00
Nextcloud bot a74901fce1
[tx-robot] updated from transifex 2017-06-08 00:08:26 +00:00
Nextcloud bot a3c5d43cd5
[tx-robot] updated from transifex 2017-06-07 00:09:00 +00:00
Nextcloud bot f03d6f225e
[tx-robot] updated from transifex 2017-06-04 00:08:29 +00:00
Nextcloud bot 5d39f700e4
[tx-robot] updated from transifex 2017-06-03 00:09:00 +00:00
Nextcloud bot c70de161cf
[tx-robot] updated from transifex 2017-06-02 00:08:30 +00:00
Nextcloud bot 8801b68d45
[tx-robot] updated from transifex 2017-06-01 00:08:38 +00:00
Morris Jobke a0f16c69ac Merge pull request #5160 from nextcloud/comradekingu-patch-1
no "mail" or mid sentence "E-mail"
2017-05-31 11:16:51 +02:00
Nextcloud bot 5f9cc5a2d5
[tx-robot] updated from transifex 2017-05-31 00:08:48 +00:00
Nextcloud bot b9b7f8bede
[tx-robot] updated from transifex 2017-05-30 00:08:44 +00:00
comradekingu 864b21dd46 no "mail" or mid sentence "E-mail" 2017-05-29 18:16:09 +02:00
Nextcloud bot a46d2f1d39
[tx-robot] updated from transifex 2017-05-25 00:08:04 +00:00
Joas Schilling bc8fbc1a67
Bump app versions as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
Joas Schilling fdfe8f7f15
Adjust version requirement
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
Nextcloud bot 462f12611c
[tx-robot] updated from transifex 2017-05-22 00:08:23 +00:00
Nextcloud bot c677f49469
[tx-robot] updated from transifex 2017-05-21 00:08:26 +00:00
Nextcloud bot 7d1f362aa0
[tx-robot] updated from transifex 2017-05-16 00:08:08 +00:00
Nextcloud bot 9ad57cabc8
[tx-robot] updated from transifex 2017-05-15 00:08:14 +00:00
Nextcloud bot b1bd9ff0b9
[tx-robot] updated from transifex 2017-05-14 00:07:54 +00:00
Nextcloud bot 241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Nextcloud bot fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Nextcloud bot 9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Morris Jobke fe13f214fd Merge pull request #4692 from nextcloud/unify-sharing-messages
don't mention the owner of a file in case of a re-share by mail.
2017-05-08 13:32:04 -05:00
Bjoern Schiessle adb60ae965
don't mention the owner of a file in case of a re-share by mail. The recipient doesn't care about the owner and probably don't even know it
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-08 19:20:31 +02:00
Nextcloud bot 6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot 56bb8745df
[tx-robot] updated from transifex 2017-05-07 00:07:31 +00:00
Nextcloud bot 59ee22101f
[tx-robot] updated from transifex 2017-05-06 00:07:33 +00:00
Nextcloud bot 619d09529c
[tx-robot] updated from transifex 2017-05-05 00:07:28 +00:00
Nextcloud bot 806aeae71d
[tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Nextcloud bot f27d382c47
[tx-robot] updated from transifex 2017-05-02 00:07:20 +00:00
Nextcloud bot 2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Nextcloud bot 4518f6dc64
[tx-robot] updated from transifex 2017-04-30 00:07:21 +00:00
Nextcloud bot c4673224d1
[tx-robot] updated from transifex 2017-04-29 00:07:17 +00:00
Nextcloud bot 6908818999
[tx-robot] updated from transifex 2017-04-28 00:07:41 +00:00
Nextcloud bot c1c5f51fd8
[tx-robot] updated from transifex 2017-04-27 00:07:40 +00:00
Morris Jobke ba43a09380 Merge pull request #4512 from nextcloud/fix-translations-2
Fix translations
2017-04-26 08:57:08 -03:00
Joas Schilling bec9f18a0f Merge pull request #4478 from nextcloud/improve_settings_help
adding some documentation hints and some smaller cleanup
2017-04-26 09:45:01 +02:00
Joas Schilling f43e7a9405
Fix past tense
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:27:41 +02:00
Nextcloud bot e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt bbb58625fe Wording fixes
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:45:35 +02:00
Jan-Christoph Borchardt 4e537b5d6b Small layout fixes to settings hints
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:45:35 +02:00
Frank Karlitschek 5e1ce69b05 adding some documentation hints and some smaller cleanup 2017-04-25 17:45:35 +02:00
Nextcloud bot 133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Nextcloud bot a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Nextcloud bot 11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Lukas Reschke 7acdc2a096 Merge pull request #4432 from nextcloud/fix-grammar
Fix grammar
2017-04-22 08:15:46 +02:00
Nextcloud bot 363d1c69dd
[tx-robot] updated from transifex 2017-04-22 00:07:36 +00:00
Morris Jobke aa2bed44b6
Fix grammar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 16:07:12 -05:00
Morris Jobke 6c294c3407
fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Morris Jobke 9d07ec5a96
Fix casing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle aa54d31bd2
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle 972b4c04e2
respect password policy for auto generated passwords
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle 428d7cdb5e
improve mail text
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle f00c1eccf7
create activity if a password was send by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle 7a8f8cbb33
templates no longer needed 2017-04-20 16:33:26 +02:00
Bjoern Schiessle d8dcd72118
allow admin to enforce password on mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Morris Jobke 16c4755e03
Rename renderHTML to renderHtml
* fixes #4383
* improves consistency

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 15:46:41 -05:00
Lukas Reschke a3569a1452 Merge pull request #4382 from nextcloud/use-proper-reply-to
Add "Reply-To" on ShareByMailProvider mails
2017-04-19 12:04:18 +02:00
Lukas Reschke b7fe28bba1
Fix indentation
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-19 12:03:54 +02:00
Nextcloud bot c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Lukas Reschke 203ef88509
Add "Reply-To" on ShareByMailProvider mails
Fixes https://github.com/nextcloud/server/issues/4209

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 22:23:07 +02:00
Nextcloud bot b072d2c49d
[tx-robot] updated from transifex 2017-04-18 00:07:25 +00:00
Nextcloud bot df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot 69e0e2420c
[tx-robot] updated from transifex 2017-04-16 00:07:23 +00:00
Morris Jobke 10290eb006 Merge pull request #2834 from nextcloud/accesListToShareManager
Access list to share manager
2017-04-15 13:06:24 -05:00
Nextcloud bot dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Nextcloud bot 0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Roeland Jago Douma cab41118f6
Mail shares trigger the public key
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 15:19:23 +02:00
Joas Schilling 629b7c0fc3
Adjust docs and make !$currentAccess simpler
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling 6c23a5fa35
Add unit tests for sharebymail provider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Roeland Jago Douma 12afd7d1d5
Add mail element to access list
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma 2cbac3357b
Offload acceslist creation to providers
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Nextcloud bot 396618fd19
[tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Joas Schilling 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
Joas Schilling 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
Morris Jobke d0bae447fb
Use new email design for sharebymail emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Nextcloud bot 633b952358
[tx-robot] updated from transifex 2017-04-12 00:07:44 +00: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
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
Nextcloud bot d25a96d921
[tx-robot] updated from transifex 2017-04-10 00:08:50 +00:00
Nextcloud bot 16091f4424
[tx-robot] updated from transifex 2017-04-09 00:07:40 +00:00
Morris Jobke ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares
Unified sharing options
2017-04-07 17:14:05 -05:00
Bjoern Schiessle 11b46389af
adjust to changes in the theming app
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle 3323d01db1
update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Nextcloud bot 7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Nextcloud bot 84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Bjoern Schiessle dac6826ad7
setting to disable sending password by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle b84fd7c361
set expire date for all share types
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle c191173d59
allow password protected mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle c6613ee8fc
fix share provider id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
Nextcloud bot 9098042c95
[tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Jan-Christoph Borchardt 9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Nextcloud bot 528a903a7b
[tx-robot] updated from transifex 2017-03-20 01:07:43 +00:00
Nextcloud bot 4da6b7e796
[tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Nextcloud bot 37fcc41004
[tx-robot] updated from transifex 2017-03-12 01:08:05 +00:00
Nextcloud bot 53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot 7fc3129f0c
[tx-robot] updated from transifex 2017-02-28 01:07:54 +00:00
Nextcloud bot f3a7b7eaa3
[tx-robot] updated from transifex 2017-02-27 01:19:49 +00:00
Nextcloud bot 556b958af2
[tx-robot] updated from transifex 2017-02-25 01:25:07 +00:00
Nextcloud bot 97b6c1496e
[tx-robot] updated from transifex 2017-02-24 01:21:37 +00:00
Nextcloud bot 54317e80c0
[tx-robot] updated from transifex 2017-02-23 01:18:48 +00:00
Nextcloud bot a08dfd9951
[tx-robot] updated from transifex 2017-02-22 01:12:24 +00:00
Nextcloud bot 51f06bb1f8
[tx-robot] updated from transifex 2017-02-19 01:07:37 +00:00
Nextcloud bot 41276f720b
[tx-robot] updated from transifex 2017-02-15 01:07:29 +00:00
Nextcloud bot 7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Nextcloud bot 88047aaea7
[tx-robot] updated from transifex 2017-02-13 01:07:10 +00:00
Nextcloud bot f9d94edb0f
[tx-robot] updated from transifex 2017-02-12 01:07:26 +00:00
Nextcloud bot 01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Morris Jobke 8a74ab88d8
add transifex config for sharebymail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 19:53:32 -06:00
Bjoern Schiessle 27357569b6
generate correct path for owner and use the display name instead of the user id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-12 12:44:41 +01:00
Joas Schilling 6de0eb0b74
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Morris Jobke ac1bf3c2b7 Merge pull request #2432 from nextcloud/activity-mail-language
Make sure the activity emails can be sent in the users language
2016-12-01 23:01:00 +01:00
Lukas Reschke a87638c6ab Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares
Add share indicator for mail shares
2016-12-01 12:17:56 +01:00
Joas Schilling b2f46bfa04
Adjust all implementations in the server repo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
Joas Schilling 15ca00c66e
Make sure the app is loaded in dav
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
Morris Jobke 01867b42d4 Update sharedbymail template
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-30 01:07:00 +01:00
Joas Schilling f067d0ee66
Correctly match the subjects to the parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:45:40 +01:00
Joas Schilling 9f915e061c
Remove old test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:17:40 +01:00
Joas Schilling 719b1905d7
Get user name from contacts if available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:17:06 +01:00
Joas Schilling 5c2ec58440
Move ShareByMail activities to new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 16:15:51 +01:00
Lukas Reschke bc1008ac38
Use 11.0 instead 9.2
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
Joas Schilling 1c97d1b4ed
Fix some typos
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 17:05:29 +01:00
Bjoern Schiessle 25bcd71d02
add activity if a file was shared by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:58:52 +01:00
Jan-Christoph Borchardt 219b536f70 add share by mail icon, fix #1979
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-03 14:05:43 +01:00
Lukas Reschke ffba8297df
Run code checker on more shipped apps
Adds:
- sharebymail
- systemtags
- theming
- workflowengine

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-03 00:11:28 +01:00
Bjoern Schiessle f2b2b8d894
import exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:12:01 +01:00
Bjoern Schiessle 32dbf32bc5
add new method getSharesInFolder(), see #339
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:05:09 +01:00
Bjoern Schiessle 16ec0f2177
add tests for the share-by-mail provider
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 86b362809b
always show correct place holder, mention share by mail only if the share provider is enabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle ce08682c2f
enabled by default and add to shipped.json
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 1e930df91f
find and show share-by mail links
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 31c8c38bd6
send mail for share-by-mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle a17c6a485d
add share by mail share provider
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00