public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 138ab32670 Merge branch 'development-LDAPfirstLoginBUG' of https://github.com/Charlo270398/mailtrain into development-LDAPfirstLoginBUG root 2019-08-21 08:47:36 +02:00
  • 48b3411b56 LDAP first login fix root 2019-08-21 08:47:19 +02:00
  • 6beac55826 LDAP first login BUG fixed root 2019-08-21 08:24:33 +02:00
  • 3e374db722
         Merge pull request #6 from Mailtrain-org/development Carlos Zamora Sanz 2019-08-21 08:08:22 +02:00
  • ebb6c2ff74
         Merge pull request #677 from galaxycard/bugfix/clearQueue Tomas Bures 2019-08-20 14:48:28 +02:00
  • 52652d8ac5
         Merge pull request #681 from Charlo270398/development-LDAPeditUserBUG Tomas Bures 2019-08-20 14:42:23 +02:00
  • f5f9426e9c
         Merge pull request #684 from GuillaumeRemyCSI/ldap-fixes Tomas Bures 2019-08-20 10:12:04 +02:00
  • 2f9a75df9b Fixes the authMode name for passport-ldapjs and add a parameter for LDAP mailTag GuillaumeRemyCSI 2019-08-20 10:00:51 +02:00
  • 3e945a2f16 LDAP - Users not created on the fly upon first login fixed Carlos Zamora Sanz 2019-08-19 10:28:12 +02:00
  • 415dbcb14f
         Merge pull request #5 from Mailtrain-org/development Carlos Zamora Sanz 2019-08-19 10:28:12 +02:00
  • 732a9e4d93 LDAP edit users BUG fixed root 2019-08-16 13:00:27 +02:00
  • 4617d478d8 Cookies path fix root 2019-08-16 10:46:55 +02:00
  • 0025ec2468 Delete namespaceFilterCookies function and fixes root 2019-08-16 10:40:17 +02:00
  • 8d27676278 Add mergeTags to sendMessage amit.kumar 2019-08-15 20:11:58 +05:30
  • 09347619f7 Use knex, instead of tx amit.kumar 2019-08-15 13:24:34 +05:30
  • 8bda0c05c0 Clear old message by datetime, not by timestamp) amit.kumar 2019-08-15 13:23:54 +05:30
  • 5b5c5acf41 Merge branch 'master' of github.com:galaxycard/pepper amit.kumar 2019-08-15 12:10:51 +05:30
  • afb9835eb5 Merge remote-tracking branch 'mailtrain/development' amit.kumar 2019-08-15 12:10:37 +05:30
  • c9dbede5e9
         fix indention Gabor Kotel 2019-08-14 23:37:18 +02:00
  • 6b92d42a16
         fix lint errors Gabor Kotel 2019-08-14 23:32:58 +02:00
  • 01198f7c3a
         Fix crash issue on template duplication Gabor Kotel 2019-08-14 23:15:45 +02:00
  • c9719a1228 UserFieldTable filter root 2019-08-14 15:34:37 +02:00
  • 71737fa656
         Merge pull request #673 from Charlo270398/development-CreateReportBug Tomas Bures 2019-08-14 15:15:59 +02:00
  • 70ca9f405a fix root 2019-08-14 15:13:27 +02:00
  • 1298312ea7 reportTemplate filter root 2019-08-14 15:07:35 +02:00
  • 6a8f139b43
         Merge pull request #4 from Mailtrain-org/development Carlos Zamora Sanz 2019-08-14 14:35:19 +02:00
  • 7ec6f9e6d0 Report CUD fix root 2019-08-14 14:25:07 +02:00
  • 1295d83c59
         Merge pull request #671 from GuillaumeRemyCSI/new-parameters-in-docker-entrypoint Tomas Bures 2019-08-14 14:14:18 +02:00
  • de20d8a64c Added new parameters for LDAP in docker-entrypoint.sh Guillaume Rémy 2019-08-14 13:32:20 +02:00
  • 387152d7f9
         Merge pull request #3 from Mailtrain-org/development Carlos Zamora Sanz 2019-08-14 13:07:46 +02:00
  • 8d58c3d282 Namespace Filter root 2019-08-14 13:02:40 +02:00
  • 5281707b2d
         Merge pull request #670 from GuillaumeRemyCSI/secure-ldap Tomas Bures 2019-08-14 11:45:23 +02:00
  • 98cd14f8be Added ldap secure parameter in default.yaml config file Guillaume Rémy 2019-08-14 11:30:03 +02:00
  • 54f7225077
         Merge pull request #669 from GuillaumeRemyCSI/secure-ldap Tomas Bures 2019-08-14 11:24:15 +02:00
  • c8eeeaa9b9 Added secure config parameter to use ldaps protocol Guillaume Rémy 2019-08-14 11:10:14 +02:00
  • ae5faadffa Fix for #665 and additional fix for #663. Tomas Bures 2019-08-12 09:26:49 +02:00
  • bb237b3da4 Fix - URL bases replacement didn't work for HBS tag language. Tomas Bures 2019-08-11 21:50:06 +02:00
  • 23e683192f Additional fix for #660 Fix for #662 Tomas Bures 2019-08-11 21:01:01 +02:00
  • 8cb24feca1 Fix for #660 Campaign preview and campaign test send pulls the first entry in the RSS feed and substitutes its data in [RSS_ENTRY_*] Tomas Bures 2019-08-11 16:28:11 +02:00
  • 588cf34810 Fix for #663 Tomas Bures 2019-08-10 23:17:15 +02:00
  • 69ce80ebfd Fix for #663. Tomas Bures 2019-08-10 23:15:38 +02:00
  • 254836ff44 Send configuration crash bug in campaigns root 2019-08-09 09:55:03 +02:00
  • 6b6fa8b3ef
         Merge pull request #2 from Mailtrain-org/development Carlos Zamora Sanz 2019-08-08 11:41:17 +02:00
  • 30e03adf0c Fix for #619 Merged parts of PR #651 and fixed the rest Tomas Bures 2019-08-07 14:29:58 +02:00
  • 5cae9c849c Merge branch 'pull/651' into development Tomas Bures 2019-08-07 12:29:30 +02:00
  • cce998d89e Merge branch 'pull/656' into development Tomas Bures 2019-08-07 11:45:20 +02:00
  • 2202f228eb Merge of PR #654 and some updates to it. Tomas Bures 2019-08-07 11:25:47 +02:00
  • ee3fb1bbd1 Campaign tag language bug fixed root 2019-08-06 11:38:07 +02:00
  • c1a9404648 Verp campaign BUG fixed root 2019-08-06 09:37:02 +02:00
  • 2929048ebe Fix root 2019-08-06 09:26:44 +02:00
  • b08fd07909 convertFileURLs fix root 2019-08-06 09:25:22 +02:00
  • e55317ec43 Clone existing template BUG fixed root 2019-08-05 13:31:56 +02:00
  • b7fbc32e1e
         Merge pull request #1 from Mailtrain-org/development Carlos Zamora Sanz 2019-08-05 09:20:13 +02:00
  • 2755eba436
         Update requirements.yaml Amit Kumar 2019-08-03 18:14:18 +05:30
  • f5c2effc75 Update to latest code from origin amit.kumar 2019-08-02 22:58:27 +05:30
  • c563766467 Disable ZoneMTA amit.kumar 2019-08-02 22:15:04 +05:30
  • 5abe809a97 Merge remote-tracking branch 'origin/development' into development Tomas Bures 2019-08-01 07:46:55 +02:00
  • 712a905518 Fixes of functions around viewTestSubscriptions Tomas Bures 2019-08-01 07:46:40 +02:00
  • a4a5a468ea
         Merge pull request #647 from deisner/patch-1 Tomas Bures 2019-08-01 04:51:51 +02:00
  • 836faeff69
         Update README.md David Eisner 2019-07-31 16:26:35 -04:00
  • ed3ed1a202 Some small updated in UI Tomas Bures 2019-07-31 16:50:06 +02:00
  • dba534ba21 Fix - login screen does not show up Tomas Bures 2019-07-29 10:00:01 +02:00
  • a876c7b301 Version on the home screen updated. Tomas Bures 2019-07-29 09:47:47 +02:00
  • e77038f132 fixup! Various fixes. Tomas Bures 2019-07-29 09:25:07 +02:00
  • a258479621 Various fixes in the UI. Check permissions mechanism reworked to allow specifying permission checks already in menu structure. development-tb Tomas Bures 2019-07-29 09:24:50 +02:00
  • a46c8fa9c3 Remove button removed from the namespace that contains the current user. Optimizations in how mixins are composed. The refresh should now be up to 2x faster for deeper hierarchies. Tomas Bures 2019-07-27 17:47:25 +02:00
  • 6ae9143c22 Added abstraction layer around config. roles in config renamed to defaultRoles. These are used if no roles are provided in production.yaml Tomas Bures 2019-07-26 20:35:49 +05:30
  • 8cd01fe99e Fix for #639 Tomas Bures 2019-07-26 18:32:14 +05:30
  • d247893d31 Refactoring a common pattern for "clone for existing". Applied to custom forms and templates. Tomas Bures 2019-07-26 16:48:26 +05:30
  • 1e94a0419e VERP test send BUG fixed root 2019-07-25 11:51:17 +02:00
  • 6eeef7a991 Merge branch 'pull/637' into integration-637 Tomas Bures 2019-07-24 14:54:51 +05:30
  • b65960b528 Merge of PR #641 Tomas Bures 2019-07-23 22:14:35 +05:30
  • ff9191c206 Add multiple lists in a campaign root 2019-07-23 13:05:19 +02:00
  • f987cb1197 Change campaign namespace BUG correction root 2019-07-23 12:50:25 +02:00
  • 02360be75b Various fixes. Tomas Bures 2019-07-23 21:16:55 +05:30
  • d8a0f100fe Add multiple lists in a campaign root 2019-07-23 13:05:19 +02:00
  • 53e8fbb2ae Change campaign namespace BUG correction root 2019-07-23 12:50:25 +02:00
  • 1bf37e65a3 Clone from existing custom forms Added root 2019-07-23 12:35:41 +02:00
  • 4e4b77ca84 Fixes. Added support for help text in custom fields. Reimplemented the mechanism how campaign_messages are created. Tomas Bures 2019-07-22 23:54:24 +05:30
  • e9bf4a890c Copy custom forms added root 2019-07-22 13:01:48 +02:00
  • 3bf95944c4
         Intruders can see SMTP credentials Softion 2019-07-18 18:16:55 +02:00
  • 62e63fbb80
         Merge pull request #633 from ateuber/bugfix-mosaico-segments Tomas Bures 2019-07-16 18:31:07 +02:00
  • 0a0eb0db4f Bugfix: include list segment when saving in Mosaico Andreas Teuber 2019-07-16 17:46:06 +02:00
  • 025600e818 Fixes. Reimplementation of the API transaction sender. Tomas Bures 2019-07-16 21:10:33 +05:30
  • 8606652101 Fixes. Reimplementation of the API transaction sender. Tomas Bures 2019-07-16 21:03:37 +05:30
  • dbb60b4514 Fix for mongdb amit.kumar 2019-07-14 23:45:00 +05:30
  • afcc2adfc8 Fix for mongdb amit.kumar 2019-07-14 21:53:23 +05:30
  • e74a37b271 Fix for mongdb amit.kumar 2019-07-14 20:31:23 +05:30
  • 832faa30e4 Fix for mongdb amit.kumar 2019-07-14 20:18:37 +05:30
  • 00a36cdc94 Fix for mongdb amit.kumar 2019-07-14 19:57:36 +05:30
  • 03aa436fac mongo host fix amit.kumar 2019-07-14 11:16:11 +05:30
  • 6f0ec04af5 redis host fix amit.kumar 2019-07-14 10:19:53 +05:30
  • 2b21796bd3 Enable ZoneMTA amit.kumar 2019-07-13 15:47:53 +05:30
  • e06972bcf3 fix Carlos 2019-07-12 13:36:13 +02:00
  • f530ecf75b fix Carlos 2019-07-12 13:31:03 +02:00
  • 70917bf736 Subscribe again by mail && change campaigns namespaces bug fixed Carlos 2019-07-12 12:57:47 +02:00
  • 8fbc4746f1 Fixed bug unsubscribing Carlos 2019-07-12 12:11:04 +02:00
  • 7dbd771155 Add lists into campaign CUD bug Carlos 2019-07-12 10:11:42 +02:00
  • 24488db57c Default conf fix Carlos 2019-07-12 08:40:55 +02:00
  • 0bdcac38c0 CSV import LowerCase/UpperCase correction Carlos 2019-07-11 11:55:59 +02:00