Commit Graph

5329 Commits

Author SHA1 Message Date
amine-mp
1d019bc11e Merge pull request #1004 from mailpoet/filter_to_whitelist_plugins_from_conflict_resolver
Adds filters to whitelist styles/scripts unloaded by our plugin [MAILPOET-1008]
2017-07-17 15:11:37 +02:00
Amine Ben hammou
ca12487416 moving shell code into a bash file 2017-07-17 11:38:41 +00:00
mrcasual
c5d42a5033 Merge pull request #995 from mailpoet/welcome-tab-update
Welcome tab update [MAILPOET-979]
2017-07-17 07:17:26 -04:00
Amine Ben hammou
3b079440b5 try without sharing workspace 2017-07-17 10:52:48 +00:00
Amine Ben hammou
419697991f Adding workflows to CircleCI
Splitting build into 2 builds:

- `build_qa_js`: Builds the project and runs the qa checks and JS tests.

- `php_5`: Runs the PHP tests with PHP 5.6.3

and adding a new build

- `php_7`: Runs the PHP tests with PHP 7.1
2017-07-17 10:26:17 +00:00
Pavel Dohnal
d119a1e5fa Send settings values to Mixpanel
[MAILPOET-974]
2017-07-17 11:15:29 +01:00
Pavel Dohnal
1bd4264dd5 Fix code style
[MAILPOET-979]
2017-07-17 09:20:28 +01:00
amine-mp
21ee60b7d7 Merge pull request #1002 from mailpoet/newsletter_duplication_update
Resets sent at data when duplicating a sent newsletter [MAILPOET-1005]
2017-07-17 10:07:29 +02:00
Vlad
849ca27d1f Adds filters to whitelist styles or scripts 2017-07-15 14:57:40 -04:00
Vlad
a4dad46fb7 Adds asArray() method to the base Model that's used as proxy for
Idiorm's as_array()
2017-07-15 14:25:50 -04:00
mrcasual
fac4c8fb41 Merge pull request #1000 from mailpoet/fix-frequency-smtp
Fix default frequency
2017-07-15 13:04:40 -04:00
Vlad
cdc87c23ea Resets sent at data when duplicating a sent newsletter 2017-07-15 13:00:25 -04:00
Vlad
34d09ce0c9 Sets mailer log error when queue cannot be saved during newsletter
pre-processing
2017-07-14 23:15:14 -04:00
Vlad
fe9ae392f2 Replaces URL extraction regex with DOM parser
Simplifies link replacement logic
Cleans up code
2017-07-14 23:15:08 -04:00
Vlad
9501640f4f Prevents double UTF-8 encoding 2017-07-14 14:03:48 -04:00
Pavel Dohnal
ad028ab55d Fix devault frequency 2017-07-14 08:01:54 +01:00
mrcasual
74cb8d9735 Merge pull request #998 from mailpoet/settings_flex_fix
Fix broken layout in IE 11 on a big screen + make it look like in previous versions [MAILPOET-1002]
2017-07-13 14:11:24 -04:00
stoletniy
381608df22 Fix broken layout in IE 11 on a big screen + make it look like in previous versions [MAILPOET-1002] 2017-07-13 21:03:24 +03:00
stoletniy
6aca598dc3 Fix tests: unneeded migration was triggered by resetting the DB version to 1.0.0 (after EnvTest)
This caused errors when pinging the daemon [MAILPOET-940]
2017-07-13 16:26:53 +03:00
stoletniy
acbe2e383a Add tests [MAILPOET-940] 2017-07-13 13:27:28 +03:00
stoletniy
55d3b67a2a Extract common and task-specific methods for subscribers [MAILPOET-940] 2017-07-13 13:27:28 +03:00
stoletniy
c02394b576 Prepare subscribers in the Bounce worker DB-side for performance reasons [MAILPOET-940] 2017-07-13 13:27:27 +03:00
stoletniy
6a9b8d88c2 Extract subscribers to a separate table in the Bounce worker [MAILPOET-940] 2017-07-13 13:27:27 +03:00
stoletniy
b24c51d800 Merge pull request #996 from mailpoet/add-extra-text
Add extra text on Send with... [MAILPOET-954]
2017-07-13 13:24:22 +03:00
Tautvidas Sipavičius
d3a3d3b277 Merge pull request #993 from mailpoet/duplicate-content
Add an option to duplicate content blocks [MAILPOET-968]
2017-07-13 13:14:36 +03:00
Pavel Dohnal
3dcff8eb8a Update styles to handle more text
[MAILPOET-954]
2017-07-13 09:41:08 +01:00
Tautvidas Sipavičius
401339244c Merge pull request #991 from mailpoet/fix-duplicate-smtp
Remove a duplicate field [MAILPOET-995]
2017-07-12 19:30:37 +03:00
Pavel Dohnal
653ecdc4d0 Add extra copy
[MAILPOET-954]
2017-07-12 16:54:49 +01:00
Pavel Dohnal
88d5952684 Remove duplicate id
[MAILPOET-979]
2017-07-12 14:55:53 +01:00
amine-mp
c4d6c19c67 Merge pull request #990 from mailpoet/eslint-no-var
Eslint fixes [MAILPOET-994]
2017-07-12 15:51:26 +02:00
Pavel Dohnal
0554a84f77 Apply new styles
[MAILPOET-979]
2017-07-12 13:38:56 +01:00
Pavel Dohnal
c01b57a383 Add poll
[MAILPOET-979]
2017-07-12 10:28:35 +01:00
Pavel Dohnal
65f4f493f1 Add sharing section
[MAILPOET-979]
2017-07-12 10:09:17 +01:00
Pavel Dohnal
8a7ea791b0 Move button to see all changelogs
[MAILPOET-979]
2017-07-12 09:35:10 +01:00
Pavel Dohnal
1823985172 Display only one set of changelog
[MAILPOET-979]
2017-07-12 09:19:22 +01:00
Pavel Dohnal
e735b5f3e0 Replace title
[MAILPOET-979]
2017-07-12 08:44:04 +01:00
mrcasual
cd5c57b7e9 Merge pull request #994 from mailpoet/fixing-readme
Fixing 'Get in touch' URL [MAILPOET-996]
2017-07-11 13:35:36 -04:00
Amine Ben hammou
fbf59723d8 Fixing 'Get in touch' URL 2017-07-11 16:57:56 +00:00
Pavel Dohnal
2e166a233b Update duplicate icon
[MAILPOET-968]
2017-07-11 17:19:41 +01:00
Pavel Dohnal
1608ba5893 Remove a duplicate field
[MAILPOET-995]
2017-07-11 15:39:22 +01:00
Pavel Dohnal
9d7eb8038d Fix eslint rule arrow-parens 2017-07-11 14:31:19 +01:00
Pavel Dohnal
c9c78a7160 Fix eslint rule indent 2017-07-11 14:31:19 +01:00
Pavel Dohnal
53df10dc2b Fix eslint rule eol-last 2017-07-11 14:31:19 +01:00
Pavel Dohnal
a746c124a3 Fix eslint rule object-curly-spacing 2017-07-11 14:31:19 +01:00
Pavel Dohnal
ca5a5301a8 Fix eslint rule no-var 2017-07-11 14:31:19 +01:00
Vlad
7a2aaa86cf Tests that populator method is not run for versions below
3.0.0-beta.36.2.1
2017-07-11 14:26:29 +01:00
Pavel Dohnal
b626c7ea3c Release 3.0.0-beta.36.3.0 3.0.0-beta.36.3.0 2017-07-11 12:50:33 +01:00
Pavel Dohnal
695152e947 Allow duplicate content
[MAILPOET-968]
2017-07-11 10:53:52 +01:00
Tautvidas Sipavičius
a36fe400ed Merge pull request #966 from mailpoet/mp2tomp3migration
Settings migration from MP2 to MP3
2017-07-11 12:43:19 +03:00
Tautvidas Sipavičius
22bb971db5 Merge pull request #980 from mailpoet/newsletter_listing_update
Sorts standard/history notification records by sent_at date in listings [MAILPOET-932]
2017-07-11 12:43:06 +03:00