Commit graph

930 commits

Author SHA1 Message Date
Tomas Bures
63765f7222 Client's public folder renamed to static
Regular campaign sender seems to have most of the code in place. (Not tested.)
2018-09-18 10:30:13 +02:00
Tomas Bures
89eabea0de Fixes in selection of subscribers 2018-09-11 10:07:00 +02:00
Tomas Bures
01d1a903a2 Work in progress on Campaign Status 2018-09-10 20:15:59 +02:00
Tomas Bures
d1fa4f4211 Work on sending campaigns. Campaign status page half-way done, but does not work yet. 2018-09-10 00:55:44 +02:00
Tomas Bures
67d7129f7b Campaign UI and model adjusted to allow sending a campaign to multiple lists 2018-09-02 20:17:42 +02:00
Tomas Bures
130c953d94 Updated packages to remove vulnerabilities reported by npm
Implementation of feedcheck - not tested though
2018-09-02 14:59:02 +02:00
Tomas Bures
d74806dde3 Basic import seems to work 2018-09-01 21:29:10 +02:00
Tomas Bures
16519c5353 Some additions to import UI to cover the basic subscribe and unsubscribe cases. 2018-08-26 15:32:03 +02:00
Tomas Bures
739b9452de UI for basic import and preparation phase of CSV. 2018-08-26 11:46:12 +02:00
Tomas Bures
877e0a857d Merge branch 'master' into development 2018-08-06 21:02:41 +05:30
Tomas Bures
cd798b5af7 Preparation of merge with master 2018-08-06 20:24:51 +05:30
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
Tomas Bures
6648028270 First part of the UI for file import (upload of csv file to the server) 2018-08-05 10:17:05 +05:30
Tomas Bures
965f30cea7 Editing of triggers seems to work.
Some further fixes.
2018-08-04 15:00:37 +05:30
Tomas Bures
ffc26a4836 Migration and model for triggers.
Not tested.
2018-08-03 21:37:46 +05:30
Tomas Bures
7b46c4b4b0 Editing of campaigns seems to work 2018-08-03 17:05:55 +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
Tomas Bures
b1c667d13d Merged migrations into one big v1->v2 which is not incremental, thus it does not need code copy-pasting.
Some fixes.
2018-08-02 17:05:57 +05:30
Tomas Bures
32cad03f4f Improved files to distinguish subtypes (allows multiple different files tabs at a entity)
Attachments via the improved files
Block thumbnails at mosaico templates as a separate files tab
Some fixes

All not tested yet
2018-08-02 15:49:27 +05:30
Tomas Bures
ade0fc87f2 work in progress on campaign edit 2018-08-01 15:30:20 +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
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
Tomas Bures
0e0fb944e3 First attempt on campaign editing. Misses attachments. Untested. 2018-07-31 10:04:28 +05:30
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
Tomas Bures
ee786bc8ad Fixes in migration of templates and campaigns from Mailtrain ver 1 2018-07-22 15:02:43 +05:30
Tomas Bures
189638364c Added migration for campaigns 2018-07-22 00:01:28 +05:30
Tomas Bures
e85c707973 Some small updates coming from IVIS 2018-07-18 18:41:18 +01: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