public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1234 commits 9 branches 34 tags 30 MiB
Commit graph

1234 commits

This branch
This branch
All branches
Author SHA1 Message Date
root
70ca9f405a fix 2019-08-14 15:13:27 +02:00
Carlos Zamora Sanz
6a8f139b43
Merge pull request #4 from Mailtrain-org/development 
Development
 2019-08-14 14:35:19 +02:00
root
7ec6f9e6d0 Report CUD fix 2019-08-14 14:25:07 +02:00
Tomas Bures
1295d83c59
Merge pull request #671 from GuillaumeRemyCSI/new-parameters-in-docker-entrypoint 
Added new parameters for LDAP in docker-entrypoint.sh
 2019-08-14 14:14:18 +02:00
Guillaume Rémy
de20d8a64c Added new parameters for LDAP in docker-entrypoint.sh 2019-08-14 13:35:46 +02:00
Tomas Bures
5281707b2d
Merge pull request #670 from GuillaumeRemyCSI/secure-ldap 
Added secure ldap parameter in default.yaml config file
 2019-08-14 11:45:23 +02:00
Guillaume Rémy
98cd14f8be Added ldap secure parameter in default.yaml config file 2019-08-14 11:30:03 +02:00
Tomas Bures
54f7225077
Merge pull request #669 from GuillaumeRemyCSI/secure-ldap 
Added secure config parameter to use ldaps protocol
 2019-08-14 11:24:15 +02:00
Guillaume Rémy
c8eeeaa9b9 Added secure config parameter to use ldaps protocol 2019-08-14 11:18:38 +02:00
Tomas Bures
ae5faadffa Fix for #665 and additional fix for #663. 
If your segemnts are broken or Mailtrain complains about missing 20190726150000_shorten_field_column_names.js, run the following in `server/setup/knex/fixes`:

```NODE_ENV=production node fix-20190726150000_shorten_field_column_names.js```
 2019-08-12 09:26:49 +02:00
Tomas Bures
bb237b3da4 Fix - URL bases replacement didn't work for HBS tag language. 2019-08-11 21:50:06 +02:00
Tomas Bures
23e683192f Additional fix for #660 
Fix for #662
 2019-08-11 21:01:01 +02:00
Tomas Bures
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_*]`
 2019-08-11 16:28:11 +02:00
Tomas Bures
588cf34810 Fix for #663 2019-08-10 23:17:15 +02:00
Tomas Bures
69ce80ebfd Fix for #663. 
Unfortunately, the migration 20190726150000_shorten_field_column_names.js corrupted the segments table. There is no automatic fix. If this affected you, you have to either revert the DB or fix the segments manually.
 2019-08-10 23:15:38 +02:00
Carlos Zamora Sanz
6b6fa8b3ef
Merge pull request #2 from Mailtrain-org/development 
Merge
 2019-08-08 11:41:17 +02:00
Tomas Bures
30e03adf0c Fix for #619 
Merged parts of PR #651 and fixed the rest
 2019-08-07 14:29:58 +02:00
Tomas Bures
5cae9c849c Merge branch 'pull/651' into development 2019-08-07 12:29:30 +02:00
Tomas Bures
cce998d89e Merge branch 'pull/656' into development 2019-08-07 11:45:20 +02:00
Tomas Bures
2202f228eb Merge of PR #654 and some updates to it. 2019-08-07 11:25:47 +02:00
root
ee3fb1bbd1 Campaign tag language bug fixed 2019-08-06 11:38:07 +02:00
root
c1a9404648 Verp campaign BUG fixed 2019-08-06 09:37:02 +02:00
root
2929048ebe Fix 2019-08-06 09:26:44 +02:00
root
b08fd07909 convertFileURLs fix 2019-08-06 09:25:22 +02:00
root
e55317ec43 Clone existing template BUG fixed 2019-08-05 13:31:56 +02:00
Carlos Zamora Sanz
b7fbc32e1e
Merge pull request #1 from Mailtrain-org/development 
Merge
 2019-08-05 09:20:13 +02:00
Tomas Bures
5abe809a97 Merge remote-tracking branch 'origin/development' into development 2019-08-01 07:46:55 +02:00
Tomas Bures
712a905518 Fixes of functions around viewTestSubscriptions 2019-08-01 07:46:40 +02:00
Tomas Bures
a4a5a468ea
Merge pull request #647 from deisner/patch-1 
Update README.md
 2019-08-01 04:51:51 +02:00
David Eisner
836faeff69
Update README.md 
Typo fix.
 2019-07-31 16:26:35 -04:00
Tomas Bures
ed3ed1a202 Some small updated in UI 2019-07-31 16:50:06 +02:00
Tomas Bures
dba534ba21 Fix - login screen does not show up 2019-07-29 10:00:01 +02:00
Tomas Bures
a876c7b301 Version on the home screen updated. 2019-07-29 09:47:47 +02:00
Tomas Bures
e77038f132 fixup! Various fixes. 2019-07-29 09:25:07 +02:00
Tomas Bures
a258479621 Various fixes in the UI. 
Check permissions mechanism reworked to allow specifying permission checks already in menu structure.
 2019-07-29 09:24:50 +02:00
Tomas Bures
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.
 2019-07-27 17:47:25 +02:00
Tomas Bures
6ae9143c22 Added abstraction layer around config. 
`roles` in config renamed to `defaultRoles`. These are used if no `roles` are provided in production.yaml
 2019-07-26 20:35:49 +05:30
Tomas Bures
8cd01fe99e Fix for #639 2019-07-26 18:32:14 +05:30
Tomas Bures
d247893d31 Refactoring a common pattern for "clone for existing". Applied to custom forms and templates. 2019-07-26 16:48:26 +05:30
Tomas Bures
6eeef7a991 Merge branch 'pull/637' into integration-637 
# Conflicts:
#	client/src/lists/forms/CUD.js
 2019-07-24 14:54:51 +05:30
Tomas Bures
b65960b528 Merge of PR #641 2019-07-23 22:14:35 +05:30
root
ff9191c206 Add multiple lists in a campaign 2019-07-23 22:11:53 +05:30
root
f987cb1197 Change campaign namespace BUG correction 2019-07-23 22:11:53 +05:30
Tomas Bures
02360be75b Various fixes. 2019-07-23 21:16:55 +05:30
root
1bf37e65a3 Clone from existing custom forms Added 2019-07-23 12:35:41 +02:00
Tomas Bures
4e4b77ca84 Fixes. 
Added support for help text in custom fields.
Reimplemented the mechanism how campaign_messages are created.
 2019-07-22 23:54:24 +05:30
root
e9bf4a890c Copy custom forms added 2019-07-22 13:01:48 +02:00
Tomas Bures
025600e818 Fixes. Reimplementation of the API transaction sender. 2019-07-16 21:10:33 +05:30
Tomas Bures
8606652101 Fixes. Reimplementation of the API transaction sender. 2019-07-16 21:03:37 +05:30
Tomas Bures
a22187ef12 Merge remote-tracking branch 'origin/development' into development-tb 
# Conflicts:
#	server/lib/template-sender.js
#	server/routes/api.js
 2019-07-10 02:13:19 +04:00