Commit Graph

5358 Commits

Author SHA1 Message Date
9a16904389 Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-09-29 17:30:07 +02:00
37bace359a Template selection
- templates are now loaded via ajax
- added "template" deletion
2015-09-29 17:29:31 +02:00
485d613d84 Switch to camelCase function names for NewsletterTemplate calls 2015-09-29 18:19:50 +03:00
b49c79111f Merge branch 'newsletter_process' of github.com:mailpoet/mailpoet into newsletter_process 2015-09-29 17:01:52 +02:00
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
028b178e3f Add DB tables, model and router for Newsletter templates 2015-09-29 17:23:41 +03:00
e3ef36ac4e fixed rendering issue of listings' select all checkbox 2015-09-29 13:23:12 +02:00
ad851553a0 Merge pull request #149 from mailpoet/bulk_action_fix
Bulk action fix
2015-09-28 16:09:34 +02:00
e46a5d465e Bulk action fix
- bulk action can now be run on single items
- fixed wrong label for Lists column in subscribers listing (affects responsive view)
2015-09-28 13:56:28 +02:00
d958a8cd11 Update composer lockfile. 2015-09-26 00:00:56 +02:00
3f350048c4 Merge pull request #147 from mailpoet/newsletter_api
Newsletter saving from editor
2015-09-25 23:05:47 +02:00
9dc4dfac55 Hook up preview in browser call 2015-09-25 19:26:53 +03:00
65266ddb9f Fix tests 2015-09-25 18:35:09 +03:00
7777ba1180 Hook up newsletter editor saving 2015-09-25 18:15:46 +03:00
dc40d84a22 Merge pull request #141 from mailpoet/react_editor
Newsletter Editor on newsletters listing
2015-09-25 16:18:21 +02:00
0a251f7e19 Merge pull request #143 from mailpoet/newsletter_save_get_render_methods
Allows saving, getting and rendering newsletter
2015-09-25 15:40:18 +02:00
c119cc8024 - Adds additional tests to Newsletter model
- Modified Newsletter router get() method to return full object
2015-09-25 08:48:37 -04:00
3fe378775a Merge pull request #144 from mailpoet/newsletter_json
Rename `data` attribute to `body`
2015-09-25 12:58:00 +02:00
89a9c040a8 Rename data attribute to body 2015-09-25 12:42:46 +03:00
5a1cd9a756 improved listing's custom actions 2015-09-25 11:20:00 +02:00
7ab4741705 Merge branch 'react_editor' of github.com:mailpoet/mailpoet into react_editor 2015-09-25 10:28:47 +02:00
7562ac22ee Edit newsletter
- added custom item_actions to listings
- added special function in order to register pages that aren't present in the menu
- removed useless test.hbs
- added wp_nonce_field & params functions to Twig
- created a separate "newsletter/form.html" (copy of editor.html) but properly formatted
2015-09-25 10:25:50 +02:00
66f2dc456f Merge pull request #142 from mailpoet/newsletter_json
Move newsletter content attributes into data object
2015-09-25 09:35:52 +02:00
30d0d1594d - Modifies Newsletter router save() and get() methods
- Adds Newsletter router render() method
- Adds 'body' validation to Newsletter model
- Adds new 'preheader' column to Migrator
- Corrects Nesletters acceptance test class name conflict
- Updates Newsletter model tests
Closes #138
2015-09-24 18:26:44 -04:00
d7029f3d29 Move newsletter content attributes into data object 2015-09-24 19:49:56 +03:00
38150a05b1 Composer lock update. 2015-09-24 17:48:50 +02:00
8846bc9e43 Fix editor's newsletter saving tests 2015-09-24 17:07:23 +03:00
246089b4b6 Add call wrappers for saving and previewing newsletters 2015-09-24 13:54:52 +03:00
4f8e1483f4 Update Backbone.Marionette to new 2.4.3 version 2015-09-24 13:54:18 +03:00
14cf783544 Add placeholders for getting and saving newsletters 2015-09-24 12:51:32 +03:00
38fb33d2eb Merge pull request #123 from mailpoet/rendering_engine
Newsletter rendering engine.
2015-09-24 10:16:23 +02:00
a2494cfa1b - Adds tests for newsletter renderer 2015-09-23 22:42:11 -04:00
9175c5308b Merge pull request #127 from mailpoet/posts_api
Wordpress Posts API endpoints
2015-09-23 18:31:18 +02:00
6c37bd5611 Merge pull request #130 from mailpoet/bulk_actions
Bulk actions
2015-09-23 18:30:07 +02:00
b3e376cd01 - Refactored using @badshark's comments
- Integrated changes to JSON data
2015-09-23 11:24:08 -04:00
01b5416882 Refactors Newsletters as per @badshark's comments 2015-09-23 09:28:00 -04:00
692e69d567 Pretty newsletter json test data.
I'm trying to uderstand more about how the generated json
works.
2015-09-23 09:28:00 -04:00
1e6e59f58f Refactored using PSEUDO* as per Marco's advice 2015-09-23 09:27:59 -04:00
42d659472e - Made all rendering classes dynamic except for single blocks 2015-09-23 09:27:59 -04:00
7e4bd0d044 Indented HTML code as per Marco's comment 2015-09-23 09:27:58 -04:00
42c5885cbd - Ported newsletter rendering engine 2015-09-23 09:27:58 -04:00
c8956018b4 Merge pull request #137 from mailpoet/newsletter_json
Change names of newsletter JSON keys
2015-09-23 15:25:14 +02:00
56e40feb56 Bulk actions + Extra data
- fixed issue on bulk action being run even without any items selected
- added WP like feature regarding item selection, if all items are checked, it also checks the header/footer checkboxes
- fixed issue where the selection state was not properly reset
- added List column to subscribers
- added json_encode/json_decode to Twig
2015-09-23 14:13:25 +02:00
17564d85fe Rename subject and preheader, fix tests 2015-09-23 14:24:24 +03:00
fd7312fbf9 Change names of newsletter JSON attributes 2015-09-23 14:16:37 +03:00
27a90f5ef1 Merge pull request #136 from mailpoet/fix_initial_newsletter
Fix the initial malformed newsletter
2015-09-23 12:19:22 +02:00
df8af5610f Disable wplink integration for Text, Header, Footer blocks 2015-09-22 15:54:27 +03:00
6b5e775ddd Fix the initial malformed newsletter and change it to a proper one 2015-09-22 13:02:47 +03:00
be76e016b3 Fix addition of dividers, do general refactoring 2015-09-18 19:01:34 +03:00
239e2583d2 refactored bulk actions & implemented bulk trash for all listings 2015-09-18 17:39:25 +02:00