Commit graph

  • 47802a7933
    Merge pull request #575 from paszczus/master Tomas Bures 2019-04-02 16:24:16 +0200
  • 3a45443b64
    Merge pull request #573 from trucknet-io/development Tomas Bures 2019-04-02 16:23:35 +0200
  • 8b39a101cd Transactional mail: minor template-sender refactoring Alexey Zinkevych 2019-04-02 16:35:57 +0300
  • e588e218b6 Transactional mail: use tools to format message Alexey Zinkevych 2019-04-02 16:15:35 +0300
  • 76b4f8b8c2 Transactional mail: added data rendering Alexey Zinkevych 2019-04-02 14:38:12 +0300
  • cda2beb5f5 - moved PL language files to proper place Sławomir Paszkiewicz 2019-04-02 11:15:58 +0200
  • 80279346f3 Transactional mail: code review fixes Alexey Zinkevych 2019-03-31 15:50:40 +0300
  • ed4a13fef7 Added transactional mail api docs Alexey Zinkevych 2019-03-31 13:07:29 +0300
  • 31442453ea Merge branch 'transactional-mail-v2' into development Alexey Zinkevych 2019-03-31 11:58:15 +0300
  • e3e1e7a086 Merge branch 'development' of https://github.com/Mailtrain-org/mailtrain into transactional-mail-v2 Alexey Zinkevych 2019-03-31 11:52:42 +0300
  • dc4f0922ef
    Merge pull request #2 from trucknet-io/transactional-mail-v2 Alexander Gusev 2019-03-31 11:40:44 +0300
  • 3b20ac5ce7 Some fixes in expection logging, template files and resizing mosaico images Tomas Bures 2019-03-27 23:50:20 +0100
  • 63cfb22025 Merge branch 'development' into development-tb Tomas Bures 2019-03-27 09:54:20 +0100
  • d482d214d9 Line endings fixed so that we don't have CRLF in Git. Better now than later. Tomas Bures 2019-03-27 09:49:29 +0100
  • 2fe7f82be3 Merge and cleanup of PR #564 Tomas Bures 2019-03-27 00:41:18 +0100
  • dcb7168322 Merge branch 'pull/564' into development Tomas Bures 2019-03-26 22:55:00 +0100
  • 3ae4c77fb4 Preparations for mosaico MJML templates Tomas Bures 2019-03-26 22:48:31 +0100
  • 4a521a8f0f Implemented basic transactional emails API Alexey Zinkevych 2019-03-24 14:27:56 +0200
  • 913c7dc337 Added .vscode to .gitignore Alexey Zinkevych 2019-03-17 17:49:25 +0200
  • 51dd7938ef
    add API for list creation antoninchadima 2019-03-20 13:38:06 +0100
  • 53340ad631 fix Carlos 2019-03-20 09:03:06 +0100
  • b583df7e2f fix Carlos 2019-03-20 08:58:46 +0100
  • 444717b4d0 Templates namespace filtering & fix Carlos 2019-03-20 08:57:06 +0100
  • e2a9cc9429
    Update README Felix Wolfsteller 2019-03-19 09:47:58 +0100
  • b6a896558e fix Carlos 2019-03-15 10:10:48 +0100
  • b5a6167202 common.json filtering namespace labels Carlos 2019-03-14 16:34:16 +0100
  • 74fe5e73e2 Namespace filtering when create/edit campaigns Carlos 2019-03-14 16:15:37 +0100
  • 7b08e2e97b Spanish lang update Carlos 2019-03-13 16:36:35 +0100
  • 41b311c811 Spanish lang update Carlos 2019-03-13 15:18:40 +0100
  • 75daaa1a65 Confirmation modal when launching campaign Carlos 2019-03-13 15:00:49 +0100
  • 5d08db67b3 Show status bug Carlos 2019-03-13 13:23:57 +0100
  • 83267a7e28 Checkbox text alignment and override checkboxes reorganized Carlos 2019-03-13 13:09:37 +0100
  • bdacf92917 Campaigns: Show override checkbox when Send configuration allows it Carlos 2019-03-13 10:22:19 +0100
  • 1a61067ff9 Campaign status show send settings Bug Carlos 2019-03-13 09:52:02 +0100
  • 0037b39656 Fix for: Reinstalling modules in mvis/ivis-core/client /opt/mailtrain/setup/functions: line 222: cd: mvis/ivis-core/client: No such file or directory root 2019-03-09 10:34:07 -0800
  • 9b32e59b50 Number of processes and connections of builtin zone MTA is now configurable via Mailtrains config. Tomas Bures 2019-03-09 14:07:11 +0100
  • c3cf46a717
    Merge pull request #477 from ganeshkrishnan1/patch-1 Tomas Bures 2019-03-09 09:07:50 +0100
  • 4353201ab8
    Merge pull request #496 from arnobase/french_typo_correction Tomas Bures 2019-03-09 09:07:21 +0100
  • d45b1fa762
    Merge pull request #479 from devMCpro/polish-translation Tomas Bures 2019-03-09 09:06:43 +0100
  • e74401b25d
    Merge pull request #480 from ateuber/master Tomas Bures 2019-03-09 09:06:19 +0100
  • 33f94034e2
    Merge branch 'master' into master Tomas Bures 2019-03-09 09:06:06 +0100
  • fa1bf1c874
    Merge pull request #482 from ateuber/custom_field_description Tomas Bures 2019-03-09 09:04:38 +0100
  • de78c587f5
    Merge pull request #556 from ateuber/duplicate_campaign Tomas Bures 2019-03-09 09:04:08 +0100
  • 97bb700334 Various fixes Tomas Bures 2019-03-09 07:42:14 +0000
  • 4a446a99f0 Fix Travis Andreas Teuber 2018-10-23 17:01:08 +0200
  • 2b11a319b4 Added possibility to duplicate a campaign Andreas Teuber 2019-03-07 19:15:28 +0100
  • 4b1b1a380d deleting useless files Carlos 2019-03-06 13:27:53 +0100
  • 25ecd85910 CampaignNamespaceUpdateBugFixed Carlos 2019-03-06 09:47:52 +0100
  • a43302f3ab Users list only for admin added Carlos 2019-03-04 15:57:51 +0100
  • 38e277cb7c Spanish lang without translation added Carlos 2019-03-04 15:44:52 +0100
  • aa66c18650 works Carlos 2019-03-04 15:17:37 +0100
  • b64b8e475a
    Merge pull request #1 from Mailtrain-org/master Tammo Haan 2019-02-27 20:21:01 +0100
  • 4a6aed4cf7 All create/edit forms now allow staying on the page after save. Tomas Bures 2019-02-24 11:10:23 +0000
  • d54f941caa Some fixes. Tomas Bures 2019-02-24 00:19:49 +0000
  • 41cd01c2b9 Exported CSV now contains status column (fix for #547) Tomas Bures 2019-02-23 14:27:28 +0000
  • 0c3510d626 Some fixes Tomas Bures 2019-02-18 22:42:57 +0000
  • 8d95f43dbc Added feature to create template from another template. Tomas Bures 2019-02-18 20:36:44 +0000
  • 031b346440
    Merge pull request #537 from priethor/development Tomas Bures 2019-02-17 18:48:13 +0100
  • f8ef57f164 Fixed bug that prevented sending via builtin zone mta. This but was introduced today. Tomas Bures 2019-02-17 17:47:27 +0000
  • 433bf31bfa
    Adds 'type' property to migration of text-based segment rules Héctor 2019-02-17 18:45:35 +0100
  • f7b5aef0e3 Some more fixes Warning dialog about missing Javascript removed from subscription dialog. The warning would flash in any case (even when Javascript is activated) Tomas Bures 2019-02-17 17:18:59 +0000
  • df2a8c1cde Fix for #536 Tomas Bures 2019-02-17 17:18:44 +0000
  • 7f2a9ca940 Link to the v1 removed from v2 readme Tomas Bures 2019-02-17 15:00:00 +0000
  • 8a843bcea4 Fix in docker instructions Tomas Bures 2019-02-17 14:50:00 +0000
  • 02b42a4982 Updated instructions to use docker image on docker hub. Addresses #521 Tomas Bures 2019-02-17 13:56:15 +0000
  • abed0d4af4 Fixes in messages Tomas Bures 2019-02-17 12:46:32 +0000
  • 46ad0c7b4f Fix for #531 Tomas Bures 2019-02-17 12:46:02 +0000
  • 90f289989b
    Merge pull request #534 from priethor/development Tomas Bures 2019-02-17 09:08:09 +0100
  • d1a1398828
    Support for string based segment rules.... Héctor 2019-02-17 00:49:12 +0100
  • d52436c566 added webhook support for postal mail server Gernot Pansy 2019-02-14 22:38:35 +0100
  • e0bee9ed42 Some preparations for activity log. Fixed issue #524 Table now displays horizontal scrollbar when the viewport is too narrow (typically on mobile) Tomas Bures 2019-02-07 14:38:32 +0000
  • 2f42c6eb4e
    Merge 081c6ba912 into f2ed0e8ce2 Balázs Dura-Kovács 2019-01-27 14:36:24 +0000
  • 4f408a26d5 Some fixes Tomas Bures 2019-01-20 16:31:17 +0000
  • d14942da93 Adoptions from ivis-core Tomas Bures 2019-01-12 21:33:00 +0100
  • 18eb54037c Adoptions from ivis-core Tomas Bures 2019-01-12 21:31:20 +0100
  • 127900a4d4 Services enabled back to normal Tomas Bures 2019-01-12 11:53:07 +0100
  • 6f6258e53b Some cosmetic updates Fix - GrapesJS 0.14.50 does not work with grapesjs-mjml. GrapesJS version downgraded to 0.14.49 Tomas Bures 2019-01-12 11:49:22 +0100
  • 0d7f962c86 Fix - subscriber custom data were not listed in correct order in the subcribers list "Test user" field added to segment rules Configuration option to automatically share arbitrary namespace based on user role. Tomas Bures 2019-01-12 11:21:38 +0100
  • a1e52c2d7a Fix for #516 Tomas Bures 2019-01-12 11:20:58 +0100
  • 713dfaa278 Fix Tomas Bures 2019-01-12 01:04:12 +0100
  • ab6c6b7d27 Alignments with IVIS Tomas Bures 2019-01-12 00:57:10 +0100
  • c1731bf09f Some refactoring to aling it more with IVIS and coreui theme. Tomas Bures 2019-01-05 23:56:16 +0100
  • 397f85dac4 Harmonization with IVIS Tomas Bures 2019-01-04 21:31:01 +0100
  • 428fb9db7b Added an API endpoint that triggers an RSS campaign. Tomas Bures 2018-12-29 15:12:42 +0100
  • e786964411 Some fixes in RSS feed processing. It is now possible to have hierarchical merge tags (separated by "."). The merge tags are now case sensitive. Mailtrain allows passing element "mt:entries-json" in the RSS item feed. If this is detected, it parses the json structure and makes it available through RSS_ENTRY_CUSTOM_TAGS. Then it can be used as [RSS_ENTRY_CUSTOM_TAGS.field_quote_text.rendered] Tomas Bures 2018-12-29 11:21:25 +0100
  • 6eead89fef Save button in Segments moved below rules (as per #511). Tomas Bures 2018-12-29 09:16:51 +0100
  • 557ee83705 Removed [TO_NAME] from the reference (to partially address #510). Tomas Bures 2018-12-31 10:27:42 +0000
  • 01720ae128 Bugfix - merge tag was incorrectly validate when only name was entered and Save was clicked immediately after Tomas Bures 2018-12-31 10:11:44 +0000
  • b26f5008da Field setup wizard for new list - addresses 1st line of #510 Bugfixes to address #511 Tomas Bures 2018-12-31 09:45:59 +0000
  • de55870561 DB driver changed to mysql to address issue #509. Tomas Bures 2018-12-30 23:58:17 +0000
  • 2e847460f4 Added the possibility to use "option" field type outside a group. This is convenient to create just a single checkbox. Tomas Bures 2018-12-28 20:54:00 +0100
  • 64af46b685 UI migrated to Bootstrap 4, FontAwesome 5 and CoreUI theme. Tomas Bures 2018-12-28 10:57:00 +0100
  • 41d74e3cc7 Work in progress on port to Bootstrap 4 Tomas Bures 2018-12-28 05:33:07 +0100
  • 3425e2c16a Work in progress on migration to Bootstrap 4 and CoreUI admin theme Tomas Bures 2018-12-27 14:42:21 +0100
  • 366bd09f2a Fix for #507 Tomas Bures 2018-12-26 12:52:00 +0100
  • 9044a4ca0b Updates in locale Tomas Bures 2018-12-26 05:33:56 +0100
  • 99bd4ad907 Fixed localization which was broken after 19fe5331d2 x_mailer fixed to be '' in mailtrain.sql Tomas Bures 2018-12-26 05:24:52 +0100
  • cfdcaf65d8 Fixed bug - files/uploaded had wrong owner Upgrade to React 16 Tomas Bures 2018-12-26 04:38:02 +0100
  • f2ed0e8ce2
    Update README.md Tomas Bures 2018-12-25 21:08:24 +0100
  • ebd7b1fffb
    Update README.md Tomas Bures 2018-12-25 20:49:18 +0100