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 |
|
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 |
|
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 |
|
Reto Kaiser
|
06ee230e33
|
Fix eslint warnings
|
2018-05-29 15:15:49 +02:00 |
|
Wes Garrison
|
48ecc9b47c
|
Fix newsletter signup link in README
|
2018-05-23 11:33:08 -05:00 |
|
Tomas Bures
|
b74c4d9438
|
Merge pull request #421 from gsiou/master
API functionality: get all lists, get list by id
|
2018-05-21 06:03:46 -07:00 |
|
Tomas Bures
|
076d746b32
|
Merge pull request #415 from mauricemeyer/master
Updated some german translations
|
2018-05-21 06:02:53 -07:00 |
|
Tomas Bures
|
3d339cd674
|
Merge pull request #413 from dougal/fix-spelling-lose-password
Fix spelling in email field help block.
|
2018-05-21 06:02:01 -07:00 |
|
Georgios Anastasiou
|
60adfed0a6
|
API: get list by id
|
2018-05-16 12:43:36 +03:00 |
|
Georgios Anastasiou
|
5f18c9d44f
|
API: get all lists
|
2018-05-16 12:15:45 +03:00 |
|
Maurice Meyer
|
61f3f4069c
|
Merge remote-tracking branch 'upstream/master'
|
2018-04-28 16:06:12 +02:00 |
|
Douglas F Shearer
|
549cc70c4f
|
Fix spelling in email field help block.
|
2018-04-26 13:20:41 +01:00 |
|
Jonas Düver
|
80f2fe1b26
|
Bump version
|
2018-04-25 18:18:36 +02:00 |
|
Jonas Düver
|
52f4213cb7
|
Add segment support to triggers model and database
|
2018-04-25 18:16:51 +02:00 |
|
Jonas Düver
|
006e4aa116
|
Add segment support to triggers frontend
|
2018-04-25 18:15:14 +02:00 |
|
Tomas Bures
|
ae7a8eb72d
|
Merge pull request #407 from davidfurlong/master
Update README.md
|
2018-04-14 07:36:38 +02:00 |
|
Tomas Bures
|
39ef4c1119
|
Merge pull request #402 from rrooij/translation_fix
Fix translations typo and double message
|
2018-04-14 07:35:57 +02:00 |
|
Tomas Bures
|
f6892a8ca4
|
Merge pull request #408 from giorgioma/master
[LANG] 94% Italian language translation - left some techy strings
|
2018-04-14 07:34:57 +02:00 |
|
giorgioma
|
376afdf9ae
|
Typo fix
|
2018-04-11 12:43:32 +02:00 |
|
giorgioma
|
288eebdbcd
|
[LANG] 94% Italian language translation - left some techy strings
|
2018-04-10 16:33:54 +02:00 |
|