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
Tomas Bures
62cc881fd4
Merge remote-tracking branch 'upstream/master'
2017-05-18 22:46:53 +02:00
witzig
89fd2ed922
Update README
2017-05-18 10:32:16 +02:00
witzig
ff4505139c
Updated install scripts. Now uses Node v7.x
2017-05-18 09:56:23 +02:00
Tomas Bures
4c4a0da0ce
Merge branch 'master' of github.com:Mailtrain-org/mailtrain
2017-05-17 09:20:46 -04:00
Tomas Bures
c2ee0f1e7b
Merge pull request #231 from witzig/e2e
...
e2e tests
2017-05-17 15:19:59 +02:00
Tomas Bures
d70cd398b5
Merge branch 'master' of github.com:Mailtrain-org/mailtrain
2017-05-17 08:53:09 -04:00
Andris Reinman
94eccb34a1
Updated README, added note about Mailtrain versions
2017-05-16 16:39:17 +03:00
witzig
20e6e62c3c
Fixed typo
2017-05-16 09:05:12 +02:00
witzig
43e1cab315
Updated readme and added install script
2017-05-16 02:47:35 +02:00
witzig
c3e9781dc4
Using object composition instead of class inheritance for page objects
2017-05-10 16:22:37 +02:00
witzig
f106cd2850
Some fixes for e2e tests
2017-05-10 12:44:48 +02:00
witzig
6c35046ab2
e2e tests (draft)
2017-05-10 01:40:02 +02:00
Tomas Bures
432e6ffaeb
Upgraded the DB schema number.
2017-05-06 06:41:15 -04: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
ecc7779312
Updated de_DE translation
2017-05-04 00:47:08 +02: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
