public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
793 commits 9 branches 34 tags 30 MiB
Commit graph

793 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tomas Bures
6706d93bc1 Basic support for Mosaico templates. 
TODO:
- Allow choosing a mosaico template in a mosaico-based template
- Integrate the custom mosaico templates with templates (endpoint for retrieving a mosaico template, replacement of URL_BASE and PLACEHOLDER tags
- Implement support for MJML-based Mosaico templates
- Implement support for MJML-based templates
- Implement support for GrapeJS-based templates
 2018-04-02 19:05:22 +02:00
Tomas Bures
7b5642e911 Basic support for Mosaico-based email templates. 2018-04-02 11:58:32 +02:00
Tomas Bures
b5cdf57f72 Files can be added to templates and managed in a dedicated "Files" view. 
Mosaico integration in progress. The files seem to be working for Mosaico.
 2018-03-24 23:55:50 +01:00
rrooij
465fa3a739 Fix translations typo and double message 
The Spanish error about the missing message ID appeared twice and
generated an error when converting the translation file.

Another fix is the typos that were still present in the msgid's.
 2018-03-24 13:37:19 +01:00
Tomas Bures
d83ec23629
Merge pull request #401 from rrooij/typofix 
Subscriptions: fix error typo
 2018-03-24 09:31:20 +01:00
rrooij
a9054b30dd Subscriptions: fix error typo 2018-03-23 19:53:28 +01:00
Maurice Meyer
73f12050bc
Fixed more of the translation 
Signed-off-by: Maurice Meyer <morre@mor.re>
 2018-03-07 14:13:00 +01:00
Maurice Meyer
62f2b6a2d8
Fixed some more minor translation errors 
Signed-off-by: Maurice Meyer <morre@mor.re>
 2018-03-07 14:10:16 +01:00
Maurice Meyer
d7a9731d80
Improved German translation 
Signed-off-by: Maurice Meyer <morre@mor.re>
 2018-03-06 16:34:31 +01:00
Gerard Krol (Zermelo)
5ee8347115
Merge pull request #393 from mauricemeyer/master 
Fixed typos and superfluous spaces in the German translation
 2018-03-06 14:58:44 +01:00
Maurice Meyer
9ae21f7550
Fixed typos and superfluous spaces 
Signed-off-by: Maurice Meyer <morre@mor.re>
 2018-03-06 14:51:49 +01:00
Tomas Bures
c85f2d4440 Obsoleting some old files 
Transition to SPA-style client
Basis for Mosaico template editor
 2018-02-25 20:54:15 +01:00
Tomas Bures
7750232716 Merge remote-tracking branch 'upstream/master' into development 2018-02-24 23:05:01 +01:00
Tomas Bures
ba75623f86 Integrated CKEditor for templates. We might need to move it to a sandbox later to make it secure. 2018-02-24 21:59:00 +01:00
Tomas Bures
ca145edaef
Merge pull request #379 from gsiou/api-search-user 
Docs for api/lists/:email
 2018-02-18 19:28:40 +01:00
Tomas Bures
508d6b3b2f Beginning of work on templates. 2018-02-13 23:50:13 +01:00
Gerard Krol (Zermelo)
1aea2d6b3e
Merge pull request #383 from alen12345/ldapauth-docker 
Added ldapauth support to docker
 2018-02-13 16:57:56 +01:00
Alessio Nava
e4d21e037a Added ldapauth support to docker 2018-02-13 14:54:17 +00:00
Georgios Anastasiou
b151784071 Docs for api/lists/:email 2018-02-06 14:57:58 +02:00
Tomas Bures
47b8d80c22 Fixes in subscriptions. It now passes the tests. 
API tests still don't work.
 2018-01-28 23:59:05 +01:00
Tomas Bures
e9165838dc Subscription/unsubscription seems to work. 2018-01-27 16:37:14 +01:00
Andris Reinman
3c36d298c4 updated install script 2018-01-09 12:43:02 +02: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
3f1f68515d
Merge pull request #323 from programster/updating-documentation 
Moving documentation to docs area
 2018-01-09 12:40:33 +02:00
Andris Reinman
ed2c84d868
Merge pull request #314 from wotomg/patch-1 
Update install.sh
 2018-01-09 12:39:08 +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
Andris Reinman
304b9a0fd5
Merge pull request #369 from gsiou/api-search-user 
API functionality - Get lists a user has subscribed to
 2018-01-09 12:37:29 +02:00
Georgios Anastasiou
bd53a77bed Changed route 2018-01-09 12:20:46 +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
Tomas Bures
d8ee364a4b settings keys in DB converted to camel case 
callback-based settings model replaced by async-based settings model
 2017-12-30 17:27:24 +01:00
Tomas Bures
6c5c47ac2e Refactored subscriptions. Not even executed. 2017-12-30 12:23:16 +01:00
Tomas Bures
b22a87e712 Work in progress on subscriptions 2017-12-10 21:44:35 +01:00
Roger Witzig
eb8a5878dd
Merge pull request #344 from brentdur/brentdur/247_template-duplicate 
Adds duplicate Template
 2017-11-15 12:56:34 +01:00
Roger Witzig
dca236af23
Merge pull request #348 from zermelo-software/api_extensions 
Add API support for GET /api/subscriptions/:listId
 2017-11-13 15:25:06 +01:00
Gerard Krol
8b2e3b47b0 Add note about generated names of custom fields. 2017-11-08 10:54:18 +00:00
Gerard Krol
4d81089959 Add support for passport-ldapauth 2017-11-08 10:47:46 +00:00
Gerard Krol
ac09ba81dd Add API documentation for GET /api/subscriptions/:listId 2017-11-06 10:34:55 +00:00
Gerard Krol
0073989430 Add API support for retrieving subscriptions. 2017-11-06 10:23:57 +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
Roger Witzig
b30a9f2e41 Merge pull request #341 from MelwinKfr/patch-1 
add: LDAP options `bindUser` and `bindPassword`
 2017-10-11 13:34:31 +02:00
Melwin Kieffer
cf38aea80b doc: bindUser and binPassword LDAP options 2017-10-11 12:11:45 +02: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
6e3b9d209c Fix import type display 2017-10-01 21:36:11 +02:00
witzig
615ed5a693 Support multiple usage of RSS merge tags, closes #329 2017-09-29 12:22:37 +02:00
witzig
46acece89c Improve CSV import error handling, closes #324 2017-09-29 00:32:00 +02:00
Roger Witzig
b406870756 Merge pull request #326 from witzig/list-import 2017-09-29 00:26:55 +02:00