Commit Graph

21402 Commits

Author SHA1 Message Date
Marco
e554b73ba3 Merge pull request #169 from mailpoet/dep_hotfix
Switch interact.js dependency to a distributable version
2015-10-10 01:00:50 +02:00
Tautvidas Sipavičius
95f6ad0f3e Switch interact.js dependency to a distributable version 2015-10-10 01:51:18 +03:00
marco
63fb9d267f Updated composer lockfile. 2015-10-09 23:58:37 +02:00
marco
7736f742a6 Fix npm dependencies.
Compiling assets works now.
2015-10-09 21:09:17 +02:00
Jonathan Labreuille
602e630e42 added all pages + started implementing basics 2015-10-09 19:08:13 +02:00
Jonathan Labreuille
34e75b9b13 removed useless code 2015-10-09 14:52:10 +02:00
Jonathan Labreuille
ed9407a890 fixed multiple select component 2015-10-09 14:48:54 +02:00
Marco
5785404820 Merge pull request #161 from mailpoet/alc
ALC: Round 1
2015-10-08 22:32:18 +02:00
Tautvidas Sipavičius
f410b182b2 Increase spacing between adjacent paragraphs 2015-10-07 18:07:02 +03:00
Tautvidas Sipavičius
6c53d6ac56 Add TinyMCE assets to the build 2015-10-07 18:06:30 +03:00
Tautvidas Sipavičius
44f43a151d Fix closing of Image, ALC and Posts sidepanels on "Done" click 2015-10-07 15:18:00 +03:00
Tautvidas Sipavičius
3cfe9a9acc Fix rendering of Posts settings 2015-10-07 15:18:00 +03:00
Tautvidas Sipavičius
8a5bf93db2 Open ALC settings on ALC overlay click 2015-10-07 15:18:00 +03:00
Tautvidas Sipavičius
d7a1bf2bb4 Change ALC overlay to be visible only on hover 2015-10-07 15:18:00 +03:00
Tautvidas Sipavičius
6f3b5ebaac Add option to show settings on drop, set it up for ALC 2015-10-07 15:18:00 +03:00
Tautvidas Sipavičius
c7d62e0947 Align ALC "Show" fields left, closer to the label 2015-10-07 15:18:00 +03:00
Tautvidas Sipavičius
6334b86f22 Hook up fetching of ALC posts 2015-10-07 15:17:59 +03:00
Marco
be2c35c13e Merge pull request #162 from mailpoet/listing_filters
Listing filters & Newsletter x Segments
2015-10-06 15:06:36 +02:00
Jonathan Labreuille
ecb522955b Newsletter Segment relation
- added newsletter_segment table
- added NewsletterSegment model
- added list filter on newsletters listing
- unit tests
2015-10-06 11:13:38 +02:00
Jonathan Labreuille
c15359f1b4 Listing filters 2015-10-06 10:00:18 +02:00
Marco
bfaf6e49f8 Merge pull request #154 from mailpoet/newsletter_process
Newsletter Create flow
2015-10-02 15:43:37 +02:00
Tautvidas Sipavičius
c61849481a Fix container to track child changes for initial newsletter 2015-10-02 14:36:43 +03:00
Jonathan Labreuille
85f160b60b Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-10-02 13:24:24 +02:00
Jonathan Labreuille
56168bf73f added default template 2015-10-02 13:24:06 +02:00
Tautvidas Sipavičius
2037397d2d Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-10-02 14:06:02 +03:00
Jonathan Labreuille
55c59419a9 fixed unit test for settings 2015-10-02 13:05:10 +02:00
Tautvidas Sipavičius
35ee14c563 Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-10-02 14:05:06 +03:00
Tautvidas Sipavičius
007dbf77a4 Remove obsolete stubs 2015-10-02 14:04:44 +03:00
Jonathan Labreuille
15d3b8f051 Send newsletter + Listing + Last Step
- fixed Selection React
- fixed bulk actions (side effect of muti selection)
- added actual sending of newsletter
- added Setting::getValue($key, $default) in order to get settings
- improved Bridge class to allow override of from/reply_to
- added jquery.serializeObject to ease the pain when posting form data
2015-10-02 13:01:27 +02:00
Tautvidas Sipavičius
1409167ab5 Fix autosave on container content change 2015-10-01 17:11:22 +03:00
Tautvidas Sipavičius
665bca5a76 Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-10-01 15:25:08 +03:00
Tautvidas Sipavičius
dbab378b17 Disable "Next" step when newsletter is invalid 2015-10-01 15:24:44 +03:00
Jonathan Labreuille
9c3bff80dd Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-10-01 14:24:24 +02:00
Jonathan Labreuille
dc2b3733d7 Forms & Last Step
- fixed issues on forms
- added defaultValue on text/textarea fields
- added all actions on step 3
2015-10-01 14:22:53 +02:00
Tautvidas Sipavičius
671befbfd8 Do not redirect when newsletter is invalid 2015-10-01 14:34:53 +03:00
Tautvidas Sipavičius
39b2a2ad40 Add redirection from editor to last newsletter step 2015-10-01 13:46:10 +03:00
Jonathan Labreuille
48b027fa62 removed obsolete code 2015-10-01 12:31:19 +02:00
Jonathan Labreuille
9bb7a83b99 Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-10-01 12:28:55 +02:00
Jonathan Labreuille
9d0ca85490 Last step
- improved watch command (much simpler robofile + truly recursive)
- split all form fields into separate files (JSX)
- improved form to allow multiple fields per row
- added selection react class for multi select using select2
- added missing files for select2 (webpack doesn't include them)
2015-10-01 12:25:25 +02:00
Tautvidas Sipavičius
148fcb438f Remove obsolete comments 2015-10-01 12:42:12 +03:00
Jonathan Labreuille
f143531a1e Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-09-30 15:56:31 +02:00
Jonathan Labreuille
45dccf6c50 First step complete 2015-09-30 15:56:13 +02:00
Tautvidas Sipavičius
4889598387 Hook up editor call to save as template 2015-09-30 16:06:31 +03:00
Jonathan Labreuille
2e3b565e8a Type & Template
- fixed endpoint's name causing issues on case sensitive systems
- improved behaviour of delete
- added loading state for boxes
- added Breadcrumb ReactClass
- added common styles for breadcrumb
2015-09-30 11:44:06 +02:00
Jonathan Labreuille
9a16904389 Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-09-29 17:30:07 +02:00
Jonathan Labreuille
37bace359a Template selection
- templates are now loaded via ajax
- added "template" deletion
2015-09-29 17:29:31 +02:00
Tautvidas Sipavičius
485d613d84 Switch to camelCase function names for NewsletterTemplate calls 2015-09-29 18:19:50 +03:00
Jonathan Labreuille
b49c79111f Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-09-29 17:01:52 +02:00
Jonathan Labreuille
e56b6767a8 JSX templates for types & templates
- added type selection
- added template selection
- added "box" styles
- bugfix on select all checkboxes in listings
2015-09-29 17:00:34 +02:00
Tautvidas Sipavičius
028b178e3f Add DB tables, model and router for Newsletter templates 2015-09-29 17:23:41 +03:00