Commit graph

407 commits

Author SHA1 Message Date
Programster
4b54c36878 using the local files for the docker build rather than performing a git clone. This way if we build from an older release, we will be building that release rather than always the latest version of mailtrain. 2017-04-08 13:37:59 +01:00
witzig
bc669c1e05 Remove pencil icon from GrapeJS image toolbar, #195 2017-04-07 23:12:01 +02:00
Andris Reinman
04e1b015b9 v1.23.2 2017-04-04 12:41:32 +03:00
Andris Reinman
4ca98dd437 v1.23.2 2017-04-04 12:40:06 +03:00
witzig
60907c0d86 Subscription Widget 2017-04-03 20:42:04 +02:00
witzig
67eae8616d Use pixel values for alerts on subscription pages 2017-04-02 22:27:08 +02:00
witzig
9c2444488f Satisfy ESLint no-unused-vars 2017-04-02 14:00:42 +02:00
witzig
52bbdb1a09 Fixed NodeList.forEach (and some refactoring) 2017-04-02 13:58:42 +02:00
Andris Reinman
f234a64df7 Merge pull request #187 from larrabee/disable_email_check
Add option to disable email cheking for imported CSV
2017-03-31 13:43:08 +03:00
Andris Reinman
8715b80990 Merge pull request #188 from larrabee/change_chart_view
Small visual change in device/country charts
2017-03-31 13:24:17 +03:00
vladimir
3b39f619b1 Small visual change in device/country charts 2017-03-31 11:51:26 +02:00
vladimir
1547e887c3 Add option to disable email cheking for imported CSV 2017-03-31 11:20:43 +02:00
Andris Reinman
2df265009c v1.23.1 2017-03-26 14:01:17 +03:00
Andris Reinman
d7c06e0a5a Do not use .stack property with error objects 2017-03-24 13:04:38 +02:00
Andris Reinman
060b6dbacc Merge branch 'master' of kreata.ee:/var/opt/mailtrain 2017-03-23 15:47:56 +02:00
Andris Reinman
47705c212d Replaced andris9 with Mailtrain-org 2017-03-23 15:47:00 +02:00
Andris Reinman
2dd21c11c0 updated README 2017-03-23 14:34:29 +02:00
Andris Reinman
6f95474155 Removed mailtrain.pot catalogue file. Generate it every time freshly when updating PO file 2017-03-23 11:15:01 +02:00
witzig
06fca3acdb Added ImageMagick to install.sh 2017-03-22 11:22:52 +01:00
witzig
2faa363196 Merge pull request #185 from witzig/translation
German Translation
2017-03-21 14:26:03 +01:00
witzig
e5655bcd0b de_DE 2017-03-21 14:24:28 +01:00
witzig
2b7e0bbc4c Updated mailtrain.pot 2017-03-21 14:24:15 +01:00
witzig
1564ca07cc Freeze MJML dependency 2017-03-21 12:00:42 +01:00
Andris Reinman
bb25c65c63 merged 2017-03-21 12:30:08 +02:00
witzig
56f621079f Updated Screenshots 2017-03-21 10:53:35 +01:00
witzig
038c8f4adb Fix closing tag 2017-03-21 10:26:26 +01:00
witzig
0e7f85f13e Add .logged-in and .user-username to body 2017-03-21 10:24:48 +01:00
Andris Reinman
89f70ba8d1 Merge pull request #179 from larrabee/master
[feature] Add Dockerfile and update readme
2017-03-21 11:08:14 +02:00
vladimir
9bfa61c92c Add ImageMagick install to Dockerfile 2017-03-21 11:07:24 +02:00
Andris Reinman
179e0d5ab3 fixed thrown errors 2017-03-21 10:39:44 +02:00
Andris Reinman
73ee6bf4a1 updated mailtrain sql 2017-03-21 10:31:56 +02:00
Andris Reinman
846e4f8cc4 Merge branch 'larrabee-clicks-by-device-type' 2017-03-21 10:31:12 +02:00
Andris Reinman
1e9c9f3275 Merge branch 'clicks-by-device-type' of https://github.com/larrabee/mailtrain into larrabee-clicks-by-device-type 2017-03-21 10:29:00 +02:00
vladimir
3152ecb228 Merge remote-tracking branch 'upstream/master' into clicks-by-device-type 2017-03-21 10:26:50 +02:00
Andris Reinman
6b87a9711f fixed conflicts 2017-03-21 10:16:42 +02:00
Andris Reinman
b63af2549b bumped some deps 2017-03-21 10:14:39 +02:00
Andris Reinman
979321ea98 Merge pull request #180 from witzig/custom-forms-mjml
Custom forms mjml
2017-03-21 09:54:59 +02:00
vladimir
8caf334fcc Cosmetic changes 2017-03-21 01:06:05 +02:00
vladimir
97d5d1a462 Replace if-else with unless function in clicked view 2017-03-21 00:16:50 +02:00
witzig
9f68fe9cbb Removed defaultPostaddress from subscription footer 2017-03-20 22:39:13 +01:00
witzig
8852f33f03 Added note about MJML usage 2017-03-20 22:32:32 +01:00
witzig
0b0929aa7b Some code formatting 2017-03-20 21:40:21 +01:00
witzig
f2b7d4c8df Removed data keys from table custom_forms 2017-03-20 21:25:41 +01:00
vladimir
e3cb6ca679 Fix formating and rewrite migration script 2017-03-20 21:50:53 +02:00
witzig
c3ee53bd4b Refactored Custom Form Table Structure 2017-03-20 19:37:09 +01:00
vladimir
7d768ebd48 Fix link.id in opened links 2017-03-20 16:53:13 +02:00
vladimir
10dd23fee4 Merge remote-tracking branch 'upstream/master' into clicks-by-device-type 2017-03-20 14:50:10 +02:00
vladimir
1ba3bce6eb Add device type detect and stats calculation for open/click rate by device type and country 2017-03-20 14:44:17 +02:00
witzig
477aff95d5 Moved scripts out of layout.mjml.hbs 2017-03-19 16:14:31 +01:00
witzig
91addb14af Satisfy ESLint indentation rule 2017-03-19 16:03:11 +01:00