Commit Graph

5329 Commits

Author SHA1 Message Date
bf8b0c81df Merge pull request #1262 from mailpoet/recently-sent-templates
limitting the recently sent templates to 12 [MAILPOET-1265]
2018-02-13 11:28:42 +03:00
d82e3a25ac Merge pull request #1260 from mailpoet/get-terms-filter
Use filter for getTerms search [MAILPOET-1293]
2018-02-13 03:03:39 +03:00
98ed295896 Merge pull request #1261 from mailpoet/refactoring-models
refactoring createOrUpdate method of models [MAILPOET-1294]
2018-02-12 13:59:26 +02:00
b076e03a75 using static instead of self
renaming `internalCreateOrUpdate` to `_createOrUpdate`
renaming `$conditions` to `$keys`
adding block comment for `_createOrUpdate` method.
2018-02-12 11:15:46 +00:00
a754cfaa52 limitting the recently sent templates to 12 2018-02-09 16:43:40 +00:00
3721694f4d Merge pull request #1259 from mailpoet/empty-trash-msg
"Empty Trash" now shows the correct notice message [MAILPOET-1289]
2018-02-09 09:36:41 -05:00
91622f8cd9 refactoring createOrUpdate method of models 2018-02-07 18:10:49 +00:00
4a3ba73406 Use filter for getTerms search
[MAILPOET-1293]
2018-02-07 12:58:00 +00:00
ab3a2f064f "Empty Trash" now shows the correct notice message 2018-02-06 14:35:37 +00:00
a2270d6689 Release 3.4.1 3.4.1 2018-02-06 13:23:16 +00:00
e09acbe649 Merge pull request #1258 from mailpoet/stats-segmentation
Return error code for duplication errors [PREMIUM-42]
2018-02-05 21:10:54 -05:00
b54f002635 Merge pull request #1254 from mailpoet/am_display_events_chunk1
Makes necessary changes for automatic emails feature to work [PREMIUM-63]
2018-02-05 17:48:23 +02:00
aaaf49d071 Merge pull request #1256 from mailpoet/bugfix
fixing Segment::bulkDelete not deleting subscribers assiciations [MAILPOET-1287]
2018-02-05 17:53:04 +03:00
8ff28fd974 Return error code for duplication errors
[PREMIUM-42]
2018-02-05 14:34:15 +00:00
126b37f2bb Merge pull request #1257 from mailpoet/scheduled_emails_to_dynamic_segments_fix
Fix sending of scheduled standard emails to dynamic segments [MAILPOET-1286]
2018-02-05 11:25:30 +01:00
bebd835790 Merge pull request #1253 from costasovo/jsdom-upgrade
js-tests: jsdom upgrade
2018-02-05 10:56:16 +01:00
9526a6b470 Fix sending of scheduled standard email to dynamic segments [MAILPOET-1286] 2018-02-02 19:19:49 +03:00
7eb8ff756b fixing Subscriber::bulkDelete not deleting subscribers assiciations 2018-02-02 12:43:34 +00:00
9159e8d21d Merge pull request #1249 from mailpoet/stats-segmentation
Stats segmentation [PREMIUM-42]
2018-02-01 20:34:39 -05:00
f4ba45490d Corrects identation 2018-02-01 18:27:57 -05:00
9f9b44fd7e Adds a method that cleans up after Select2 2018-02-01 18:26:30 -05:00
ae9f373cff Removes state and updates method to test if Select2 is initialized 2018-02-01 17:53:16 -05:00
80a3bbd030 Changes method name to get selection items 2018-02-01 17:46:26 -05:00
aba75849e1 Standardizes placeholder and border colors for Select2 elements 2018-02-01 08:59:12 -05:00
874a37303a Exposes Selection form field 2018-02-01 08:59:12 -05:00
f467479438 Allows overriding Select2 options 2018-02-01 08:59:12 -05:00
bb76a8c6aa Cleans up DOM elements manually added by Select2 and not tracked by
React
2018-02-01 08:59:12 -05:00
63000c48c4 Allows reinitializing Select2 upon component rerender 2018-02-01 08:59:12 -05:00
b88dec06d9 Adds getter for field ID 2018-02-01 08:59:11 -05:00
a0667adace Prevents component from rerendering when Select2 is initialized 2018-02-01 08:59:11 -05:00
fef8017134 Loads select items before render 2018-02-01 08:59:11 -05:00
87de314c18 Adds option to query remote source for data 2018-02-01 08:59:11 -05:00
c8a20ec4ae Merge pull request #1252 from mailpoet/templates
filtering unknown templates categories [MAILPOET-1281]
2018-02-01 14:44:19 +02:00
9739159a6f Merge pull request #1251 from mailpoet/test
Fix acceptance tests flakiness [MAILPOET-1284]
2018-02-01 14:31:41 +02:00
0aa4c37ad3 js-tests: jsdom upgrade 2018-01-31 23:44:12 +01:00
2c8c8b3d0e filtering unknown templates categories 2018-01-31 16:04:28 +00:00
12434b412f Add code comment 2018-01-31 10:30:33 +00:00
789c2a7d4e Wait before login 2018-01-31 09:41:15 +00:00
907356bb0f Wait for login field to be loaded 2018-01-31 09:15:20 +00:00
8800799234 Bump up release version to 3.4.0 3.4.0 2018-01-30 22:21:01 +03:00
9c2aa569ea After login ensure MailPoet present on the page 2018-01-30 15:39:30 +00:00
9ee6920ebb Use our login function 2018-01-30 15:03:03 +00:00
5d8d9567c7 Merge pull request #1234 from mailpoet/tempales-categories
Add template categorization [MAILPOET-1159]
2018-01-30 16:20:01 +02:00
5bddc79576 generating thumb for all newsletter types 2018-01-30 13:51:03 +00:00
e2f23df829 close loading modal 2018-01-30 13:26:51 +00:00
43fbbca050 moving width to css 2018-01-30 12:49:51 +00:00
5109bc3922 Merge pull request #1250 from mailpoet/new-poll
Add a new poll [MAILPOET-1275]
2018-01-30 13:01:58 +02:00
65b4aeffc8 Add a new poll
[MAILPOET-1275]
2018-01-30 10:38:28 +00:00
17a25120d4 Add conflict HTTP code
[PREMIUM-42]
2018-01-30 10:16:12 +00:00
cb055a2b06 Allow extra action buttons in filter rows
[PREMIUM-42]
2018-01-29 15:37:52 +00:00