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

510 commits

This branch
This branch
All branches
Author SHA1 Message Date
witzig
277b2cadf5 Fixed bug #261 2017-06-21 17:28:56 +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
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
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
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
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
witzig
19a563bc6a Remaining e2e subscription tests 
@bures, I’m not too happy with switchToList(). Suggestions? If we keep
it, it should probably be added to every useCase.
 2017-05-28 00:13:33 +02:00
witzig
2c930c60d2 Fixed ER_DUP_FIELDNAME during sqlinit 2017-05-27 20:15:28 +02:00
Roger Witzig
2c3b346681 Merge pull request #239 from larrabee/master 
Separate disable opened/clicked tracker to 2 options
 2017-05-27 15:12:05 +02:00
witzig
b1eebd9804 Fixed waitUntilVisible should wait for selector, if present. This is used by waitForFlash. 2017-05-27 14:29:16 +02:00
witzig
a9285e1181 Fixed eslint errors 2017-05-27 14:24:08 +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
witzig
2160a10338 Satisfy eslint linebreak-style 2017-05-27 13:28:40 +02:00
Roger Witzig
5649c6b842 Merge pull request #227 from bures/master 
Extended subscription/unsubscription (selectable unsubscription process)
 2017-05-27 12:31:56 +02:00
vladimir
5c0aab1c3e Merge remote-tracking branch 'upstream/master' 2017-05-27 10:45:27 +02:00
Tomas Bures
c11d1a1cbf Added processing of the "auto" option in unsubscription. 
If auto=yes is specified, the two-step unsubscription works as one-step. No unsubscription form is presented.
 2017-05-27 00:43:56 +02:00
Tomas Bures
e78c64ed13 Merge branch 'master' of github.com:Mailtrain-org/mailtrain 2017-05-27 00:07:18 +02:00
Tomas Bures
6c02db3331 Added better support for preconditions in use-cases. 2017-05-27 00:06:34 +02:00
Tomas Bures
bb2b3da9dd Added waitUntilVisibleAfterRefresh and textsToWaitFor - both discussed with @witzig. 
Page objects refactored to exploit textsToWaitFor if relevant.

Login tests refactored for the newer API.

Some additional tests in subscription. The rest at least included as "pending".
 2017-05-26 00:13:40 +02:00
witzig
fdb6075788 Fixed mailparser dependency (#237) 2017-05-25 10:56:32 +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
328034bae0 Half way in improving e2e test infrastructure and refactoring tests to the enhanced (un)subscription process 2017-05-23 04:15:32 +02:00