Commit Graph

5329 Commits

Author SHA1 Message Date
5cc9c1c6de Tests cleanup. 2015-08-20 00:31:42 +02:00
e386c3aa38 Cleanup tests. 2015-08-20 00:21:10 +02:00
01360eea66 Newsletters router. 2015-08-20 00:11:32 +02:00
524150a6f7 Subscribers router. 2015-08-20 00:09:38 +02:00
ce730d7c3b Settings router.
Here's a simple settings router. the createOrUpdate method lives
in the model, and by default all models will return true on save
or false if save went wrong.
2015-08-19 23:55:30 +02:00
bc65836c31 Webpack refactor
- added JSX support (webpack + robofile
- added public.js bundle
- refactored webpack config for clarity
- added settings.jsx form example
- fixed acceptance test failing on login
2015-08-19 19:29:11 +02:00
b8f0ec4e88 removed symlinks and css/lib folder 2015-08-19 15:29:07 +02:00
ce1dfe2b9c Started working on Webpack Assets 2015-08-19 15:21:26 +02:00
ada1bfdcd9 Merge branch 'new_pages' 2015-08-18 17:40:26 +02:00
bb6abf3c7d Newsletters page, with test. 2015-08-18 17:07:14 +02:00
347706e119 Added Subscribers empty page, with test. 2015-08-18 16:57:13 +02:00
b0f7e44a68 #65 fixing MailerCest::itCanGenerateACorrectMessage 2015-08-18 16:35:48 +02:00
fd0cc96fb2 Merge pull request #70 from mailpoet/first_mailer
A first Mailer for the Bridge
2015-08-18 16:27:40 +02:00
7a8c0a9e3e fixed composer lock conflict 2015-08-18 15:59:08 +02:00
8e20b23571 ... added do command with ln -nsf flags 2015-08-18 15:43:20 +02:00
7178aad04e removed do command... 2015-08-18 15:42:33 +02:00
58d83f5fbe fixed MPAjax to behave with router 2015-08-18 15:29:00 +02:00
7da1cb9f5b #65 fix and test Marco's refactoring 2015-08-18 09:23:35 +02:00
d60ba538f8 Refactor request generator from the send method. 2015-08-17 20:24:27 +02:00
a84501024a Refactor mailer. 2015-08-17 20:20:36 +02:00
e925b14aae Merge pull request #69 from mailpoet/newsletter_model
Newsletter model
2015-08-17 19:53:07 +02:00
c3e8812d7b Merge branch 'master' into newsletter_model 2015-08-17 19:48:41 +02:00
b6cac960b7 Fix empty whitespace. 2015-08-17 19:46:57 +02:00
b1dab4ce5d Merge branch 'master' of github.com:mailpoet/mailpoet 2015-08-17 19:41:47 +02:00
cb20f7ae0b Add compiling assets documentation. 2015-08-17 19:41:26 +02:00
1d6374de00 Merge pull request #78 from mailpoet/static_assets
Remove assets sources from the build directory
2015-08-17 19:40:17 +02:00
3af24f9877 Reverted back to Model class 2015-08-17 17:37:43 +00:00
2fbfd7bb01 New build command with Webpack integration. 2015-08-17 19:37:33 +02:00
dd8f704037 Merge remote-tracking branch 'origin/master' into newsletter_model 2015-08-17 13:35:38 -04:00
653aa9be8f Remove broken test, we don't have static CSS anymore. 2015-08-17 19:07:17 +02:00
a26cbd6f41 - Renamed Model to BaseModel (make it clear)
- Updated RoboFile to compile assets or else tests break
2015-08-17 15:54:48 +00:00
bb35e4f005 #74 remove assets sources from the build directory before zipping the plugin 2015-08-17 16:05:52 +02:00
61a372dd86 resolved merge conflicts 2015-08-17 10:00:37 -04:00
9b145f41a3 Merge pull request #76 from mailpoet/fix_js_assets
Move app code to `assets/js/src` folder, remove compiled files
2015-08-17 16:51:15 +03:00
a6d4b6ee00 Updated robo task + removed bundled assets 2015-08-17 15:42:59 +02:00
14fdfaed86 Fixed formatting issues as per Marco's remarks 2015-08-17 09:40:57 -04:00
cf3695157a Update Robo task to compile assets
- renamed compile:javascript to compile:js
- renamed compile:styles to compile:css
- added compile:all to compile all of our assets
- added compiled js & css to gitignore
- removed console.log from src/admin.js
2015-08-17 15:04:30 +02:00
ffc180eac8 #65 test the generateMessage method; test with more than one subscribers 2015-08-17 14:08:31 +02:00
6ed4ce0de2 Swap app code with bundles in assets/js/src folder 2015-08-17 14:31:32 +03:00
9db0db83b1 There's no need to encode json in the Router. 2015-08-17 12:44:53 +02:00
f78ab1c44b #65 renamed the generateMessage method; simplify the subscribers property; removed the handle method 2015-08-17 10:33:22 +02:00
b106870e96 Merged master / fixed merge conflict 2015-08-16 22:38:58 -04:00
48f6ff4b91 Merge pull request #71 from mailpoet/ajax_router
Ajax router
2015-08-16 23:47:28 +02:00
60919e6171 Router works for POST requests. 2015-08-16 20:21:34 +02:00
d8fbdd82bc Merge branch 'master' into ajax_router 2015-08-16 12:31:09 +02:00
7b946798c5 Merge pull request #67 from mailpoet/build_command
Added a build command to RoboFile.php
2015-08-14 23:42:12 +02:00
5c1f3f43de There's no need to copy node_modules. 2015-08-14 23:41:46 +02:00
745700e5fe Global bash script with Linux and OSX compatibility. 2015-08-14 23:39:38 +02:00
32f01272f1 #65 a first Mailer for the Bridge, with a minimal test 2015-08-14 16:29:02 +02:00
65f0b7d2d3 Removed leftover .orig file from merge conflict 2015-08-14 13:34:27 +00:00