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
Tomas Bures
4f52b571c9
Some bits for ReactJS-based client.
2017-05-28 18:49:00 +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
115d254baf
Merge branch 'master' into access
...
Conflicts:
config/default.toml
2017-05-27 10:43:31 +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
