Commit graph

  • 3072632d8d Fixed eslint errors Tomas Bures 2017-04-23 15:24:31 -0400
  • bb4eb3832f Some bugfixes to the previous commit. Tomas Bures 2017-04-20 19:57:55 -0400
  • 8237dd5d77 The "Reports" feature seems functional. Some small refactoring (column widths) of rendering tables in Lists, Templates, and Campaigns so that it is the same as Reports. Tomas Bures 2017-04-20 19:42:01 -0400
  • e7d12f1dbc Halfway through in refactoring the report generation to a separate process running asynchronously of the Express server. Tomas Bures 2017-04-17 18:31:01 -0400
  • 2056645023 Added the option to select lists in report. Added an option to generate a CSV report. Tomas Bures 2017-04-17 16:30:31 -0400
  • 6ba04d7ff4 This is a preview of the Reports functionality. It allows defining report templates and then create reports based on the templates. A template defines: - parameters - to be set in the report (currently only selection of campaigns, in the future to be extended to selection of lists/segments, and selection from pre-defined options) - data retrieval / processing code (in Javascript) - rendering template (in Handlebars) Tomas Bures 2017-04-16 18:09:08 -0400
  • 2afeb74e68 Merge branch 'master' of https://github.com/Mailtrain-org/mailtrain Tomas Bures 2017-04-16 03:28:07 -0400
  • 9fdf52674e Lists and Templates overviews refactored to use ajax. Before the refactoring, they behaved and looked a bit different to the other (Ajax) tables. The main difference in the behavior was in the row numbers (1st column) when sort order was switched. The non-ajax tables rearranged the numbers in the 1st column while the ajax-tables didn't. Tomas Bures 2017-04-16 03:22:32 -0400
  • ec76994f69 Merge pull request #208 from larrabee/master Andris Reinman 2017-04-15 18:22:19 +0300
  • a277d37701 Merge remote-tracking branch 'upstream/master' vladimir 2017-04-15 17:13:50 +0200
  • 684ba69d46 Bugfix: mail sender stuck vladimir 2017-04-15 17:13:36 +0200
  • e5190c9b20 Code de-duplication of list and filter methods. The common functionality moved to table-helpers.js This should make developing new table-based views easier. Tomas Bures 2017-04-15 08:24:58 -0400
  • c74232e9c5 Added option to mark a list as not being allowed to be subscribed by public users using the form. The settings is a checkbox in list create/edit. Tomas Bures 2017-04-14 08:48:49 -0400
  • 80cf2c8888 Merge pull request #204 from larrabee/master Andris Reinman 2017-04-13 19:53:08 +0300
  • 818e764b28 Fix error in SQL migration: utf8mb4 was not work with varchar(255) vladimir 2017-04-13 18:48:54 +0200
  • d143a52cfd Merge pull request #203 from larrabee/blacklist Andris Reinman 2017-04-13 10:13:25 +0300
  • c9136f8abd Add blacklist function vladimir 2017-04-10 19:09:40 +0200
  • 100fd41713 Fixes widgets for custom forms, #201 witzig 2017-04-10 08:44:33 +0200
  • 66839f17e7 Merge pull request #199 from programster/docker-changes-2 Andris Reinman 2017-04-09 17:24:58 +0300
  • 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. Programster 2017-04-08 13:37:59 +0100
  • 59f19534e7 Don't enable VERP by default. #56 and #106 witzig 2017-04-08 13:21:09 +0200
  • 54bc8bfb9b Merge 14ea08ca7c into bc669c1e05 Programster 2017-04-08 06:55:16 +0000
  • 14ea08ca7c changing ADD to COPY, I keep getting them the wrong way round Programster 2017-04-08 07:53:36 +0100
  • e3becbd83f Merge 195bf4eb05 into bc669c1e05 Programster 2017-04-08 06:51:59 +0000
  • 195bf4eb05 moving some files I forgot about in the previous commit because they were hidden. Programster 2017-04-08 07:50:27 +0100
  • a8d566cb3a Moving the app to a folder called app and changing the Dockerfile to add this "app" folder to the container and build from there rather than to perform a git clone of the repository. This way building from a release will build that release rather than always building the latest version of mailtrain Programster 2017-04-08 07:48:47 +0100
  • bc669c1e05 Remove pencil icon from GrapeJS image toolbar, #195 witzig 2017-04-07 23:12:01 +0200
  • 04e1b015b9 v1.23.2 Andris Reinman 2017-04-04 12:41:32 +0300
  • 4ca98dd437 v1.23.2 v1.23.2 Andris Reinman 2017-04-04 12:40:06 +0300
  • 60907c0d86 Subscription Widget witzig 2017-04-03 19:53:01 +0200
  • 67eae8616d Use pixel values for alerts on subscription pages witzig 2017-04-02 22:27:08 +0200
  • 9c2444488f Satisfy ESLint no-unused-vars witzig 2017-04-02 14:00:42 +0200
  • 52bbdb1a09 Fixed NodeList.forEach (and some refactoring) witzig 2017-04-02 13:58:42 +0200
  • f234a64df7 Merge pull request #187 from larrabee/disable_email_check Andris Reinman 2017-03-31 13:43:08 +0300
  • 8715b80990 Merge pull request #188 from larrabee/change_chart_view Andris Reinman 2017-03-31 13:24:17 +0300
  • 3b39f619b1 Small visual change in device/country charts vladimir 2017-03-31 11:51:26 +0200
  • 1547e887c3 Add option to disable email cheking for imported CSV vladimir 2017-03-31 11:20:43 +0200
  • 2df265009c v1.23.1 v1.23.1 Andris Reinman 2017-03-26 14:01:17 +0300
  • d7c06e0a5a Do not use .stack property with error objects Andris Reinman 2017-03-24 13:04:38 +0200
  • 060b6dbacc Merge branch 'master' of kreata.ee:/var/opt/mailtrain Andris Reinman 2017-03-23 15:47:56 +0200
  • 47705c212d Replaced andris9 with Mailtrain-org Andris Reinman 2017-03-23 15:47:00 +0200
  • 2dd21c11c0 updated README Andris Reinman 2017-03-23 14:34:29 +0200
  • 6f95474155 Removed mailtrain.pot catalogue file. Generate it every time freshly when updating PO file Andris Reinman 2017-03-23 11:15:01 +0200
  • 06fca3acdb Added ImageMagick to install.sh witzig 2017-03-22 11:22:52 +0100
  • 2faa363196 Merge pull request #185 from witzig/translation witzig 2017-03-21 14:26:03 +0100
  • e5655bcd0b de_DE witzig 2017-03-21 14:24:28 +0100
  • 2b7e0bbc4c Updated mailtrain.pot witzig 2017-03-21 14:24:15 +0100
  • 1564ca07cc Freeze MJML dependency witzig 2017-03-21 12:00:42 +0100
  • bb25c65c63 merged Andris Reinman 2017-03-21 12:30:08 +0200
  • 56f621079f Updated Screenshots witzig 2017-03-21 10:53:35 +0100
  • 038c8f4adb Fix closing tag witzig 2017-03-21 10:26:26 +0100
  • 0e7f85f13e Add .logged-in and .user-username to body witzig 2017-03-21 10:24:48 +0100
  • 89f70ba8d1 Merge pull request #179 from larrabee/master Andris Reinman 2017-03-21 11:08:14 +0200
  • 9bfa61c92c Add ImageMagick install to Dockerfile vladimir 2017-03-21 11:07:24 +0200
  • 179e0d5ab3 fixed thrown errors Andris Reinman 2017-03-21 10:39:44 +0200
  • 73ee6bf4a1 updated mailtrain sql Andris Reinman 2017-03-21 10:31:56 +0200
  • 846e4f8cc4 Merge branch 'larrabee-clicks-by-device-type' Andris Reinman 2017-03-21 10:31:12 +0200
  • 1e9c9f3275 Merge branch 'clicks-by-device-type' of https://github.com/larrabee/mailtrain into larrabee-clicks-by-device-type Andris Reinman 2017-03-21 10:29:00 +0200
  • 3152ecb228 Merge remote-tracking branch 'upstream/master' into clicks-by-device-type vladimir 2017-03-21 10:26:50 +0200
  • 6b87a9711f fixed conflicts Andris Reinman 2017-03-21 10:16:42 +0200
  • b63af2549b bumped some deps Andris Reinman 2017-03-21 10:14:39 +0200
  • 979321ea98 Merge pull request #180 from witzig/custom-forms-mjml Andris Reinman 2017-03-21 09:54:59 +0200
  • 48b2db1d4d Merge b20d001e52 into 91addb14af Amit Kumar 2017-03-21 01:33:58 +0000
  • 880c787cae Merge 829efb8b3f into 91addb14af Amit Kumar 2017-03-21 01:33:57 +0000
  • 8caf334fcc Cosmetic changes vladimir 2017-03-21 01:06:05 +0200
  • 97d5d1a462 Replace if-else with unless function in clicked view vladimir 2017-03-21 00:16:50 +0200
  • 9f68fe9cbb Removed defaultPostaddress from subscription footer witzig 2017-03-20 22:39:13 +0100
  • 8852f33f03 Added note about MJML usage witzig 2017-03-20 22:32:32 +0100
  • 0b0929aa7b Some code formatting witzig 2017-03-20 21:40:21 +0100
  • f2b7d4c8df Removed data keys from table custom_forms witzig 2017-03-20 21:25:41 +0100
  • e3cb6ca679 Fix formating and rewrite migration script vladimir 2017-03-20 17:47:30 +0200
  • c3ee53bd4b Refactored Custom Form Table Structure witzig 2017-03-20 19:37:09 +0100
  • 7d768ebd48 Fix link.id in opened links vladimir 2017-03-20 15:28:21 +0200
  • 10dd23fee4 Merge remote-tracking branch 'upstream/master' into clicks-by-device-type vladimir 2017-03-20 14:50:10 +0200
  • 1ba3bce6eb Add device type detect and stats calculation for open/click rate by device type and country vladimir 2017-03-19 16:47:03 +0200
  • 477aff95d5 Moved scripts out of layout.mjml.hbs witzig 2017-03-19 16:14:31 +0100
  • 91addb14af Satisfy ESLint indentation rule witzig 2017-03-19 16:03:11 +0100
  • adf4be7836 Fixed security issue where custom form description tags were able to include script tags witzig 2017-03-19 15:53:41 +0100
  • b09af60fac Merge branch 'master' into custom-forms-mjml witzig 2017-03-19 13:44:24 +0100
  • 2e50fbc8ae Custom Forms witzig 2017-03-19 13:36:57 +0100
  • 07b7e1a3f2 Renamed changelog.txt to changelog.md Andris Reinman 2017-03-19 14:33:27 +0200
  • 337649c217 Renamed changelog.txt to changelog.md Andris Reinman 2017-03-19 14:31:58 +0200
  • 490da66b9b Renamed changelog.txt to changelog.md Andris Reinman 2017-03-19 14:31:37 +0200
  • 77aded3125 v1.23.0 v1.23.0 Andris Reinman 2017-03-19 14:29:34 +0200
  • ae6affda81 do not allow script tags in description html Andris Reinman 2017-03-19 14:22:44 +0200
  • 0879fa412a force template html as html code, not an url or file path ensure that external resources are not loaded by jsdom Andris Reinman 2017-03-19 14:06:34 +0200
  • 9d5fb816c9 Fixes issue with HTML entities Andris Reinman 2017-03-19 13:39:34 +0200
  • d1451f48b2 [bugfix] Add data volumes for grapejs and grapejs uploads vladimir 2017-03-17 17:27:27 +0200
  • 0c1684a751 [feature] Add Dockerfile and update README vladimir 2017-03-17 16:48:50 +0200
  • d2b0a611d7 Merge pull request #178 from larrabee/master Andris Reinman 2017-03-15 20:59:19 +0200
  • b6497b0e86 Fix logging for ldap module vladimir 2017-03-15 20:44:12 +0200
  • 1ca27b6b40 Remove passport-ldapjs from packpage.json and add warning message vladimir 2017-03-15 20:26:54 +0200
  • 2e5def404f [bugfix] Fix LDAP issue with OpenLDAP/MS AD vladimir 2017-03-15 19:10:00 +0200
  • 5332c81739 Merge pull request #176 from witzig/landingpage Andris Reinman 2017-03-12 14:41:39 +0200
  • 6c7a31dcb4 Updated some screenshots witzig 2017-03-12 12:37:56 +0100
  • 82cac028b8 Fixed position of API screenshot witzig 2017-03-12 03:06:51 +0100
  • 9ed2b1b9bb Updated mailtrain.pot witzig 2017-03-12 01:22:33 +0100
  • 3aaf9bc6bf Fixed title case witzig 2017-03-12 01:13:24 +0100
  • a2450507c6 Rename index-2.hbs to index.hbs witzig 2017-03-12 01:10:08 +0100
  • 019dc526ca Delete legacy screenshots witzig 2017-03-12 01:06:51 +0100