Arno
a49a9b2637
update french translation and a typo in views/lists/segments/rule-edit.hbs
2018-11-29 17:28:33 +01:00
Tomas Bures
f661ba8a6b
Merge pull request #466 from balping/patch-1
...
Ignore more config files
2018-09-27 18:34:30 +02:00
Tomas Bures
26b3cd44e8
Merge pull request #465 from balping/trans
...
Hungarian translation
2018-09-27 18:34:04 +02:00
Balázs Kovács
6bdf074c01
translate more strings
2018-09-10 16:10:28 +02:00
Balázs Dura-Kovács
f89ba5a5dd
ignore more config files
2018-09-08 15:52:46 +02:00
Balázs Kovács
5db5bb73c4
hungarian trans continued
2018-09-07 16:54:29 +02:00
Tomas Bures
dcf8330929
Merge pull request #458 from a4i/master
...
add french translation
2018-09-03 07:26:03 +02:00
Tomas Bures
a774975f45
Merge pull request #457 from Addy90/patch-1
...
add passport-ldapauth to dependencies
2018-09-03 07:25:23 +02:00
Sylvain Amrani
af8c3202dd
add french translation
2018-08-11 19:32:49 +02:00
Adrian
4dd754ff82
add passport-ldapauth to dependencies
...
when "npm install --production" is called, every time, passport-ldapauth is removed from local repository, with adding the dependency to package.json, the behavior is as expected (see production.yml config for ldap config)
2018-08-07 08:41:13 +02:00
Tomas Bures
ee0d148427
Merge branch 'pr453'
2018-08-05 17:44:58 +05:30
Tomas Bures
198a67bbd2
Merge branch 'pr452'
2018-08-05 17:37:01 +05:30
Tomas Bures
c37649a3db
Merge branch 'pr450'
2018-08-05 17:36:29 +05:30
Tomas Bures
8193f0bf4d
Merge PR #451
2018-08-05 17:36:10 +05:30
Tomas Bures
dfac6cec80
Merge branch 'pr449'
2018-08-05 17:27:26 +05:30
Tomas Bures
d19b211aa0
Merge branch 'master' of github.com:Mailtrain-org/mailtrain
2018-08-05 17:27:18 +05:30
Tomas Bures
4c16987568
Merge pull request #445 from Addy90/https
...
Enabling HTTPS server side support
2018-08-05 17:25:43 +05:30
Tomas Bures
e01421ca11
Merge branch 'pr445'
2018-08-05 17:25:07 +05:30
Tomas Bures
967e19f55e
Merge pull request #444 from Addy90/ldap-ssl
...
LDAP SSL Support
2018-08-05 17:24:16 +05:30
Tomas Bures
f9253db62e
Merge pull request #426 from wesgarrison/patch-1
...
Fix newsletter signup link in README
2018-08-05 17:23:45 +05:30
Tomas Bures
fe7d34e0f6
Merged pull request #412
2018-08-05 17:22:31 +05:30
Tomas Bures
102c46c3fb
Bumped version in meta.json. Otherwise the sql updates are not executed.
2018-08-05 17:08:24 +05:30
Tomas Bures
503cf42efb
Merge pull request #442 from Naugrimm/feature/lang-de-fixes1
...
add missing translations (de_DE)
2018-08-05 15:02:58 +05:30
Adrian Woeltche
396c8f597e
another hack
2018-08-02 16:48:46 +02:00
Adrian Woeltche
3217af5720
dirty fix for making test button better working
2018-08-02 16:46:06 +02:00
Raphael Hittich
0f20c5f6f7
Fix another linter error
2018-08-01 11:12:44 +02:00
Raphael Hittich
a26c75e26c
Fix linter error
2018-08-01 11:09:16 +02:00
Raphael Hittich
68cb8384f7
Add custom unsubscribe option in a campaign
2018-08-01 10:46:34 +02:00
Adrian Woeltche
4f65a295fb
fixed sending test mail
2018-07-31 15:30:52 +02:00
Adrian Woeltche
9b1ab6fc5b
another grapejs update and fix for images
2018-07-31 13:54:43 +02:00
Balázs Kovács
920f833988
Hungarian trans wip
2018-07-29 03:07:10 +02:00
Balázs Kovács
4bd1e994b2
warn on failed login
2018-07-29 01:38:29 +02:00
Raphael Hittich
44fe8882b8
Add X-Mailer header option in settings to override or disable it.
2018-07-27 14:46:46 +02:00
Adrian Woeltche
65f25bb009
more updates
2018-07-11 17:26:50 +02:00
Adrian Woeltche
7327fdbeab
fixes removed as they cause problems with new version that seems to have implemented own fixes, hopefuly without side effects
2018-07-11 16:34:20 +02:00
Adrian Woeltche
a56b4823a1
readded files (tested)
2018-07-11 16:10:18 +02:00
Adrian Woeltche
c6dd8ac7f9
permit to erase styles
2018-07-11 16:05:06 +02:00
Adrian Woeltche
b14bde2a6f
wrong file
2018-07-11 15:51:59 +02:00
Adrian Woeltche
d6f7f9a055
grapejs update
2018-07-11 15:50:02 +02:00
humancopy
e0a5d356a2
Add != to formatted rule to show that it's negated
2018-07-02 15:35:37 +02:00
humancopy
ceba65a098
Add the possibility to create a negated rule on segments
2018-07-02 14:26:59 +02:00
Adrian Woeltche
abd788d8f4
optional ca and dhparams
2018-06-21 16:45:18 +02:00
Adrian Woeltche
4501f71dd8
permit https
2018-06-21 16:41:45 +02:00
Adrian Woeltche
fe6152ea31
added ca options
2018-06-21 15:58:46 +02:00
Adrian Woeltche
5325f2ea78
ldap change to url for making it possible to use ldaps:// too
2018-06-21 15:15:44 +02:00
Erik Anders
3b695bed35
add missing translations
2018-06-15 09:41:14 +02:00
Tomas Bures
206e7a5b52
Merge pull request #434 from njam/disable-listunsubscribe
...
Add option on list to disable "List-Unsubscribe" header
2018-06-13 12:48:20 +02:00
Reto Kaiser
16ce44146f
Add option on list to disable "List-Unsubscribe" header
2018-06-13 09:53:29 +02:00
Tomas Bures
fc5fc5b09c
Merge pull request #436 from njam/fix-build
...
Fix build
2018-06-12 13:10:09 +02:00
Reto Kaiser
133eb68325
Change email domain in tests to "gmail.com"
...
The domain needs to have an MX record associated, and mailtrain.org doesn't have one (anymore).
2018-05-29 15:37:05 +02:00
