Commit Graph

5910 Commits

Author SHA1 Message Date
Michelle Shull
5614a7a4b2 Merge pull request #1505 from mailpoet/sending-erros-levels
Multiple Sending Error Levels [MAILPOET-1154]
2018-09-24 07:09:39 -04:00
Michelle Shull
acc7100109 Merge pull request #1519 from mailpoet/form-edit
Edit an existing form [MQ-51]
2018-09-24 07:06:36 -04:00
Michelle Shull
e8c7dc937d Merge pull request #1504 from mailpoet/new-newsletter-templates
New newsletter templates [MAILPOET-1480]
2018-09-24 06:09:39 -04:00
Michelle Shull
c6273a6c3f Merge pull request #1513 from mailpoet/woo-fix
adding wasScheduledForSubscriber method to Newsletter model [PREMIUM-95]
2018-09-21 09:34:27 -04:00
Michelle Shull
15b4f7feb1 Merge pull request #1516 from mailpoet/listings-warning
Emails listing JS warning fix [MAILPOET-1537]
2018-09-20 14:54:34 -04:00
Michelle Shull
02e1f7f6dc Merge pull request #1489 from mailpoet/migration-notice
Migration notice [MAILPOET-1492]
2018-09-20 14:13:17 -04:00
Michelle Shull
356ca4c9d3 Merge pull request #1509 from mailpoet/free-welcome-premium
Update premium page for welcome emails [MAILPOET-1527]
2018-09-20 13:39:39 -04:00
Michelle Shull
93f9c65736 Edit an existing form [MQ-51] 2018-09-20 13:06:14 -04:00
Michelle Shull
5d5f3b8888 Edit an existing form [MQ-51] 2018-09-20 12:51:32 -04:00
Michelle Shull
85c2d40492 Edit an existing form [MQ-51] 2018-09-20 12:42:08 -04:00
Michelle Shull
0bb81660a5 Edit an existing form [MQ-51] 2018-09-20 12:11:24 -04:00
Michelle Shull
07c63bbb89 Merge pull request #1515 from mailpoet/in-app-welcome-emails
In app announcement for free welcome emails [MALPOET-1525]
2018-09-20 11:29:24 -04:00
Michelle Shull
a0007c048e Merge pull request #1517 from mailpoet/sub-form-test-fix
Fix Subscription Form Test [MQ-59]
2018-09-20 11:24:30 -04:00
Michelle Shull
b94d014e58 Fix Subscription Form Test [MQ-59] 2018-09-20 11:05:46 -04:00
Rostislav Wolny
94f2d3f1df Make a form factory return created form and alway create a form with a list
[MQ-59]
2018-09-20 16:37:40 +02:00
Michelle Shull
b208dca01d commit so branch can be shared [MQ-59] 2018-09-20 10:08:46 -04:00
Rostislav Wolny
3e12ac8928 Use Date object instead of seconds to set valid time of announcement
[MAILPOET-1525]
2018-09-20 15:28:26 +02:00
Rostislav Wolny
54e518e664 Don't show error notice for in app announcements
[MAILPOET-1525]
2018-09-20 15:23:09 +02:00
Rostislav Wolny
41eeae2d14 Refactor property names in inAppAnnouncements to be easy to understand
[MAILPOET-1525]
2018-09-20 15:21:58 +02:00
Rostislav Wolny
fdd1bce566 Add annoucement for free welcome emails
[MAILPOET-1525]
2018-09-20 14:52:25 +02:00
Pavel Dohnal
2215ce83b2 Update premium page for welcome emails
[MAILPOET-1527]
2018-09-20 13:26:16 +02:00
Pavel Dohnal
101ab67a83 Fix missing assets
[MAILPOET-1480]
2018-09-20 12:57:23 +02:00
Pavel Dohnal
deaebae034 Remove header from template
[MAILPOET-1480]
2018-09-20 11:00:04 +02:00
Rostislav Wolny
4ae1f4a107 Prevent setting state on unmounted listing component
[MAILPOET-1537]
2018-09-20 10:16:28 +02:00
Rostislav Wolny
f5db5c3881 Refactor long if block in getItems in listings
[MAILPOET-1537]
2018-09-20 10:14:12 +02:00
Pavel Dohnal
31067364f6 Add spacers to templates
[MAILPOET-1480]
2018-09-20 10:04:08 +02:00
Amine Ben hammou
2c89b767a4 adding wasScheduledForSubscriber method to Newsletter model 2018-09-20 09:06:14 +02:00
Michelle Shull
5b7a5bbf0f Merge pull request #1512 from mailpoet/in-app-announcements
In app announcements component [MAILPOET-1413]
2018-09-19 10:41:30 -04:00
Tautvidas Sipavičius
827c0860fc Merge pull request #1511 from mailpoet/ci-speedup
Circle CI workflow enhancements [MAILPOET-1535]
2018-09-19 17:30:31 +03:00
Pavel Dohnal
91364b391f Resize thumbnails
[MAILPOET-1480]
2018-09-19 15:57:55 +02:00
Pavel Dohnal
57cfdee9ad Fix some template texts
[MAILPOET-1480]
2018-09-19 14:43:31 +02:00
Rostislav Wolny
814fceb297 Remove container blockDefaults from templates data
[MAILPOET-1480]
2018-09-19 14:40:21 +02:00
Pavel Dohnal
ef17e82685 Fix failing test
[MAILPOET-1480
2018-09-19 14:40:21 +02:00
Pavel Dohnal
f6bf32de01 Ensure the right order
[MAILPOET-1480]
2018-09-19 14:40:21 +02:00
Pavel Dohnal
41880f72fd Add WooCommerce templates category
[MAILPOET-1480]
2018-09-19 14:40:21 +02:00
Pavel Dohnal
7d98de521d Add woocommerce templates
[MAILPOET-1480]
2018-09-19 14:39:01 +02:00
Pavel Dohnal
31f0a62a7a Add Notifications templates
[MAILPOET-1480]
2018-09-19 14:39:01 +02:00
Pavel Dohnal
44c1d865ba Add Welcome email templates
[MAILPOET-1480]
2018-09-19 14:39:01 +02:00
Pavel Dohnal
bcb9f3cc86 Add new Email Templates for Newsletters
[MAILPOET-1480]
2018-09-19 14:39:00 +02:00
Pavel Dohnal
4515cb345b Remove old templates
[MAILPOET-1480]
2018-09-19 14:39:00 +02:00
Pavel Dohnal
c2bb93f3b7 Ensure notice is not shown on wizard
[MAILPOET-1492]
2018-09-19 14:30:11 +02:00
Rostislav Wolny
868930d43a Improve the annoucements component that it could be displayed only once
[MAILPOET-1525]
2018-09-19 13:44:00 +02:00
Rostislav Wolny
be17a35faa Add condition for premium user to an in app announcement
[MAILPOET-1525]
2018-09-19 13:40:13 +02:00
Pavel Dohnal
d42d48c716 Rename some methods
[MAILPOET-1492]
2018-09-19 10:28:24 +02:00
Pavel Dohnal
017918c870 Add after migration notice
[MAILPOET-1492]
2018-09-19 10:27:04 +02:00
Pavel Dohnal
de6ba39595 Fix private access error 2018-09-19 10:24:37 +02:00
Pavel Dohnal
4a641ba94e Create permanent notices
[MAILPOET-1492]
2018-09-19 10:24:37 +02:00
Rostislav Wolny
ed2ebeee52 Refactor in_app_announcement component to class
[MAILPOET-1525]
2018-09-19 08:51:24 +02:00
Michelle Shull
c17c9d239d Merge pull request #1508 from mailpoet/fix-translations
Fix translations based on FxB's feedback [MAILPOET-1533]
2018-09-18 12:10:45 -04:00
Rostislav Wolny
9b50163b10 Add in app announcement component
[MAILPOET-1413]
2018-09-18 17:50:29 +02:00