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

531 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tomas Bures
fbb8f5799e React-based /account endpoint for editing a user profile 2017-06-30 16:11:02 +02:00
Tomas Bures
09fe27fe2b Fix - initForm can be used also without arguments if server validation is not needed 2017-06-29 23:36:05 +02: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
e7856bfb73 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access 2017-06-21 02:16:28 +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
witzig
2b2bda0944 Fixed/reverted Mosaico social icons 
Note: The 404’s logged by Mosaico are ‚normal‘ as it tries the relative
path before resolving the URL based on the template directory.
 2017-06-20 21:27:51 +02:00
witzig
3c4558d70c Refactored and linted editorapi image handling 2017-06-20 19:08:14 +02:00
Andris Reinman
ac63e934ec Merge pull request #259 from Mailtrain-org/remove_ads 
Removed ads from code
 2017-06-20 16:53:22 +03:00
Andris Reinman
8b900a9c44 Removed ads from code 2017-06-20 16:47:25 +03: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
80aca59af7 Disable eslint rule no-await-in-loop for e2e tests 2017-06-15 21:28:40 +02:00
witzig
2da90b58e4 Satisfy new eslint indentation rule 2017-06-15 21:26:35 +02:00
witzig
1db7bd9873 Bumped deps 2017-06-15 21:23: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
witzig
1d76eefe27 Fixed unhandled promise rejection #254 (and some cleanup) 2017-06-14 11:07:16 +02:00
witzig
0629194f56 Updated e2e subscription tests 
Added test for bug #249
Extended tests for custom fields (work in progress)
 2017-06-11 18:49:02 +02:00
witzig
87f7a050ab Fixed bug #249 2017-06-11 01:27:27 +02:00
Tomas Bures
1d1355df34 "Delete" action better with browser history (i.e. back button now works correctly with the Delete dialog). 2017-06-09 12:01:01 +02:00
Tomas Bures
ed5b81b6e6 Small changes in the Model dialog logic to make it more React-like. 2017-06-09 09:07:23 +02:00
Tomas Bures
8e54879539 Release candidate of namespace CRUD 2017-06-09 00:23:03 +02:00
Roger Witzig
7d978c4df1 Merge pull request #251 from jablkopp/bug-fix 
Fix typo during refactoring
 2017-06-08 14:45:36 +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
61893d77f6 Added data mutator to form processing. This allows conversion of data between server and a component (TreeTable in our case). 2017-06-06 00:24:39 +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
Tomas Bures
d0824fe724 Updates 2017-06-03 07:49:59 +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
6d39d497ee Added e2e test for #222 2017-06-01 18:06:25 +02:00
Tomas Bures
6f554038c9 Merge branch 'master' of github.com:Mailtrain-org/mailtrain 2017-06-01 08:04:56 -04:00
Tomas Bures
8c5b62b6a4 Fixed bug #246. 2017-06-01 08:03:43 -04:00
witzig
cff908887f Fixed throttling and pausing #243 2017-06-01 13:08:45 +02:00
witzig
a7b2c33b30 GrapeJS MJML Integration (Experimental) 
#215
 2017-05-31 02:08:44 +02:00
witzig
ae2b07b222 GrapeJS MJML Template Aves 2017-05-31 02:00:12 +02:00
witzig
0f91533210 GrapeJS v0.5.41 
GrapesJS Preset Newsletter v0.2.3
GrapeJS MJML v0.0.7
...
 2017-05-31 01:45:56 +02:00
Roger Witzig
ccd48fe36e Merge pull request #242 from witzig/travis 
Basic Travis CI integration
 2017-05-29 09:34:29 +02:00
witzig
aeb5bf18be Basic Travis CI integration 2017-05-29 00:56:20 +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
731226dfeb Merge branch 'master' of github.com:Mailtrain-org/mailtrain 
Conflicts:
	test/e2e/index.js
	test/e2e/lib/mail.js
	test/e2e/lib/mocha-e2e.js
	test/e2e/lib/page.js
	test/e2e/lib/worker-counter.js
	test/e2e/page-objects/subscription.js
 2017-05-28 19:23:43 +02:00
Tomas Bures
c17bc9f2cf Fixed eslint errors. 2017-05-28 18:55:01 +02:00