Commit graph

240 commits

Author SHA1 Message Date
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