Erich Schulz [Tue, 3 Jan 2017 02:34:54 +0000 (02:34 +0000)]
highlight issue with changing error config deep in script
Erich Schulz [Tue, 3 Jan 2017 02:34:15 +0000 (02:34 +0000)]
throw instead of exit on error
Monish Deb [Mon, 2 Jan 2017 10:23:31 +0000 (15:53 +0530)]
Merge pull request #9575 from jitendrapurohit/CRM-19761
CRM-19761: Add unit test and some fixes
Yashodha Chaku [Mon, 2 Jan 2017 10:00:14 +0000 (15:30 +0530)]
Merge pull request #9606 from yashodha/CRM-19783
CRM-19783 - Accessibility Error - CiviCRM Subscription Page
Yashodha Chaku [Mon, 2 Jan 2017 09:51:22 +0000 (15:21 +0530)]
Merge pull request #9591 from AppChecker/master
CRM-19805: comparing instead of assigning
Monish Deb [Mon, 2 Jan 2017 07:26:32 +0000 (12:56 +0530)]
Merge pull request #9576 from JMAConsulting/CRM-19585-2
[ready-for-core-team-review]CRM-19585, added function to calculate net amount if contribution has…
Monish Deb [Mon, 2 Jan 2017 07:26:09 +0000 (12:56 +0530)]
Merge pull request #9608 from jitendrapurohit/memtestfix
Fix startdate for testMembershipJoinDateFixed
jitendrapurohit [Mon, 2 Jan 2017 06:20:06 +0000 (11:50 +0530)]
Fix startdate for testMembershipJoinDateFixed
colemanw [Mon, 2 Jan 2017 06:19:17 +0000 (01:19 -0500)]
Merge pull request #9603 from colemanw/loc_event_id
Add select2 class to loc_event_id
yashodha [Mon, 2 Jan 2017 04:11:11 +0000 (09:41 +0530)]
Accessibility Error - CiviCRM Subscription Page
Coleman Watts [Sun, 1 Jan 2017 01:10:09 +0000 (20:10 -0500)]
Add select2 class to loc_event_id
colemanw [Fri, 30 Dec 2016 22:20:00 +0000 (17:20 -0500)]
Merge pull request #9599 from colemanw/CRM-19812
CRM-19812 - Display related contact names in activity.get api
Coleman Watts [Fri, 30 Dec 2016 20:35:10 +0000 (15:35 -0500)]
CRM-19812 - Display related contact names in activity.get api
Monish Deb [Fri, 30 Dec 2016 10:17:17 +0000 (15:47 +0530)]
Merge pull request #9536 from twomice/CRM-19447_activity_details_search
CRM-19447 activity details search
deb.monish [Fri, 30 Dec 2016 09:26:53 +0000 (14:56 +0530)]
additional changes
Allen Shaw [Wed, 28 Dec 2016 22:58:16 +0000 (16:58 -0600)]
CRM-19447: Retain legacy code to avoid regressions; add tests.
Monish Deb [Fri, 30 Dec 2016 07:37:18 +0000 (13:07 +0530)]
Merge pull request #9584 from JMAConsulting/CRM-19804
[ready-for-core-team-review]CRM-19804, added pre and post hook invokation for FinancialAccount
Tim Otten [Thu, 29 Dec 2016 23:35:20 +0000 (15:35 -0800)]
Merge pull request #9573 from totten/master-inheritdoc
(NFC) CRM_*_Tokens - Reduce redundant docs
colemanw [Thu, 29 Dec 2016 18:05:19 +0000 (13:05 -0500)]
Merge pull request #9593 from colemanw/CRM-19810
CRM-19810 - Add api joins on optionValue table
Coleman Watts [Thu, 29 Dec 2016 17:22:36 +0000 (12:22 -0500)]
CRM-19810 - Add api joins on optionValue table
Pradeep Nayak [Thu, 29 Dec 2016 11:28:05 +0000 (16:58 +0530)]
CRM-19585, fixed rebase error
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Mon, 26 Dec 2016 10:56:13 +0000 (16:26 +0530)]
CRM-19585, fixed notice error
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Fri, 23 Dec 2016 14:10:38 +0000 (19:40 +0530)]
CRM-19585, added function to calculate net amount if contribution has tax amount
added test for the same
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
CRM-19585, removed space
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Monish Deb [Thu, 29 Dec 2016 10:51:38 +0000 (16:21 +0530)]
Merge pull request #9580 from JMAConsulting/CRM-19799
[ready-for-core-team-review]CRM-19799, fixed contribution params to include line items
Monish Deb [Thu, 29 Dec 2016 09:49:30 +0000 (15:19 +0530)]
Merge pull request #9590 from JMAConsulting/CRM-19585-6
[ready-for-core-team-review]CRM-19585, fixed tax issues
Allen Shaw [Wed, 14 Dec 2016 03:16:15 +0000 (21:16 -0600)]
CRM-19447: Added doc-blocks to unit test methods.
Allen Shaw [Wed, 14 Dec 2016 03:14:46 +0000 (21:14 -0600)]
CRM-19447: Add unit tests for api v3 activity.get by subject and by details.
Allen Shaw [Wed, 14 Dec 2016 02:50:20 +0000 (20:50 -0600)]
Fix CRM-19447: "Improve Activity Subject/Details text search to be similiar to Notes Subject/Body"
Allen Shaw [Wed, 14 Dec 2016 01:46:39 +0000 (19:46 -0600)]
Towards CRM-19447 (activity search by subject/details): basic functionality
appchecker [Thu, 29 Dec 2016 08:11:07 +0000 (11:11 +0300)]
CRM-19805: comparing instead of assigning
appchecker [Thu, 29 Dec 2016 08:10:43 +0000 (11:10 +0300)]
CRM-19805: comparing instead of assigning
appchecker [Thu, 29 Dec 2016 08:10:04 +0000 (11:10 +0300)]
CRM-19805: comparing instead of assigning
colemanw [Thu, 29 Dec 2016 00:47:46 +0000 (19:47 -0500)]
Merge pull request #9554 from colemanw/CRM-19769
CRM-19769 CRM-19779 - Colors for tags and activty statuses
Pradeep Nayak [Wed, 28 Dec 2016 23:20:40 +0000 (04:50 +0530)]
CRM-19585, added test
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Wed, 28 Dec 2016 23:20:16 +0000 (04:50 +0530)]
CRM-19585, added test
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Mon, 31 Oct 2016 12:08:09 +0000 (17:38 +0530)]
CRM-19585, fixed code for storing civicrm_contribution.tax_amount correctly
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Tue, 1 Nov 2016 15:33:45 +0000 (21:03 +0530)]
CRM-19585, fixed calculation for default contribution amount price set
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
colemanw [Wed, 28 Dec 2016 21:45:24 +0000 (16:45 -0500)]
Merge pull request #9581 from colemanw/CRM-19802
CRM-19802 - Fix translated strings in tpl
Pradeep Nayak [Wed, 28 Dec 2016 21:11:16 +0000 (02:41 +0530)]
CRM-19799, set line item in form layer
----------------------------------------
* CRM-19799: LineItems incorrect at both Contribution Level and Financial Accounts Level
https://issues.civicrm.org/jira/browse/CRM-19799
Pradeep Nayak [Mon, 26 Dec 2016 23:37:48 +0000 (05:07 +0530)]
CRM-19799, added test
----------------------------------------
* CRM-19799: LineItems incorrect at both Contribution Level and Financial Accounts Level
https://issues.civicrm.org/jira/browse/CRM-19799
Pradeep Nayak [Mon, 26 Dec 2016 22:37:26 +0000 (04:07 +0530)]
CRM-19799, fixed contribution params to include line items
----------------------------------------
* CRM-19799: LineItems incorrect at both Contribution Level and Financial Accounts Level
https://issues.civicrm.org/jira/browse/CRM-19799
Pradeep Nayak [Wed, 28 Dec 2016 13:38:24 +0000 (19:08 +0530)]
CRM-19804, added pre and post hook invokation for FinancialAccount
----------------------------------------
* CRM-19804: Pre() and Post() hook for Financial Account
https://issues.civicrm.org/jira/browse/CRM-19804
Monish Deb [Wed, 28 Dec 2016 12:17:08 +0000 (17:47 +0530)]
Merge pull request #8906 from dejan9393/CRM-19244
CRM-19244 Custom fields with option group not importing
Monish Deb [Wed, 28 Dec 2016 09:10:56 +0000 (14:40 +0530)]
Merge pull request #9574 from JMAConsulting/CRM-19585-1
[ready-for-core-team-review]CRM-19585, created function to calculate financial item amount when co…
Eileen McNaughton [Tue, 27 Dec 2016 20:33:19 +0000 (09:33 +1300)]
Merge pull request #9565 from totten/master-19690-selector
CRM-19690 - crmMailingBlockRecipients - Provide selector for more downstream styling
Coleman Watts [Tue, 27 Dec 2016 15:35:29 +0000 (10:35 -0500)]
CRM-19802 - Fix translated strings in tpl
Monish Deb [Tue, 27 Dec 2016 11:20:50 +0000 (16:50 +0530)]
Merge pull request #9545 from JMAConsulting/CRM-19288
[ready-for-core-team-review]CRM-19288, fixed civicrm_contribution.tax_amount value for multiple p…
Monish Deb [Tue, 27 Dec 2016 10:03:42 +0000 (15:33 +0530)]
Merge pull request #8870 from JMAConsulting/CRM-16189-10
[ready-for-core-team-review]CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab
Coleman Watts [Sat, 24 Dec 2016 05:14:31 +0000 (00:14 -0500)]
Manage tags screen UI improvements
Jitendra Purohit [Sat, 24 Dec 2016 07:37:04 +0000 (13:07 +0530)]
warning fix
Coleman Watts [Thu, 15 Dec 2016 23:47:56 +0000 (18:47 -0500)]
CRM-19769 - Display tags in color
Conflicts:
CRM/Core/DAO/AllCoreTables.data.php
CRM/Tag/Form/Edit.php
css/contactSummary.css
Coleman Watts [Fri, 23 Dec 2016 21:58:56 +0000 (16:58 -0500)]
CRM-19769 - Add colors to entityRef output
Coleman Watts [Tue, 20 Dec 2016 04:13:14 +0000 (23:13 -0500)]
CRM-19769 - Add select2 widget to display tags in color
Coleman Watts [Mon, 19 Dec 2016 18:07:55 +0000 (13:07 -0500)]
Tag form cleanup
Coleman Watts [Fri, 16 Dec 2016 15:47:54 +0000 (10:47 -0500)]
CRM-19779 - Display activity statuses in color
Coleman Watts [Thu, 15 Dec 2016 23:38:54 +0000 (18:38 -0500)]
CRM-19769 - Add color column to civicrm_tag
Coleman Watts [Thu, 15 Dec 2016 04:44:26 +0000 (23:44 -0500)]
CRM-19769 - Add color field to tag edit form
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.
Pradeep Nayak [Thu, 22 Dec 2016 13:47:15 +0000 (19:17 +0530)]
CRM-19288, added test to check tax amount for multiple participant
----------------------------------------
* CRM-19288: VAT not included for additional participant fee when registering for events
https://issues.civicrm.org/jira/browse/CRM-19288
CRM-19288, removed white space
----------------------------------------
* CRM-19288: VAT not included for additional participant fee when registering for events
https://issues.civicrm.org/jira/browse/CRM-19288
Pradeep Nayak [Thu, 15 Dec 2016 15:54:58 +0000 (21:24 +0530)]
CRM-19288, fixed civicrm_contribution.tax_amount value for multiple participant registration
----------------------------------------
* CRM-19288: VAT not included for additional participant fee when registering for events
https://issues.civicrm.org/jira/browse/CRM-19288
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
jitendrapurohit [Fri, 23 Dec 2016 12:57:31 +0000 (18:27 +0530)]
CRM-19761: Add unit test and some fixes
Pradeep Nayak [Thu, 22 Dec 2016 15:24:04 +0000 (20:54 +0530)]
CRM-19585, created unction to calculate financial item amount when contribution is updated
Added test
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
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:52:52 +0000 (15:52 -0600)]
(NFC) CRM_*_Tokens - Reduce redundant docs
This is an offshoot from the conversation on #9563.
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 [Tue, 13 Dec 2016 22:57:52 +0000 (14:57 -0800)]
CRM-19690 - crmMailingBlockRecipients - Provide selector for more downstream styling
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
Edsel [Mon, 19 Dec 2016 09:29:14 +0000 (14:59 +0530)]
CRM-16189 Fixed participant payment bug
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Mon, 26 Sep 2016 12:45:56 +0000 (18:15 +0530)]
CRM-16189, fixed buutton link for record payment
----------------------------------------
* CRM-16189:
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Thu, 22 Sep 2016 13:25:38 +0000 (18:55 +0530)]
CRM-16189, fixed jenkins test
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Thu, 22 Sep 2016 13:25:14 +0000 (18:55 +0530)]
CRM-16189, fixed white spaces
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Tue, 20 Sep 2016 11:52:23 +0000 (17:22 +0530)]
CRM-16189, used api
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Tue, 20 Sep 2016 11:52:03 +0000 (17:22 +0530)]
CRM-16189, fixed url link
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Tue, 20 Sep 2016 10:59:20 +0000 (16:29 +0530)]
CRM-16189, fixed style and removed white space
----------------------------------------
* CRM-16189:
https://issues.civicrm.org/jira/browse/CRM-16189
Conflicts:
CRM/Contribute/Form/AdditionalPayment.php
Pradeep Nayak [Tue, 20 Sep 2016 10:49:05 +0000 (16:19 +0530)]
CRM-16189, added link on contribution edit form to record payment for pending pay later and partially paid contribution
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Conflicts:
CRM/Contribute/Form/AdditionalPayment.php
projects / civicrm-core.git / log