Commit Graph

19873 Commits

Author SHA1 Message Date
Tautvidas Sipavičius
f5c7bb87af Merge pull request #288 from mailpoet/settings_round_1
Subscribe in comments
2016-01-14 16:28:52 +02:00
Jonathan Labreuille
2c8d925971 fixed fatal error 2016-01-14 15:23:22 +01:00
Jonathan Labreuille
0c5beb2511 Refactor & Improvements
- fixed position of checkbox in comment form
- refactored Subscriber::subscribe() method
- removed Form\Subscribe class in favor of Subscription\Comment (I'll create a similar class for Registration)
- added labels in Settings > Basics for Subscribe in comments & registration
- added method in Setting model to check whether signup confirmation is enabled
2016-01-14 14:11:25 +01:00
Jonathan Labreuille
9c0316a87d Merge pull request #289 from mailpoet/newsletter_preview
Hook up sending newsletter previews
2016-01-14 12:48:12 +01:00
Tautvidas Sipavičius
46c1b682fa Add option to scroll to notices 2016-01-14 13:39:48 +02:00
Tautvidas Sipavičius
7954346a3f Fix left padding for .mailpoet_notice on editor pages 2016-01-14 13:31:40 +02:00
Tautvidas Sipavičius
d87ff67f50 Remove whitespace after if and catch keywords 2016-01-13 18:50:52 +02:00
Tautvidas Sipavičius
6642bb3bfa Verify preview input data, remove "Sender" inputs 2016-01-13 14:28:43 +02:00
Tautvidas Sipavičius
2cb32e7a78 Add a method for sending newsletters via new Mailer class 2016-01-13 13:04:21 +02:00
Jonathan Labreuille
fcea9adbd9 Unit tests + minor bugfix
- added unit tests for new methods in Models\Subscriber
- removed check for "isNew()". It was an unecessary check. Also isNew() always returns false once the new model is saved.
2016-01-13 11:54:23 +01:00
Jonathan Labreuille
bbdd0dbb6e Subscribe in comments
- added Subscriber::subscribe($user, $segment_ids)
- refactored Router\Subscribers->subscribe() method to account for new method
- added Form\Subscribe class to handle subscription in comments
- updated Basics settings page (changed "list" to "segment")
2016-01-12 18:46:31 +01:00
Jonathan Labreuille
1b2cf7bd16 Merge pull request #287 from mailpoet/newsletter_save
JSON encode newsletter body when sending it to server
2016-01-12 12:34:38 +01:00
Tautvidas Sipavičius
b7cfa549d5 Change newsletter and template saving to JSON encode body separately 2016-01-11 18:27:30 +02:00
Tautvidas Sipavičius
ffc1d0a61c Set MailPoet version to 0.0.10 for release 0.0.10 2016-01-08 19:38:57 +02:00
Tautvidas Sipavičius
d1b160def7 Merge pull request #286 from mailpoet/cron_update
Cron update
2016-01-08 19:23:50 +02:00
Tautvidas Sipavičius
493fd01754 Merge pull request #285 from mailpoet/import_export_fix
Import export fix
2016-01-08 19:21:56 +02:00
Tautvidas Sipavičius
9ced4b1757 Fix export test after temp URL changed 2016-01-08 19:21:32 +02:00
Tautvidas Sipavičius
17010e5ba9 Merge pull request #281 from mailpoet/rendering_engine_update
Rendering engine update
2016-01-08 19:00:12 +02:00
Vlad
42ad7584d4 - Refactors ColumnsHelper class 2016-01-08 11:35:30 -05:00
Vlad
dbc0f9b238 - Removes header padding 2016-01-08 11:23:02 -05:00
Vlad
e62e9a5892 - Fixes issue with temp folder
- Updates formatting
2016-01-08 10:55:09 -05:00
Vlad
bc25fa61b4 - Updates render method
- Removes unused/commented out code
2016-01-08 10:38:46 -05:00
Vlad
2590967183 - Formats new line identation
- Formats identations in general
2016-01-08 09:00:09 -05:00
Vlad
86eafd3c17 - Removes tabs 2016-01-08 08:47:41 -05:00
Vlad
90a6f160c2 - Removes space after function 2016-01-08 07:53:26 -05:00
Vlad
c774aec6a2 Revert "- Fixes minor issue when daemon has not yet been created"
This reverts commit 8f2fd1d76e.
2016-01-08 07:49:15 -05:00
Vlad
8f2fd1d76e - Fixes minor issue when daemon has not yet been created 2016-01-08 07:40:32 -05:00
Jonathan Labreuille
4df11163a1 automatically update 'updated_at' when saving daemon 2016-01-08 12:23:15 +01:00
Jonathan Labreuille
82a736ffbb Cron update + removing console.log
- use Setting::getValue for getDaemon method
- added "updated_at" property within cron_daemon value (instead of using the setting's column)
- converted line endings to Unix in notice.js and removed console.log
2016-01-08 12:02:11 +01:00
Vlad
87052986e8 - Rebases master
- Updates template
2016-01-07 23:53:15 -05:00
Vlad
0c73c0fadc - Resolves issues identified by @rafaehlers during testing 2016-01-07 22:47:59 -05:00
Vlad
5c7e11076d - WIP on updating import 2016-01-07 18:11:59 -05:00
Vlad
d1df94c759 - Addresses issues identified during code review 2016-01-07 17:24:46 -05:00
Vlad
53cc39c6f5 - Removes spacer from social icon elements 2016-01-07 17:24:45 -05:00
Vlad
4955c72ee1 - Removes transparent background from divider element 2016-01-07 17:24:44 -05:00
Vlad
16661af8c3 - Updates text alignemnt for buttons 2016-01-07 17:24:44 -05:00
Vlad
bc80f69e41 - Updates the template 2016-01-07 17:24:43 -05:00
Vlad
0192934e65 - Removes debug leftovers 2016-01-07 17:24:42 -05:00
Vlad
2793e74858 - Rewrites the rendering engine
- Updates tests
Closes #280
2016-01-07 17:24:32 -05:00
Jonathan Labreuille
5996696cc9 Merge pull request #284 from mailpoet/animations
Animations
2016-01-07 17:31:17 +01:00
Tautvidas Sipavičius
7f6cf5bbf3 Remove obsolete clear divs 2016-01-07 18:28:37 +02:00
Jonathan Labreuille
c0ef2254cd Merge pull request #283 from mailpoet/queue_refactor
Queue refactoring
2016-01-07 13:11:47 +01:00
Vlad
0dbe04c3f8 - Addresses issues identified during code review 2016-01-06 19:19:06 -05:00
Tautvidas Sipavičius
ef1805d9b5 Change obsolete "Arial Black" fonts to "Arial", add Velocity to tests 2016-01-06 16:43:39 +02:00
Tautvidas Sipavičius
514f539e83 Remove obsolete Velocity dependence due to it being injected elsewhere 2016-01-06 15:58:14 +02:00
Tautvidas Sipavičius
50f072705e Fix double animations when ALC block changes, remove console.log lines 2016-01-06 12:48:45 +02:00
Tautvidas Sipavičius
f8f7bc3d3d Handle sidebar animations with Velocity, fix delete button transitions 2016-01-06 12:29:32 +02:00
Vlad
f1bf2bb097 - Refactors Mailer class
- Refactors SendingQueue worker class
- Adds Maier router with a send() method + ability to specify sending method
- Updates tests
- Introduces 'stopping' and 'starting' cron states
- Improves cron control mechanism
Closes #276
2016-01-05 10:34:57 -05:00
Tautvidas Sipavičius
bbe2f69a7f Clean up unused and speed up animations, fix sidebar transitions 2016-01-05 17:32:59 +02:00
Tautvidas Sipavičius
c844488b0b Switch to VelocityJS for view transitions, slow down some transitions 2016-01-05 15:01:30 +02:00