Commit graph

202 commits

Author SHA1 Message Date
Andris Reinman
be55f2ca52 remove extra variables from format call 2020-07-13 12:50:34 +03:00
Andris Reinman
b7f94b40d6 Use proper escaping for variable column names 2020-07-13 10:00:25 +03:00
Tomas Bures
fa1bf1c874
Merge pull request #482 from ateuber/custom_field_description
Custom field description
2019-03-09 09:04:38 +01:00
Andreas Teuber
4a446a99f0 Fix Travis 2019-03-07 19:45:59 +01:00
Andreas Teuber
2b11a319b4 Added possibility to duplicate a campaign 2019-03-07 19:40:31 +01:00
Andreas Teuber
d3ad3e5d68 Fix Travis 2018-10-31 14:06:30 +01:00
Andreas Teuber
cdaf4b0b16 Added description to custom fields 2018-10-31 11:18:31 +01: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
dfac6cec80 Merge branch 'pr449' 2018-08-05 17:27:26 +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
fe7d34e0f6 Merged pull request #412 2018-08-05 17:22:31 +05:30
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
Balázs Kovács
4bd1e994b2 warn on failed login 2018-07-29 01:38:29 +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
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
Reto Kaiser
16ce44146f Add option on list to disable "List-Unsubscribe" header 2018-06-13 09:53:29 +02:00
Reto Kaiser
06ee230e33 Fix eslint warnings 2018-05-29 15:15:49 +02:00
Jonas Düver
52f4213cb7 Add segment support to triggers model and database 2018-04-25 18:16:51 +02:00
rrooij
a9054b30dd Subscriptions: fix error typo 2018-03-23 19:53:28 +01:00
Andris Reinman
69550d0383
Merge pull request #349 from zermelo-software/passport-ldapauth
Add support for passport-ldapauth
2018-01-09 12:41:05 +02:00
Andris Reinman
75f34905d8
Merge pull request #368 from HLFH/master
Custom date fields will support dates before 1970
2018-01-09 12:37:50 +02:00
Georgios Anastasiou
678e6a5d59 Fixed to pass test 2018-01-08 13:47:28 +02:00
Georgios Anastasiou
c085faa157 Implemented api for searching lists that have parameter email as a subscriber 2018-01-08 13:03:38 +02:00
Gaspard d'Hautefeuille
bc73a0df0c
Custom date fields will support dates before 1970
TIMESTAMP replaced by DATETIME
2018-01-03 09:19:54 +00:00
Gerard Krol
4d81089959 Add support for passport-ldapauth 2017-11-08 10:47:46 +00:00
Brenton Durkee
56fedc6ee9 Fix lint errors 2017-10-17 19:16:19 -04:00
Brenton Durkee
0cbec006b4 Adds duplicate button to Template edit form.
Adds duplicate model function for Template that gets a Template by id
and creates a new Template with the same data.
2017-10-16 11:29:57 -04:00
Melwin Kieffer
65923c0c05 add: LDAP options bindUser and bindPassword
To be able to use a different user for bind requests,
which can be required by some LDAP security strategy.
2017-10-10 16:30:40 +02:00
witzig
0a369e2475 Fix grouped custom fields not saving deselected values #333 2017-10-05 13:39:53 +02:00
witzig
ebac58e686 Add comment 2017-09-29 00:13:32 +02:00
witzig
c5b481a266 Add option to preserve unsubscribed status on list import, #325 2017-09-28 00:55:19 +02:00
witzig
ce2ed26fc9 findMailByResponse now searches in latest campaigns first
This should be more efficient especially if there’re many campaigns.
2017-07-13 22:29:55 +02:00
Andris Reinman
091c00a218 Merge pull request #269 from losacno/master
Check for locally requeued messages in postfix
2017-07-10 18:22:04 +03:00
Luc LosCan
f90e67d775 Save new queueId/response on locally requeued messages 2017-07-10 12:13:17 +02:00
Bruce Mackintosh
191dc7b541 Changed the trigger treshold value from 6 hours to 24 hours, so that dates stored via the API as 00:00:00 are correctly picked up and added to the queue. 2017-07-03 19:44:45 +01:00
witzig
5647dd040d Updated subscription-mail-helper.js - Don't wait for mailer to finish.
Note: When using encryptionKeys, confirmation redirects feel a bit
sluggish. This could probably be 'improved' by calling sendMail via
setTimout or fixed by moving sendMail to a worker.
2017-06-16 14:28:57 +02:00
witzig
a2ebe8f0f7 Fixed mail-helper.js not calling back when disableConfirmations = true
And some refactoring
2017-06-16 02:13:21 +02:00
witzig
830ca4f17f Satisfy eslint rule no-useless-escape 2017-06-15 21:44:54 +02:00
witzig
2da90b58e4 Satisfy new eslint indentation rule 2017-06-15 21:26:35 +02:00
witzig
4f5c132db4 Fixed bug: Hidden custom fields (for custom forms) losing values when updating preferences.
Credits to @flapuente-palbin
2017-06-15 19:11:13 +02:00
Krzysztof Jablonski
71ac4c64a5 Avoid using > with „enums” 2017-06-08 14:22:34 +02:00
Krzysztof Jablonski
819fcfb392 Fix typo during refactoring
During code refactoring for selectable
unsubscription feature code:
`!campaignId || status > 2` was wrongly refactored
to:
`subscription.status !== Status.SUBSCRIBED`

Link:
a6d25e668b (diff-5af9fe5dfae76c093530c92e3d7404e1R496)
2017-06-08 14:06:35 +02:00
witzig
5aa6dff743 Fixed HTML templates for custom JSON fields #192 2017-06-03 00:13:03 +02:00
witzig
cec227d688 Fixed Merge Tags for custom date fields 2017-06-02 03:05:19 +02:00
witzig
466bf225a3 Fixed Merge Tags #206 #236 2017-06-02 00:24:26 +02:00