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

910 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tomas Bures
446d75ce71 Support for custom block thumbnails in Mosaico templates 2018-05-13 22:40:34 +02:00
Tomas Bures
7788b0bc67 Fixed sandbox. Multiple tabs work now. 
WiP on selectable mosaico templates.

TODO: Make files always point to trusted URL, such that we don't have to rebase them. They are public anyway. The same goes for mosaico endpoints: /mosaico/templates and /mosaico/img
 2018-05-09 04:07:01 +02:00
Tomas Bures
a4ee1534cc WiP on mailers 2018-04-29 18:13:40 +02: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
e97415c237 Some bugfixes. The configuration management should be now OK. 2018-04-22 20:29:35 +02:00
Tomas Bures
c12efeb97f Configuration split to lists, send configurations and server config. 
This is before testing.
 2018-04-22 17:33:43 +02:00
Tomas Bures
4fce4b6f81 WiP updates 2018-04-22 09:00:04 +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
David Furlong
d0d76f69ca
Update README.md 2018-04-10 13:59:29 +02:00
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