Coleman Watts [Thu, 15 Dec 2016 04:43:33 +0000 (23:43 -0500)]
CRM-19769 - Add color contrast utility function
Tim Otten [Fri, 23 Dec 2016 16:06:20 +0000 (10:06 -0600)]
Merge pull request #9564 from totten/master-19690-cleanup
CRM-19690 - CiviMail - Add MailingSystemTest. Small code cleanups.
Monish Deb [Fri, 23 Dec 2016 13:25:31 +0000 (18:55 +0530)]
Merge pull request #9568 from lcdservices/CRM-19761
CRM-19761 support docx, etc export
Tim Otten [Fri, 23 Dec 2016 01:27:20 +0000 (19:27 -0600)]
Merge pull request #9563 from totten/master-19690-tokens
CRM-19690 - CRM_Mailing_Tokens - Add TokenProcessor support
Alice Frumin [Thu, 22 Dec 2016 22:18:30 +0000 (17:18 -0500)]
CRM-19734 Custom fields display wrongly on Case View page (#9559)
* Update joomla.css
* Update joomla.css
* Update joomla.css
Tim Otten [Thu, 22 Dec 2016 21:51:04 +0000 (15:51 -0600)]
CRM-19690 - CRM_Mailing_{Action,}Tokens - Docblock tweak
Tim Otten [Thu, 22 Dec 2016 19:41:07 +0000 (13:41 -0600)]
CRM-19690 - MailingJob::findPendingTasks() - Tweak style
Tim Otten [Thu, 22 Dec 2016 19:39:49 +0000 (13:39 -0600)]
CRM-19690 - MailingJob::deliver() - Remove disabled debug code
Tim Otten [Thu, 22 Dec 2016 18:50:43 +0000 (11:50 -0700)]
CRM-19690 - CRM_Mailing_TokensTest - Define negative test scenario
Tim Otten [Thu, 22 Dec 2016 18:24:54 +0000 (11:24 -0700)]
CRM-19690 - CRM_Mailing_Tokens - Remove unused `getTrackOpenUrl`
During development of FlexMailer, I flirted with using a special token (e.g.
`{actions.trackOpen}`) but ultimately found that was positioned well in
the order of operations.
colemanw [Thu, 22 Dec 2016 03:29:48 +0000 (22:29 -0500)]
Merge pull request #9569 from colemanw/OptionValue
OptionValue Api cleanup - remove unnecessary lookup
Coleman Watts [Wed, 21 Dec 2016 18:41:04 +0000 (13:41 -0500)]
OptionValue Api cleanup - remove unnecessary lookup
Monish Deb [Wed, 21 Dec 2016 12:59:11 +0000 (18:29 +0530)]
Merge pull request #9556 from jitendrapurohit/CRM-19777
CRM-19777: Edit contribution : wrong decimal separator on total_amount
colemanw [Wed, 21 Dec 2016 01:53:17 +0000 (20:53 -0500)]
Merge pull request #9567 from JKingsnorth/CRM-19789
CRM-19789: Re-add qill getter
Brian Shaughnessy [Tue, 20 Dec 2016 16:16:14 +0000 (11:16 -0500)]
CRM-19761 support docx, etc export
JKingsnorth [Tue, 20 Dec 2016 10:48:28 +0000 (10:48 +0000)]
CRM-19789: Re-add qill getter
Tim Otten [Tue, 20 Dec 2016 04:34:39 +0000 (20:34 -0800)]
Merge pull request #9562 from totten/master-19690-schema
CRM-19690 - Declare Mailing.template_type, Mailing.template_options, Hook::mailingTemplateTypes.
Tim Otten [Tue, 20 Dec 2016 03:00:40 +0000 (19:00 -0800)]
(NFC) CRM-19690 - Improve code-style and docblocks
Tim Otten [Fri, 2 Dec 2016 18:24:02 +0000 (10:24 -0800)]
CRM-19690 - Mailing API - Encode and decode `template_options`
Present API consumers with a consistent, array-based interface for reading
and writing properties in a Mailing.
Suppose you're submitting a REST request to create a mailing. The REST
request as a whole is encoded with JSON. With the default API behavior, you
would need to double-encode the `template_options`, e.g. roughly
```
POST rest.php
json_encode([
entity => Mailing
action => create
params => [
template_options => json_encode([...])
]
])
```
With this patch, you only need to encode the request once.
This parallels the approach used in CaseType API (for the XML `definition`
field).
Tim Otten [Mon, 28 Nov 2016 22:09:20 +0000 (14:09 -0800)]
CRM-19690 - Declare Mailing.template_type, Mailing.template_options, Hook::mailingTemplateTypes.
This adds two new fields to the schema.
Template types can be declared (along with preferred editor) using
hook_civicrm_mailingTemplateTypes, e.g.
```
function mymod_civicrm_mailingTemplateTypes(&$types) {
$types[] = array(
'name' => 'moasico',
'editorUrl' => '~/crmMosaico/EditMailingCtrl/mosaico.html',
);
}
```
Note: This only stores data. Other commits will make use of that data in
more meaningful ways.
Tim Otten [Fri, 16 Dec 2016 23:58:09 +0000 (15:58 -0800)]
CRM-19690 - CRM_Mailing_MailingSystemTest - Improve CiviMail test coverage
Tim Otten [Tue, 29 Nov 2016 03:35:53 +0000 (19:35 -0800)]
CRM-19690 - Mailing - Make getTemplates and getVerpAndUrlsAndHeaders public
These two functions will be useful in FlexMailer's DefaultEngine.
Tim Otten [Tue, 29 Nov 2016 23:47:00 +0000 (15:47 -0800)]
CRM-19690 - CRM_Utils_Token::getAnonymousTokenDetails() - Add missing `static`
This function is only called once, and it previously lacked test coverage,
so the `static` warning previously snuck through. Fix it!
Tim Otten [Wed, 7 Dec 2016 03:40:03 +0000 (19:40 -0800)]
CRM-19690 - MailingJob - Extract findPendingTasks().
Tim Otten [Wed, 30 Nov 2016 00:00:16 +0000 (16:00 -0800)]
CRM-19690 - AbstractTokenSubscriber - Only evaluate tokens that are used
This is more significant with mailing tokens because some of them are fairly
sizeable/expensive.
Tim Otten [Wed, 30 Nov 2016 00:07:26 +0000 (16:07 -0800)]
CRM-19690 - CRM_Mailing_Tokens - Add TokenProcessor support
This includes support for both `{mailing.*}` and `{action.*}` tokens used in
CiviMail.
Eileen McNaughton [Mon, 19 Dec 2016 21:53:01 +0000 (10:53 +1300)]
Merge pull request #9535 from totten/master-phpunit-phpstorm
tools/scripts/phpunit-ls - Fix PhpStorm lookup of PHPUnit_Framework_TestCase
Yashodha Chaku [Mon, 19 Dec 2016 11:46:23 +0000 (17:16 +0530)]
Merge pull request #9558 from yashodha/CRM-18472
CRM-18472: notice fixes
Yashodha Chaku [Mon, 19 Dec 2016 09:49:08 +0000 (15:19 +0530)]
Merge pull request #9550 from JKingsnorth/CRM-19413
CRM-19413 Fix undefined index test_group when testing mailings
yashodha [Mon, 19 Dec 2016 07:47:45 +0000 (13:17 +0530)]
CRM-18472: notice fixes
jitendrapurohit [Fri, 16 Dec 2016 11:01:24 +0000 (16:31 +0530)]
CRM-19777: Edit contribution : wrong decimal separator on total_amount
colemanw [Fri, 16 Dec 2016 23:08:06 +0000 (18:08 -0500)]
Merge pull request #9553 from colemanw/CRM-19723
CRM-19723 - Activity icon improvements
Coleman Watts [Fri, 16 Dec 2016 20:32:55 +0000 (15:32 -0500)]
CRM-19723 - Display activity type icons in datatables
Coleman Watts [Fri, 16 Dec 2016 20:32:21 +0000 (15:32 -0500)]
CRM-19723 - Fix activity links
JKingsnorth [Fri, 16 Dec 2016 10:18:10 +0000 (10:18 +0000)]
CRM-19413 Fix undefined index test_group when testing mailing
Yashodha Chaku [Fri, 16 Dec 2016 08:29:03 +0000 (13:59 +0530)]
Merge pull request #9546 from PalanteJon/CRM-19782
CRM-19782 - Don't show 'View' link on printed Participant Listing reports
colemanw [Thu, 15 Dec 2016 23:34:17 +0000 (18:34 -0500)]
Merge pull request #9548 from colemanw/Upgrade
Upgrade cleanup - use addColumn utility instead of sql
Coleman Watts [Thu, 15 Dec 2016 22:57:49 +0000 (17:57 -0500)]
Upgrade cleanup - use addColumn utility instead of sql
colemanw [Thu, 15 Dec 2016 22:37:29 +0000 (17:37 -0500)]
Merge pull request #9528 from colemanw/CRM-19723
CRM-19723 - Add icons for activity types
Coleman Watts [Thu, 15 Dec 2016 21:13:26 +0000 (16:13 -0500)]
Fix upgrade error with unknown column in option_value table
colemanw [Thu, 15 Dec 2016 21:16:23 +0000 (16:16 -0500)]
Merge pull request #9539 from colemanw/api
API Explorer: Minor usability improvements
colemanw [Thu, 15 Dec 2016 20:10:11 +0000 (15:10 -0500)]
Merge pull request #9541 from xurizaemon/CRM-19768-comment_only
Document inconsistent function signature.
Jon goldberg [Thu, 15 Dec 2016 19:21:10 +0000 (14:21 -0500)]
CRM-19782 - Don't show 'View' link on printed Participant Listing reports
Coleman Watts [Fri, 9 Dec 2016 20:40:31 +0000 (15:40 -0500)]
CRM-19723 - Allow rotation of icons
Coleman Watts [Fri, 9 Dec 2016 06:14:57 +0000 (01:14 -0500)]
CRM-19723 - Display activity type icons in ui
Coleman Watts [Fri, 9 Dec 2016 04:35:29 +0000 (23:35 -0500)]
CRM-19723 - Add field for option_value icon
Tim Otten [Thu, 15 Dec 2016 16:31:34 +0000 (08:31 -0800)]
Set version to 4.7.16
Coleman Watts [Fri, 9 Dec 2016 04:33:59 +0000 (23:33 -0500)]
CRM-19723 - Update fontAwesome version
Coleman Watts [Wed, 7 Dec 2016 16:06:36 +0000 (11:06 -0500)]
CRM-19723 - Add crmIconPicker widget
Monish Deb [Thu, 15 Dec 2016 10:31:22 +0000 (16:01 +0530)]
Merge pull request #9543 from xurizaemon/dev-fieldname_should_possibly
Improve error message for "possibly mandatory" exception.
Monish Deb [Thu, 15 Dec 2016 10:26:21 +0000 (15:56 +0530)]
Merge pull request #9534 from monishdeb/CRM-19333
CRM-19333: Fix group_type filter in Advance Search and api
Yashodha Chaku [Thu, 15 Dec 2016 09:06:15 +0000 (14:36 +0530)]
Merge pull request #9538 from jitendrapurohit/CRM-19736
CRM-19736: PHP 7 Fatal Error on printing labels for members
Yashodha Chaku [Thu, 15 Dec 2016 05:55:57 +0000 (11:25 +0530)]
Merge pull request #9537 from jitendrapurohit/CRM-19048-add
CRM-19048: Fix attached operator search
Chris Burgess [Thu, 15 Dec 2016 03:29:22 +0000 (16:29 +1300)]
Improve error message for "possibly mandatory" exception.
CRM-19772
colemanw [Thu, 15 Dec 2016 02:47:19 +0000 (21:47 -0500)]
Merge pull request #9540 from colemanw/CRM-19764
CRM-19764 - Pass context when fetching custom field options
Chris Burgess [Thu, 15 Dec 2016 00:11:41 +0000 (13:11 +1300)]
Document inconsistent function signature.
Coleman Watts [Wed, 14 Dec 2016 21:05:09 +0000 (16:05 -0500)]
API Explorer: Make return value sortable
Coleman Watts [Wed, 14 Dec 2016 15:43:40 +0000 (10:43 -0500)]
CRM-19764 - Pass context when fetching custom field options
Coleman Watts [Wed, 14 Dec 2016 14:27:41 +0000 (09:27 -0500)]
API Explorer: Remove redundant clear button for selected options
Coleman Watts [Wed, 14 Dec 2016 02:39:06 +0000 (21:39 -0500)]
API Explorer: Add more options
jitendrapurohit [Wed, 14 Dec 2016 08:50:55 +0000 (14:20 +0530)]
CRM-19048: Fix attached operator search
Yashodha Chaku [Wed, 14 Dec 2016 11:26:21 +0000 (16:56 +0530)]
Merge pull request #9517 from jitendrapurohit/CRM-19626-2
CRM-19626: Add min-amount handling to priceset
jitendrapurohit [Wed, 14 Dec 2016 11:05:30 +0000 (16:35 +0530)]
CRM-19736: PHP 7 printing labels for members
Monish Deb [Wed, 14 Dec 2016 10:49:55 +0000 (16:19 +0530)]
Merge pull request #9428 from jitendrapurohit/CRM-19662
CRM-19662 - Fix remaining full group by clause
Monish Deb [Wed, 14 Dec 2016 10:42:37 +0000 (16:12 +0530)]
Merge pull request #9480 from jitendrapurohit/CRM-17410
CRM-17410: Using xml on upgrade (not installation) of extension to cr…
Monish Deb [Wed, 14 Dec 2016 09:52:46 +0000 (15:22 +0530)]
Merge pull request #9523 from jitendrapurohit/CRM-19717
CRM-19717: remove inline edit of class from reserved participant status
jitendrapurohit [Thu, 1 Dec 2016 13:19:45 +0000 (18:49 +0530)]
CRM-17410: Using xml on upgrade (not installation) of extension to create/append new optionvalues
jitendrapurohit [Thu, 8 Dec 2016 11:42:11 +0000 (17:12 +0530)]
CRM-19626: Add min-amount handling to priceset
Monish Deb [Wed, 14 Dec 2016 06:44:17 +0000 (12:14 +0530)]
Merge pull request #9516 from jitendrapurohit/CRM-19722
CRM-19722: Fatal Error: Unknown column 'contribution_source' in 'orde…
deb.monish [Wed, 14 Dec 2016 05:57:04 +0000 (11:27 +0530)]
add sort order
Yashodha Chaku [Wed, 14 Dec 2016 05:12:10 +0000 (10:42 +0530)]
Merge pull request #9531 from civicrm/CRM-19755=1
CRM-19755 reverse order of html and text
Tim Otten [Wed, 14 Dec 2016 00:11:33 +0000 (16:11 -0800)]
tools/scripts/phpunit-ls - Fix PhpStorm lookup of PHPUnit_Framework_TestCase
When using PhpStorm, code completion doesn't work smoothly on classes which
extend `PHPUnit_Framework_TestCase` because there are two copies: the real
copy and then a placeholder class used by `tools/scripts/phpunit-ls`.
Wrapping the placeholder copy in `eval()` prevents PhpStorm from
identifying.
Joe Murray [Tue, 13 Dec 2016 17:48:54 +0000 (12:48 -0500)]
Change order of body html and text on form
deb.monish [Tue, 13 Dec 2016 16:23:34 +0000 (21:53 +0530)]
Fix group_type filter in Advance Search and api
Joe Murray [Tue, 13 Dec 2016 16:29:18 +0000 (11:29 -0500)]
reversed L53 L52 as per @seamuslea request
Monish Deb [Tue, 13 Dec 2016 12:57:31 +0000 (18:27 +0530)]
Merge pull request #9475 from jitendrapurohit/CRM-19549
CRM-19549 : New pledge data entry page shows hard coded $ for installments
Yashodha Chaku [Tue, 13 Dec 2016 12:27:21 +0000 (17:57 +0530)]
Merge pull request #9532 from jitendrapurohit/CRM-19263
Additional fixes for CRM-19263
Monish Deb [Tue, 13 Dec 2016 10:42:49 +0000 (16:12 +0530)]
Merge pull request #9506 from monishdeb/CRM-19698
CRM-19698: fix and improve smart and regular group search
jitendrapurohit [Tue, 13 Dec 2016 10:38:47 +0000 (16:08 +0530)]
Additional fixes for CRM-19263
Coleman Watts [Mon, 12 Dec 2016 23:16:41 +0000 (18:16 -0500)]
API Explorer: Make param selection more convenient
Auto-open param select widget, and only show params that have not been previously chosen.
Joe Murray [Mon, 12 Dec 2016 20:37:44 +0000 (15:37 -0500)]
CRM-19755 reverse order of html and text
Make order same as rest of CiviMail
Eileen McNaughton [Mon, 12 Dec 2016 20:31:21 +0000 (09:31 +1300)]
Merge pull request #9530 from seamuslee001/CRM-19490-regression-fix
Fix regression in CRM-19490 where input field wasn't being properly set
Monish Deb [Mon, 12 Dec 2016 11:09:31 +0000 (16:39 +0530)]
Merge pull request #9525 from seamuslee001/api_order_by_test
CRM-19743 Ensure that checking for id in sort column works in arrays …
Monish Deb [Mon, 12 Dec 2016 10:19:39 +0000 (15:49 +0530)]
Merge pull request #9518 from monishdeb/CRM-19294
CRM-19294: Unable to continue on required file field
jitendrapurohit [Mon, 12 Dec 2016 08:39:30 +0000 (14:09 +0530)]
append empty string for currency without symbol
Monish Deb [Mon, 12 Dec 2016 05:18:59 +0000 (10:48 +0530)]
Merge pull request #9479 from jitendrapurohit/CRM-19226
CRM-19226: Fix loginUrl token in drupal
Seamus Lee [Mon, 12 Dec 2016 05:16:28 +0000 (16:16 +1100)]
Expand test coverage to include specified ordering
Seamus Lee [Mon, 12 Dec 2016 04:22:52 +0000 (15:22 +1100)]
Fix regression in CRM-19490 where input field wasn't being properly set
Eileen McNaughton [Mon, 12 Dec 2016 04:02:50 +0000 (17:02 +1300)]
Merge pull request #9529 from xurizaemon/docfix-CRM19490
Correct labelling of new Short Date format
Chris Burgess [Mon, 12 Dec 2016 02:43:48 +0000 (15:43 +1300)]
Correct labelling of new Short Date format. Refs CRM-19490.
Seamus Lee [Fri, 9 Dec 2016 21:35:26 +0000 (08:35 +1100)]
CRM-19743 Ensure that checking for id in sort column works in arrays as well as strings
jitendrapurohit [Fri, 9 Dec 2016 12:33:30 +0000 (18:03 +0530)]
CRM-19717: remove inline edit of class from reserved participant status
deb.monish [Fri, 9 Dec 2016 06:08:02 +0000 (11:38 +0530)]
revert operator changes and shift getChildGroupIds() definition
Monish Deb [Fri, 9 Dec 2016 06:39:26 +0000 (12:09 +0530)]
Merge pull request #9492 from monishdeb/CRM-19325
CRM-19325 : Search contributions that are not in any batch
deb.monish [Wed, 7 Dec 2016 16:26:04 +0000 (21:56 +0530)]
additional improvement and unit test
deb.monish [Wed, 7 Dec 2016 10:11:30 +0000 (15:41 +0530)]
CRM-19698: fix and improve smart and regular group search
deb.monish [Thu, 8 Dec 2016 05:20:22 +0000 (10:50 +0530)]
additonal unit test changes to assert batch contributions
deb.monish [Wed, 7 Dec 2016 08:46:29 +0000 (14:16 +0530)]
Add unit test
deb.monish [Fri, 2 Dec 2016 09:36:58 +0000 (15:06 +0530)]
optimization
Johan Vervloet [Thu, 8 Sep 2016 10:27:47 +0000 (12:27 +0200)]
Style error.