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

189 commits

Author SHA1 Message Date
Tomas Bures
89c9615592 WiP on permissions 
Doesn't run. This commit is just to backup the changes.
 2017-07-26 22:42:05 +03:00
Tomas Bures
e7bdfb7745 Namespace selection for users, reports and report-templates 2017-07-24 14:43:32 +03:00
Tomas Bures
4822a50d0b Share report template functionality 2017-07-24 07:03:32 +03:00
Tomas Bures
d63eed9ca9 Reports ported to ReactJS and Knex 
Note that the interface for the custom JS code inside a report template has changed. It now offers promise-based interface and exposes knex.
 2017-07-13 13:27:03 +02:00
Tomas Bures
6d95fa515e CUD operations on reports and report templates seem to work 
Execution of reports is TBD
 2017-07-11 11:28:44 +02:00
Tomas Bures
38cf3e49c0 DataTables-based dropdown 2017-07-10 17:37:56 +02:00
Tomas Bures
ad1e4c58f5 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access 
Conflicts:
	views/users/api.hbs
 2017-07-09 23:34:03 +02:00
Tomas Bures
3f7b428546 Reports halfway through 
Datatable now correctly handles the situation when user is not logged in and access protected resources
 2017-07-09 23:16:47 +02:00
Tomas Bures
aba42d94ac Reports halfway through. 
Editing report parameters and execution/monitoring of reports is TBD.
 2017-07-09 22:38:57 +02:00
Tomas Bures
d4cea46f07 Report templates ported to ReactJS and Knex. 
Does not run yet because reports have dependencies on the old report templates.
 2017-07-09 15:41:53 +02:00
Tomas Bures
be7da791db LDAP auth seems to work too. 
Users completely refactored to ReactJS and Knex
Initial draft of call context passing (for the time being only in users:remove
 2017-07-08 21:34:26 +02:00
Tomas Bures
9758b4b104 Local auth seems to work 2017-07-08 18:57:41 +02:00
Tomas Bures
d79bbad575 All about user login 
Not runnable at the moment
 2017-07-08 15:48:34 +02:00
Bruce Mackintosh
191dc7b541 Changed the trigger treshold value from 6 hours to 24 hours, so that dates stored via the API as 00:00:00 are correctly picked up and added to the queue. 2017-07-03 19:44:45 +01:00
Tomas Bures
eb2287f6e9 Release candidate of basic user management - currently only CRUD on users, no permission assignment. 2017-06-29 23:22:33 +02:00
Tomas Bures
c81f5544e6 Added support for Datatables 
Added support for ajax-based server side validation (useful for validation of emails, duplicate usernames, etc.)
User form more or less ready in the basic version (i.e. without permission management)
 2017-06-21 02:14:14 +02:00
Tomas Bures
f776170854 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access 
Conflicts:
	package.json
 2017-06-17 10:11:07 +02:00
witzig
5647dd040d Updated subscription-mail-helper.js - Don't wait for mailer to finish. 
Note: When using encryptionKeys, confirmation redirects feel a bit
sluggish. This could probably be 'improved' by calling sendMail via
setTimout or fixed by moving sendMail to a worker.
 2017-06-16 14:28:57 +02:00
witzig
a2ebe8f0f7 Fixed mail-helper.js not calling back when disableConfirmations = true 
And some refactoring
 2017-06-16 02:13:21 +02:00
witzig
830ca4f17f Satisfy eslint rule no-useless-escape 2017-06-15 21:44:54 +02:00
witzig
2da90b58e4 Satisfy new eslint indentation rule 2017-06-15 21:26:35 +02:00
witzig
4f5c132db4 Fixed bug: Hidden custom fields (for custom forms) losing values when updating preferences. 
Credits to @flapuente-palbin
 2017-06-15 19:11:13 +02:00
Tomas Bures
8e54879539 Release candidate of namespace CRUD 2017-06-09 00:23:03 +02:00
Krzysztof Jablonski
71ac4c64a5 Avoid using > with „enums” 2017-06-08 14:22:34 +02:00
Krzysztof Jablonski
819fcfb392 Fix typo during refactoring 
During code refactoring for selectable
unsubscription feature code:
`!campaignId || status > 2` was wrongly refactored
to:
`subscription.status !== Status.SUBSCRIBED`

Link:
a6d25e668b (diff-5af9fe5dfae76c093530c92e3d7404e1R496)
 2017-06-08 14:06:35 +02:00
Tomas Bures
5b82d3b540 Edit and create seem to more or less work (including selection of the parent). Delete is pending. 2017-06-07 01:13:15 +02:00
Tomas Bures
5e4c86f626 Seems that hierarchical error handling works.. 
TreeTable component seems to work too.
Edit is half-way through. Create / delete are TBD.
 2017-06-05 23:59:08 +02:00
Tomas Bures
79ea9e1897 Work in progress on a React-based error reporting mechanism. 
The idea is that REST handlers always fail with throwing an Error (subclass of InteroperableError). The InteroperableError contains type and data field which are JSON-serialized and sent to client. It's up to the client to interpret the error and choose an appropriate way to present it.
 2017-06-05 00:52:59 +02:00
Tomas Bures
4504d539c5 Some basic components for building forms. 2017-06-04 13:16:29 +02:00
Tomas Bures
d13fc65ce2 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access 2017-06-03 07:50:09 +02:00
witzig
5aa6dff743 Fixed HTML templates for custom JSON fields #192 2017-06-03 00:13:03 +02:00
witzig
cec227d688 Fixed Merge Tags for custom date fields 2017-06-02 03:05:19 +02:00
witzig
466bf225a3 Fixed Merge Tags #206 #236 2017-06-02 00:24:26 +02:00
witzig
cff908887f Fixed throttling and pausing #243 2017-06-01 13:08:45 +02:00
Tomas Bures
cda93630ea Merge branch 'master' into access 
Conflicts:
	test/e2e/lib/worker-counter.js
 2017-05-28 19:35:06 +02:00
Tomas Bures
4f52b571c9 Some bits for ReactJS-based client. 2017-05-28 18:49:00 +02:00
vladimir
1e3fe96825 [bugfix] Blacklisted emails counter not set to 0 on campaign reset 2017-05-27 14:14:32 +02:00
vladimir
25bb4afa80 Merge with upstream 2017-05-27 14:07:56 +02:00
vladimir
59912e3c29 Separate disable opened/clicked tracker to 2 options 2017-05-27 14:04:49 +02:00
Tomas Bures
115d254baf Merge branch 'master' into access 
Conflicts:
	config/default.toml
 2017-05-27 10:43:31 +02:00
Tomas Bures
ccd37ac792 Polishing e2e test API. Added option to parse links and extract parameters from them. Added option to construct parameterizedlinks in "navigate". 2017-05-23 19:34:01 +02:00
Tomas Bures
62cc881fd4 Merge remote-tracking branch 'upstream/master' 2017-05-18 22:46:53 +02:00
Tomas Bures
1b73282e90 WiP on namespaces and users 2017-05-15 16:22:06 -04:00
witzig
6c35046ab2 e2e tests (draft) 2017-05-10 01:40:02 +02:00
Tomas Bures
6b92e39112 Some fixes in lists and apis to reflect the changes in subscriptions. 
Confirmation URLs split per action type. This allows more specific error reporting.
 2017-05-06 06:35:32 -04:00
Tomas Bures
11990d62b2 Merge branch 'master' of github.com:Mailtrain-org/mailtrain 
Conflicts:
	languages/de_DE.po
 2017-05-04 17:58:55 -04:00
Tomas Bures
a6d25e668b Release candidate of the selectable unsubscription 
Implemented the resubscription process - i.e. pre-filling in the form when the subscription link is clicked in the unsubscription notice.
 2017-05-04 17:42:46 -04:00
witzig
408db13fd4 Updated RSS merge tag reference 2017-05-03 23:13:05 +02:00
Tomas Bures
bd4961366f More or less all the functionality for selectable unsubscription process. Not tested yet! 
Sending emails moved completely to controller. It felt strange to have some emails sent from the controller and some of them from the model.
Confirmations refactored to an independent model that can be potentially used also for other actions that need an email confirmation.
 2017-05-03 15:53:34 -04:00
Alejandro Fanjul
92bffd78de RSS Improvements to allow more template Tags like ([RSS_ENTRY_TITLE], [RSS_ENTRY_DATE], [RSS_ENTRY_LINK], [RSS_ENTRY_CONTENT], [RSS_ENTRY_SUMMARY], [RSS_ENTRY_IMAGE_URL]) 2017-05-02 18:38:54 +02:00