Commit Graph

2438 Commits

Author SHA1 Message Date
Pavel Dohnal
20cecc885a Stop blocking user on template save
When the template save function throws an error
the newsletter is already being sent. We cannot
stop users.

[MAILPOET-1325]
2018-06-07 08:54:15 +01:00
Pavel Dohnal
df2cd9e6e3 Add feedback tooltips
[MAILPOET-1320]
2018-06-06 16:24:46 +01:00
qfrery
d6f72087e9 video badges code review 2018-06-06 12:55:20 +01:00
qfrery
705241d330 qa 2018-06-04 20:47:10 +01:00
qfrery
c88c8a9c96 add video links 2018-06-04 18:12:48 +01:00
Michelle Shull
59d632895e Merge pull request #1369 from mailpoet/posts-alc-image
Multi-column layout in ALC/Posts [MAILPOET-1350]
2018-06-04 07:37:56 -04:00
Amine Ben hammou
8793d904fb allow sending of post notifications with either old or new ALC blocks 2018-05-30 09:31:04 +00:00
Amine Ben hammou
3872ffbbc4 fixing some bugs and updating template 2018-05-29 11:21:24 +00:00
Amine Ben hammou
32a5a4ef52 not sending description when saving a template 2018-05-28 09:41:42 +00:00
Michelle Shull
ec34a9efca Merge pull request #1360 from mailpoet/mp1306
Newsletter template thumbnail redesign [MAILPOET-1306]
2018-05-23 07:06:06 -04:00
Amine Ben hammou
0a298f5fad creating new ALC block and widget 2018-05-23 07:42:30 +00:00
Amine Ben hammou
4dd17e47ad add image alignment to Posts 2018-05-23 05:17:51 +00:00
Amine Ben hammou
d7ab03b1c7 rewrite PostTransformer to return old or new structure depending on the newVersion attribute 2018-05-23 05:15:40 +00:00
Fred. P
75bad97b10 Newsletter template thumbnail redesign
Redesigned the template selection screen to
look like the WordPress theme selector.

The main changes relate to:
* style changes, to achieve the new look
* jsx templates, to work with new css changes
* template, removed the description field

[MAILPOET-1306]
2018-05-22 10:23:07 +02:00
Michelle Shull
ad48aff5c1 Merge pull request #1364 from mailpoet/import_filename_fix
Fixes import issue when filename contains multiple periods [MAILPOET-1388]
2018-05-21 07:26:08 -04:00
Michelle Shull
fa7387c9e4 Merge pull request #1359 from mailpoet/fix-console-warning
Fix warning in console [PREMIUM-87]
2018-05-21 07:18:33 -04:00
Vlad
2104451ec3 Adjusts regex to match extension after the last period 2018-05-17 18:21:46 -04:00
Pavel Dohnal
ee07f3e734 Fix warning in console 2018-05-16 14:03:38 +01:00
Tautvidas Sipavičius
0c585d15e1 Refactor events_list.jsx to suppress lint6 warnings
Likely happened due to updated package-lock.json
2018-05-15 21:11:24 +03:00
Michelle Shull
96b02cccc4 Merge pull request #1345 from mailpoet/react-warning
fixing the react select warning [MAILPOET-1310]
2018-05-14 07:29:04 -04:00
Michelle Shull
e62444d34e Merge pull request #1346 from mailpoet/welcome_email_count_fix
Fixes sent count not being displayed in welcome listings [MAILPOET-1374]
2018-05-08 09:38:19 -04:00
Amine Ben hammou
d2f98bc2e5 text field warning 2018-05-08 13:40:38 +01:00
Vlad
8a8b99ad54 Fixes sent count not being displayed in welcome listings 2018-05-07 19:02:29 -04:00
Amine Ben hammou
d0b1579731 fixing the react select warning 2018-05-07 20:16:25 +01:00
Pavel Dohnal
df58322f0e Move old versions code to own class
[MAILPOET-1316]
2018-05-04 15:33:56 +01:00
Vlad
ee2631dbf2 Fixes broken pause functionality 2018-05-03 20:10:28 -04:00
Michelle Shull
72aaaaa94d Merge pull request #1336 from mailpoet/welcome-fix
Fix welcome emails [PREMIUM-81]
2018-04-25 08:15:43 -04:00
Michelle Shull
0470f773d5 Merge pull request #1335 from mailpoet/notification-fix
Fix notification settings [MAILPOET-1363]
2018-04-25 07:52:12 -04:00
Michelle Shull
e71355f73f Merge pull request #1334 from mailpoet/stats_fix
Use unique key for stats [MAILPOET-1362]
2018-04-25 07:39:40 -04:00
Pavel Dohnal
aa11af3cf8 Fix welcome emails
[PREMIUM-81]
2018-04-25 12:32:44 +01:00
Pavel Dohnal
535818fec4 Fix notification settings
[MAILPOET-1363]
2018-04-25 11:43:07 +01:00
Pavel Dohnal
32beb0dcd1 Use unique key for stats
[MAILPOET-1362]
2018-04-25 11:11:04 +01:00
Vlad
a70405e76d Fixes "cannot read property 'props' of null" error 2018-04-24 19:51:07 -04:00
Pavel Dohnal
f64cf728fe Fix: Cannot read property 'showError' of undefined
[MAILPOET-1352]
2018-04-24 12:33:11 +01:00
Pavel Dohnal
32a759eca5 Fix Lists edit form
[MAILPOET-1348]
2018-04-19 14:33:08 +01:00
Amine Ben hammou
c105df1635 fixing acceptance tests 2018-04-19 14:46:51 +02:00
Amine Ben hammou
1855a3a481 ESLint rules 2018-04-18 19:24:38 +02:00
Amine Ben hammou
2c96f1902e ESLint rules 2018-04-18 18:52:40 +02:00
Amine Ben hammou
f3a5c6e406 ESLint rules 2018-04-18 18:45:04 +02:00
Amine Ben hammou
26d4be24c2 Merge branch 'es5_es6_lint' of github-mp:mailpoet/mailpoet into es5_es6_lint 2018-04-18 18:34:22 +02:00
Amine Ben hammou
1b98604c90 ESLint rules 2018-04-18 18:34:12 +02:00
Pavel Dohnal
2b1eafc16f Fix eslint rules
[MAILPOET-1348]
2018-04-18 17:25:59 +01:00
Pavel Dohnal
1635c3aac3 Fix eslint rules
[MAILPOET-1348]
2018-04-18 17:22:58 +01:00
Pavel Dohnal
861d4ea9e1 Fix eslint rules
[MAILPOET-1348]
2018-04-18 17:15:57 +01:00
Amine Ben hammou
8890dac207 ES6 rules 2018-04-18 18:08:47 +02:00
Amine Ben hammou
940c1a66aa Merge branch 'es5_es6_lint' of github-mp:mailpoet/mailpoet into es5_es6_lint 2018-04-18 18:00:53 +02:00
Amine Ben hammou
5300e338dc ES6 assets/js/src/help/knowledge_base.jsx 2018-04-18 18:00:46 +02:00
Pavel Dohnal
a73dda6690 Fix eslint rules
[MAILPOET-1348]
2018-04-18 16:56:12 +01:00
Pavel Dohnal
adff7f6f74 Fix eslint rules
[MAILPOET-1348]
2018-04-18 16:52:35 +01:00
Amine Ben hammou
c41fd4cb3b Merge branch 'es5_es6_lint' of github-mp:mailpoet/mailpoet into es5_es6_lint 2018-04-18 17:50:50 +02:00