mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
53,272 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

41 Commits

Author SHA1 Message Date
John Molakvoæ 36f9ad32f2
Merge pull request #20447 from liamjack/fix/13287/welcome_email 
Increase max-height on button in welcome email template
 2020-04-17 09:42:49 +02:00
Roeland Jago Douma bb4dedb015
Provide the proper language to the mailer 
Else we can't properly translate the footer in the recipients e-mail
language.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-04-16 09:04:13 +02:00
Liam JACK 301335e9e1
Fix #13287 - Increase max-height on button in welcome email template 
Signed-off-by: Liam JACK <liamjack@users.noreply.github.com>
 2020-04-12 13:07:16 +02:00
Christoph Wurst caff1023ea
Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Christoph Wurst 5bf3d1bb38
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Tomasz Paluszkiewicz 52dcc9550c
changed order of methods 
Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
 2019-02-26 00:24:46 +01:00
Tomasz Paluszkiewicz 65853a3314
fix(EMailTemplate): malformed HTML in some cases 
when an addBodyListItem() is not directly followed by addBodyButton(), resulting HTML is broken

Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
 2019-02-24 20:14:59 +01:00
brad2014 3442ffeb54 Fix bug #12151: fix list formatting by correcting malformed html 
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
 2018-10-30 15:28:55 -07:00
Julius Härtl 7a4c23a720
Use index for format string parameters 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 11:43:15 +02:00
Julius Härtl 185cb494c0
EMailTemplate: Move background color of buttons to the table to fix rendering in lotus notes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 07:49:48 +02:00
Roeland Jago Douma f6fe04f3d7
Fix comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Roeland Jago Douma 0c500e460f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Roeland Jago Douma 0cef938299
Make \OCP\Mail strict 
* Fix typehints
* Made strict

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Joas Schilling 350e38396f
Allow custom HTML in HTML Emails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:09:19 +01:00
Morris Jobke cce4c285db
Fix email buttons for white theme 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 14:33:54 +01:00
Morris Jobke 0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Joas Schilling f109c1a10c
Allow templating of email subjects 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:00 +02: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
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
Lukas Reschke e1f52fc901
Stricter phan config fixes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:13 +02:00
Morris Jobke ae13d011d1 Remove unneeded styles 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 11:09:14 +02:00
Lukas Reschke bb6fe6afba
Adjust to height=120 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-24 10:18:16 +02:00
Lukas Reschke ba1e16ea2e Revert "Set max-width of image to 100px in Outlook as well" 2017-07-24 10:14:47 +02:00
Morris Jobke a98f57ebd0 Set max-width of image to 100px in Outlook as well 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-23 23:15:21 +02:00
Lukas Reschke 099234cf12
Add function to request SVG or regular fallback image 
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 14:51:55 +02:00
Joas Schilling f1ffb728b9
Allow meta info and icons 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 14:31:21 +02:00
Joas Schilling 35414884d3
Add lists to HTML emails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 13:48:27 +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
Joas Schilling 1c0bffe87f
Fix translations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-18 16:40:53 -05:00
Morris Jobke 1f962f9115
Update email template for lost password email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 15:19:53 -05:00
Joas Schilling 4b639e2763
No newlines when heading is empty 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:27 +02:00
Bjoern Schiessle 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
Joas Schilling 1c8c62272c
Use instance name as alt-text 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:26 +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 33e077c1c1
Properly escape heading, body and button text 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 17:16:26 +02:00
Morris Jobke 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
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
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
Morris Jobke 5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Lukas Reschke 281ad406e8
Add support for theming 
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Morris Jobke 0560e69913
New layout for welcome email 
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-07 12:03:32 -05:00