Commit Graph

22617 Commits

Author SHA1 Message Date
Marco
3efd942d29 Merge pull request #105 from mailpoet/listings
Listings.
2015-09-03 18:06:49 +02:00
marco
3d442a9770 Conflicts between Segment and Subscriber status. 2015-09-03 18:05:49 +02:00
Jonathan Labreuille
e1f8ac0f91 Unit Test Listing
- added unit test for Listing Handler
- added unit test helper to generate Subscribers
2015-09-03 16:45:52 +02:00
Jonathan Labreuille
d89f43dbe5 Unit tests for listing specific methods
- small fixes/optimization in Subscriber model
- added test for search and group in Subscriber
- added test for search in Newsletter
2015-09-03 13:47:39 +02:00
Jonathan Labreuille
cf322ec3c2 Unit test: Subscriber status 2015-09-03 12:59:45 +02:00
Jonathan Labreuille
a40cdcb20c Migration fix + removed model instantiation in Listing handler 2015-09-03 11:14:38 +02:00
Marco
d14fbc2d30 Merge pull request #104 from mailpoet/list_model
Segment model. Replaces the List concept.
2015-09-03 09:55:40 +02:00
MrCasual
c804e44961 Made changes as per Marco's comments 2015-09-02 17:28:49 -04:00
Marco
e8b552f2cc Merge pull request #109 from mailpoet/js_promises
Expose jQuery deferred XHR object for access to promises
2015-09-02 22:34:24 +02:00
Tautvidas Sipavičius
e20626f1ad Expose jQuery deferred XHR object for access to promises 2015-09-02 17:53:57 +03:00
Jonathan Labreuille
1698066f2b Subscriber unit test -> check for status 2015-09-02 16:48:19 +02:00
MrCasual
e2775981af - Renamed test case 2015-09-02 10:37:46 -04:00
Jonathan Labreuille
fc42296f1b Status column
- updated migration for subscribers status column from int to varchar
- updated Subscriber model to reflect the change
2015-09-02 16:36:57 +02:00
MrCasual
64756c865d - Renamed List model to Segment 2015-09-02 09:29:54 -04:00
Jonathan Labreuille
3fe895a7fe Listing Handler
- added a Listing Handler class to take care of listing params
- added status column to Subscriber
- added specific methods to both Newsletter & Subscriber models for listing
2015-09-02 14:47:18 +02:00
MrCasual
78a2a50af7 - Renamed Subscriber and RelationSubscriberList models to SList and
SubscriberList, respectively
2015-09-01 19:49:50 -04:00
Jonathan Labreuille
12a664f44e fixed html when no items has been found (fixes responsive mode) 2015-09-01 17:36:21 +02:00
Jonathan Labreuille
27883a232a Listings
- listing component
- subscribers listing
- newsletters listing
2015-09-01 16:21:25 +02:00
MrCasual
f6f8f1390f - Renamed Pivot to Relation as per Jo's comment :) 2015-09-01 09:26:41 -04:00
MrCasual
0015bdb617 - Added new model "SubscriberList"
- Added has_many_through relations to the new model + Subscriber model
- Added tests
- Fixed syntax in other models
This closes #95
2015-09-01 09:18:00 -04:00
Tautvidas Sipavičius
e0ef01d9f8 Fix export, import and expose loader install sources 2015-08-31 17:37:50 +03:00
Marco
dc27be69db Merge pull request #77 from mailpoet/newsletter_editor
Visual Editor.
2015-08-31 16:10:55 +02:00
Tautvidas Sipavičius
e3d7d054eb Remove extra Handlebars exposing loader 2015-08-28 13:01:58 +03:00
Tautvidas Sipavičius
1c4fba27f5 Include back admin.js in layout.html 2015-08-28 12:53:03 +03:00
Tautvidas Sipavičius
4cb98f267c Fix missing translation 2015-08-28 12:35:34 +03:00
Tautvidas Sipavičius
0c9c959b31 Fix one column layout of default newsletter structure 2015-08-28 12:35:33 +03:00
Tautvidas Sipavičius
e6d59496eb Reindent code by 2 spaces, instead of 4 2015-08-28 12:35:33 +03:00
Tautvidas Sipavičius
21a4843a48 Integrate newsletter editor tests 2015-08-28 12:35:33 +03:00
Tautvidas Sipavičius
4d1fd2b2d8 Load TinyMCE directly from lib/, disable ajax functions 2015-08-28 12:21:40 +03:00
Tautvidas Sipavičius
fdfd0a6c4f Fix URLs of remaining editor image assets 2015-08-28 12:20:52 +03:00
Tautvidas Sipavičius
7b6236e09c Add image_url Twig function 2015-08-28 12:20:52 +03:00
Tautvidas Sipavičius
c1d6f9ba44 Fix vendor asset loading, add initial newsletter data 2015-08-28 12:20:51 +03:00
Tautvidas Sipavičius
40507d2cad Wrap editor JS code in AMD modules and load them 2015-08-28 12:17:18 +03:00
Tautvidas Sipavičius
da371e33f4 Set up editor style compilation 2015-08-28 00:56:42 +03:00
Tautvidas Sipavičius
42586a72e9 Move over initial editor code, split templates into smaller pieces 2015-08-28 00:43:01 +03:00
marco
a22000abff Fix compose.lock conflict. 2015-08-27 22:49:20 +02:00
marco
f34a6920a0 Newsletters router with multi page links. 2015-08-27 22:44:16 +02:00
marco
27022f2775 New newsletter dynamic form in a route. 2015-08-27 22:44:16 +02:00
marco
4b22e13947 Listing and new newsletters routes. 2015-08-27 22:44:16 +02:00
marco
d0264a3882 Correct routes for the Newsletters page. 2015-08-27 22:44:16 +02:00
marco
acf315ca41 Indent Webpack defines. 2015-08-27 22:44:16 +02:00
marco
374eb0e004 React router can correctly route routes in WordPress. 2015-08-27 22:44:16 +02:00
marco
42fce973e1 Move newsletters listing to right folder. 2015-08-27 22:43:43 +02:00
marco
122478ad9f React Router dep and folder organization. 2015-08-27 22:43:43 +02:00
marco
53f725ae08 Rename batch actions to avoid repeating "list". 2015-08-27 22:38:42 +02:00
Jonathan Labreuille
3d58728312 Fixing listing
- amd style for listing dependencies
- added robo tasks to run failed tests
- created method to start phantomJS server in robofile
- fixed acceptance tests on form widget
- fixed unit test on subscriber
2015-08-27 22:38:42 +02:00
Jonathan Labreuille
d81c4e7aa1 fixed widget + test + split get method in sub router 2015-08-27 22:38:42 +02:00
Jonathan Labreuille
703fd17932 fix sorting indicator not showing for sorted column 2015-08-27 22:38:42 +02:00
Jonathan Labreuille
c683378d24 fixed issue with config widget 2015-08-27 22:38:42 +02:00
Jonathan Labreuille
c6ec28dbc7 added bulk actions 2015-08-27 22:38:42 +02:00