Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity
22,694 Commits 3 Branches 547 Tags
2bc29c8b0a67a789570e440241eabb490c0bf17c
Commit Graph

22694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MrCasual
14fdfaed86 Fixed formatting issues as per Marco's remarks 2015-08-17 09:40:57 -04:00
Jonathan Labreuille
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
Laurent Szyster
ffc180eac8 #65 test the generateMessage method; test with more than one subscribers 2015-08-17 14:08:31 +02:00
Tautvidas Sipavičius
6ed4ce0de2 Swap app code with bundles in assets/js/src folder 2015-08-17 14:31:32 +03:00
marco
9db0db83b1 There's no need to encode json in the Router. 2015-08-17 12:44:53 +02:00
Laurent Szyster
f78ab1c44b #65 renamed the generateMessage method; simplify the subscribers property; removed the handle method 2015-08-17 10:33:22 +02:00
MrCasual
b106870e96 Merged master / fixed merge conflict 2015-08-16 22:38:58 -04:00
Marco
48f6ff4b91 Merge pull request #71 from mailpoet/ajax_router 
Ajax router
 2015-08-16 23:47:28 +02:00
marco
60919e6171 Router works for POST requests. 2015-08-16 20:21:34 +02:00
marco
d8fbdd82bc Merge branch 'master' into ajax_router 2015-08-16 12:31:09 +02:00
Marco
7b946798c5 Merge pull request #67 from mailpoet/build_command 
Added a build command to RoboFile.php
 2015-08-14 23:42:12 +02:00
marco
5c1f3f43de There's no need to copy node_modules. 2015-08-14 23:41:46 +02:00
marco
745700e5fe Global bash script with Linux and OSX compatibility. 2015-08-14 23:39:38 +02:00
Laurent Szyster
32f01272f1 #65 a first Mailer for the Bridge, with a minimal test 2015-08-14 16:29:02 +02:00
Vlad
65f0b7d2d3 Removed leftover .orig file from merge conflict 2015-08-14 13:34:27 +00:00
Vlad
78b5791a46 - Added 'Newsletters' model and wrote tests 
- Fixed some formatting in unit tests
Closes #68
 2015-08-14 13:31:45 +00:00
Laurent Szyster
0b0539dc83 #66 added a build command to RoboFile.php 2015-08-14 12:01:27 +02:00
marco
3b00e453a5 Build command is not working. 2015-08-14 10:27:38 +02:00
Marco
b5a8a68a5c Merge pull request #60 from mailpoet/build 
Add a command to build mailpoet.zip from sources
 2015-08-14 10:14:54 +02:00
marco
60f63ccfe6 Router skeleton. 2015-08-13 21:57:05 +02:00
marco
983a8de70c Merge branch 'master' into router 2015-08-13 20:59:17 +02:00
Marco
b3d726d5fd Merge pull request #64 from mailpoet/robotask-improvement 
Changes to Robotask
 2015-08-13 20:56:42 +02:00
MrCasual
e83924bb53 Removed .orig file from merge conflict 2015-08-13 14:32:48 -04:00
Vlad
48f7509dfd - Fixed environment loading for unit/acceptance tests 
- Added ability to test single units
 2015-08-13 17:45:20 +00:00
Marco
f11a961a2e Merge pull request #55 from mailpoet/models_validation 
Models validation
 2015-08-13 18:34:42 +02:00
MrCasual
9c80429d0d Merge master/resolved conflicts 2015-08-13 12:26:40 -04:00
marco
ed3e3b0eb8 Fix indentation. 2015-08-13 18:18:12 +02:00
marco
3183e34afc Fix indentation and naming on Setting test. 2015-08-13 18:11:14 +02:00
marco
1202032ab6 Fix function and map when destroying models. 2015-08-13 18:07:36 +02:00
marco
d7f7e48d8b Fix indentation. 2015-08-13 18:05:49 +02:00
marco
ed27b5716b Fix indentation. 2015-08-13 18:05:26 +02:00
marco
781e016be5 Fix indentation. 2015-08-13 18:04:28 +02:00
marco
81c8b22b36 Fix indentation. 2015-08-13 18:03:36 +02:00
marco
0074ade376 Fix indentation. 2015-08-13 17:44:48 +02:00
marco
b72db327f7 Fix error on test:all command. 2015-08-13 17:42:24 +02:00
marco
32fb4ee6fa Update composer.lock 2015-08-13 17:25:42 +02:00
Marco
02f1f4354d Merge pull request #58 from mailpoet/dependency_loader 
Require frontend dependencies.
 2015-08-13 17:09:26 +02:00
Tautvidas Sipavičius
a0a50407b9 Split modules into different entry points, separate vendor modules 2015-08-13 18:08:44 +03:00
Tautvidas Sipavičius
d19c1bca60 Explain how to deal with module loading in README.md 2015-08-13 17:42:40 +03:00
Laurent Szyster
df0048bdd0 #16 added lang to the white list 2015-08-13 16:16:54 +02:00
Laurent Szyster
0996be363d #16 whitelist what goes into the zip file; moved napa from dev to production in package.json 2015-08-13 16:12:06 +02:00
Marco
c5fce75630 Merge pull request #61 from mailpoet/revert-59-form_widget 
Revert "Form Widget"
 2015-08-13 16:10:20 +02:00
Marco
1ead513437 Revert "Form Widget" 2015-08-13 16:07:46 +02:00
Marco
357c2f474a Merge pull request #59 from mailpoet/form_widget 
Form Widget
 2015-08-13 16:05:15 +02:00
Vlad
304c114dd3 Merge remote-tracking branch 'origin/master' into models_validation 
Conflicts:
	lib/Models/Setting.php
	lib/Models/Subscriber.php
	tests/unit/Models/SettingCest.php
	tests/unit/Models/SubscriberCest.php
 2015-08-13 14:04:27 +00:00
MrCasual
5d1b8524ea Added Laurent's tests/model save() method 2015-08-13 09:58:41 -04:00
Jonathan Labreuille
8ec5bd4ffd refactor form widget to remove pure HTML 2015-08-13 15:37:54 +02:00
Laurent Szyster
480f835b99 #16 a command to build mailpoet.zip from sources 2015-08-13 15:26:07 +02:00
Tautvidas Sipavičius
3b0a6edc22 Remove relative path for jQuery inclusion in tests 2015-08-13 14:59:01 +03:00
Tautvidas Sipavičius
7a43980f32 Add mocha test bundling with webpack and test running 2015-08-13 14:11:10 +03:00