Commit graph

789 commits

Author SHA1 Message Date
witzig
5ada25c2dc Fix error checking, #324 2017-09-27 19:27:01 +02:00
Roger Witzig
6e51a074d6 Merge pull request #322 from programster/dockerfile-node-bump
Bumping the dockerfile baseimage from node 8.1 to 8.6
2017-09-27 10:17:10 +02:00
Tomas Bures
eecb3cd067 Merge pull request #1 from witzig/bures-access
Updates from master
2017-09-27 08:46:03 +02:00
Programster
8bd9b5bc9e * Undoing my change of swapping out the mailtrain title with the logo because it looks wierd as the logo has too much whitespace.
* Adding the information about Node js version requirement to the manual installation instructions.
2017-09-27 02:13:11 +00:00
Programster
286434d846 Trying to slim down the front README page. If user's need more detailed information, such as how to deploy on Rancher, they should read the docs area. 2017-09-27 02:03:34 +00:00
Programster
2d96566b07 Moving the majority of the documentation from the README file to the documents area and referencing it. 2017-09-27 01:55:19 +00:00
Programster
66fa5e1e32 Bumping the dockerfile baseimage from node 8.1 to 8.6 2017-09-27 01:21:44 +00:00
witzig
7a93628cc8 Merge branch 'master' into bures-access
# Conflicts:
#	package.json
2017-09-26 15:29:49 +02:00
witzig
c7c972d1d5 Bump deps
- mjml comment bug has been fixed in 3.3.5
- csv-generate is no longer required since v1.19.1
- escape-string-regexp added to dependencies
- bluebird and lodash added to dev-dependencies
2017-09-26 14:10:16 +02:00
witzig
e669b5684e Fixed MJML Dependency (temporary) 2017-09-22 16:20:14 +02:00
witzig
f96b9de510 Bumped some deps
Note: isemail 3.x, jsdom 11.x, and mjml 3.3.4 contain breaking changes
2017-09-22 15:28:26 +02:00
witzig
8e1bc1df7a Fixes #298 - Import CSV didn't show hidden custom fields 2017-09-22 14:26:47 +02:00
Roger Witzig
d840b2a88b Merge pull request #317 from mystvearn147/patch-1
add package-lock.json file to gitignore
2017-09-22 11:46:36 +02:00
witzig
544e221278 Honour tracking settings from parent RSS-Campaign, fixes #319 2017-09-22 11:39:01 +02:00
Passakorn Suppakityothin
f66416ad65 add package-lock.json file to gitignore 2017-09-20 11:59:23 +07:00
witzig
92fe9121f1 Fixed incompatibility with the ZoneMTA DKIM Plugin
https://github.com/zone-eu/zone-mta/issues/93
2017-09-19 11:50:03 +02:00
wotomg
1e7ca17cb6 Update install.sh
Some fixes. Anyway, scripts does not work.
2017-09-18 14:44:03 +03:00
Tomas Bures
9203b5cee7 Blacklist functionality
Some API improvements
2017-09-17 16:36:23 +02:00
witzig
d9fe2e4eda Added note about mysql timezone option. #311 #134 2017-09-15 22:17:54 +02:00
Andris Reinman
6aec53d882 Merge pull request #305 from theyough/master
Fix when postfix server does not send 'queue as' properly
2017-09-06 13:01:59 +03:00
theyough
b663de138e Fix Travis: Missing semicolon 2017-09-06 10:14:25 +01:00
theyough
332666c851 Fix when postfix server does not send 'queue as' properly 2017-09-06 00:45:27 +01:00
theyough
4235a9b984 Fix when postfix server does not send 'queue as' properly 2017-09-06 00:33:29 +01:00
theyough
dd637a1f2b Fix when postfix server does not send 'queue as' properly 2017-09-05 23:22:39 +01:00
Andris Reinman
da6aa7f6b5 Create CNAME 2017-08-28 15:37:26 +03:00
Andris Reinman
c91d1d0296 Create README.md 2017-08-28 15:36:15 +03:00
Tomas Bures
c343e4efd3 Rendering of custom fields in subscription list 2017-08-22 08:15:13 +02:00
Tomas Bures
6f5b50e932 WiP on admin interface for subscribers.
TODO:
- format data based on field info in listDTAjax
- integrate with the whole subscription machinery
2017-08-20 23:50:00 +02:00
Tomas Bures
e6bd9cd943 Added ability to delete newly created invalid rule. 2017-08-19 17:26:44 +02:00
Tomas Bures
42338b0afa Beta of segments
UI is not React-based
Segments functionality extended to allow hierarchical rules, negation and more comparisons (regexp).
Added enumerations (see #217)
2017-08-19 15:58:23 +02:00
Tomas Bures
f3ff89c536 WiP on segments 2017-08-19 15:12:22 +02:00
Tomas Bures
6cc34136f5 WiP on segments. 2017-08-18 21:04:31 +02:00
Tomas Bures
d0a714b3d4 Snapshot before refactoring the rule settings to a separate component 2017-08-17 23:32:49 +02:00
Tomas Bures
6fbbe9a497 Stubs for adding and deleting a rule 2017-08-16 21:41:36 +02:00
Tomas Bures
e5cf2962dc Theming for Segment options 2017-08-16 20:48:51 +02:00
Tomas Bures
baf9f61465 This is snapshot of custom node renderer for react-sortable-tree.
It likely won't be needed however.
2017-08-16 16:10:30 +02:00
Tomas Bures
6a7dab52eb Snapshot of incomplete DnD extension to tree.js.
It however is rather unintuitive how nodes can be put to the end. Dropping this direction in favor of https://github.com/fritz-c/react-sortable-tree
2017-08-16 12:10:00 +02:00
Tomas Bures
0bfb30817b work in progress on segments
some cleanup of models - handling dependencies in delete
2017-08-14 22:53:29 +02:00
Andris Reinman
102a437aed Merge pull request #293 from killua-eu/master
Improving DKIM/SPF/DMARC/PTR documentation
2017-08-14 10:57:33 +03:00
killua-eu
0876b8029e Update README.md 2017-08-14 09:47:08 +02:00
Tomas Bures
b23529a75b Some initial files for management of segments 2017-08-13 20:24:17 +02:00
Tomas Bures
e73c0a8b28 Work in progress on subscriptions 2017-08-13 20:11:58 +02:00
Tomas Bures
d9211377dd Options always shown below the group no matter how the list is sorted
XSS protection for tables and trees
2017-08-13 11:32:31 +02:00
Tomas Bures
e230510b72 work in progress on custom fields 2017-08-13 01:11:07 +02:00
Tomas Bures
19f0c1bd97 work in progress on custom fields 2017-08-12 00:41:02 +02:00
Tomas Bures
60d3875c00 Fix of the previous 2017-08-11 18:24:49 +02:00
Tomas Bures
850e563362 Secondary nav is shown only if there are 2 or more items. 2017-08-11 18:22:22 +02:00
Tomas Bures
602364caae Fluid layout
Reworked routing and breadcrumb mechanism. It allows resolved parameters in paths, which allows including names of entities in the breadcrumb.
Secondary navigation which is aware of permissions.
2017-08-11 18:16:44 +02:00
Tomas Bures
86fce404a9 work in progress on custom fields 2017-08-11 08:51:30 +02:00
Tomas Bures
361af18384 Custom forms list and CUD. 2017-07-30 16:22:07 +03:00