civicrm-core.git
7 years agoCRM-20420 - Add docblocks
Tim Otten [Thu, 13 Apr 2017 02:06:07 +0000 (19:06 -0700)]
CRM-20420 - Add docblocks

7 years agoCRM-20420 - Display `recordGeneratedLetters` setting in GUI
Tim Otten [Wed, 12 Apr 2017 21:25:11 +0000 (14:25 -0700)]
CRM-20420 - Display `recordGeneratedLetters` setting in GUI

7 years agoCRM-20420 - Generate combined or separated activities, per recordGeneratedLetters
Tim Otten [Wed, 12 Apr 2017 07:11:42 +0000 (00:11 -0700)]
CRM-20420 - Generate combined or separated activities, per recordGeneratedLetters

When a user uses "Print/Merge Document" to generate a PDF or Word doc,
they may designate multiple contacts to include in the PDF/Doc. By
setting `recordGeneratedLetters`, they can specify whether to:

 * Create one activity for each contact. (This is the traditional behavior,
   but when you retain the fully-generated PDF documents, it wouldn't
   be a good idea to copy the PDF to all those activities.)
 * Create a single activity associated with all the contacts.

7 years agoCRM-20420 - Define setting "recordGeneratedLetters"
Tim Otten [Wed, 12 Apr 2017 05:39:50 +0000 (22:39 -0700)]
CRM-20420 - Define setting "recordGeneratedLetters"

7 years agoCRM-20420 - PDFLetterCommon::createActivities() - Simplify. Address comment.
Tim Otten [Wed, 12 Apr 2017 05:42:22 +0000 (22:42 -0700)]
CRM-20420 - PDFLetterCommon::createActivities() - Simplify. Address comment.

The comment asks why the code appears to use of `$contactIds` and
`$form->contactIds` interchangeably.  If you grep for calls to
`createActivities()`, all 3-ish callpaths do set `$contactIds` based on
`$form->contactIds` -- so they are the same.

```
// Look for calls to createActivities()
$ grep -r ::createActivities CRM/ Civi/ api/
CRM/Contact/Form/Task/PDFLetterCommon.php:      self::createActivities($form, $html_message, $form->_contactIds);
CRM/Member/Form/Task/PDFLetterCommon.php:    self::createActivities($form, $html_message, $contactIDs);
CRM/Contribute/Form/Task/PDFLetterCommon.php:    self::createActivities($form, $html_message, $form->_contactIds);

// Look for calls to createActivities via CRM/Member/Form/Task/PDFLetterCommon

$ rgrep -r postProcessMembers\( CRM/ Civi/ api/
CRM/Member/Form/Task/PDFLetter.php:    CRM_Member_Form_Task_PDFLetterCommon::postProcessMembers(
CRM/Member/Form/Task/PDFLetterCommon.php:  public static function postProcessMembers(&$form, $membershipIDs, $skipOnHold, $skipDeceased, $contactIDs) {
```

7 years agoMerge pull request #10129 from JMAConsulting/CRM-20392
Eileen McNaughton [Wed, 12 Apr 2017 00:13:09 +0000 (12:13 +1200)]
Merge pull request #10129 from JMAConsulting/CRM-20392

CRM-20392, Code cleanup

7 years agoMerge pull request #10135 from seamuslee001/CRM-20410
Eileen McNaughton [Tue, 11 Apr 2017 23:27:03 +0000 (11:27 +1200)]
Merge pull request #10135 from seamuslee001/CRM-20410

CRM-20410 Reformat CRM_SMS_BAO_Provider to use standard create function style rather than the split

7 years agoMerge pull request #10145 from eileenmcnaughton/test-fail
Eileen McNaughton [Tue, 11 Apr 2017 22:36:35 +0000 (10:36 +1200)]
Merge pull request #10145 from eileenmcnaughton/test-fail

Fix test regression by correctly setting timestamp in test method

7 years agoFix test regression by correctly setting timestamp in test method
eileen [Tue, 11 Apr 2017 22:31:01 +0000 (10:31 +1200)]
Fix test regression by correctly setting timestamp in test method

7 years agoTry replacing static with DAO
Seamus Lee [Tue, 11 Apr 2017 21:36:00 +0000 (07:36 +1000)]
Try replacing static with DAO

7 years agoMerge pull request #10139 from JMAConsulting/CRM-20391
Eileen McNaughton [Tue, 11 Apr 2017 20:41:58 +0000 (08:41 +1200)]
Merge pull request #10139 from JMAConsulting/CRM-20391

CRM-20391 Added pan trucation to search

7 years agoMerge pull request #10115 from jmcclelland/CRM-20388
Eileen McNaughton [Tue, 11 Apr 2017 20:33:06 +0000 (08:33 +1200)]
Merge pull request #10115 from jmcclelland/CRM-20388

CRM-20388 - ensure connection errors are properly reported to user.

7 years agoMerge pull request #9848 from JMAConsulting/CRM-8526
Eileen McNaughton [Tue, 11 Apr 2017 20:10:16 +0000 (08:10 +1200)]
Merge pull request #9848 from JMAConsulting/CRM-8526

CRM-8526 [ready for core team review] Added support for contribution tokens in emails sent via search results (Find contribution results and Advanced search when results are listed as contributions)

7 years agoMerge pull request #10142 from JMAConsulting/IIDA-58
colemanw [Tue, 11 Apr 2017 15:31:16 +0000 (11:31 -0400)]
Merge pull request #10142 from JMAConsulting/IIDA-58

CRM-20022 Minor fix to change group by label

7 years agoCRM-8526 Added contribution tokens to list
Edsel [Thu, 16 Feb 2017 10:20:41 +0000 (15:50 +0530)]
CRM-8526 Added contribution tokens to list

----------------------------------------
* CRM-8526: Support [contribution.custom_nn] tokens in templates
  https://issues.civicrm.org/jira/browse/CRM-8526

CRM-8526 Added support for contribution tokens in find contributions search results

7 years agoCRM-20022 Minor fix to change group by label
Edsel [Tue, 11 Apr 2017 12:58:35 +0000 (18:28 +0530)]
CRM-20022 Minor fix to change group by label

----------------------------------------
* CRM-20022: Add Batch Title to Columns, Grouping tabs on Contribution Summary report
  https://issues.civicrm.org/jira/browse/CRM-20022

7 years agoCRM-20392, Code cleanup
Pradeep Nayak [Fri, 7 Apr 2017 20:16:47 +0000 (01:46 +0530)]
CRM-20392, Code cleanup

----------------------------------------
* CRM-20392: Credit card payment not recorded when contribution is partially paid
  https://issues.civicrm.org/jira/browse/CRM-20392

7 years agoCRM-20391 Added card number to search
Edsel [Tue, 11 Apr 2017 08:47:42 +0000 (14:17 +0530)]
CRM-20391 Added card number to search

----------------------------------------
* CRM-20391: Add card number field on search form
  https://issues.civicrm.org/jira/browse/CRM-20391

7 years agoMerge pull request #10138 from totten/master-hook-fix
Eileen McNaughton [Tue, 11 Apr 2017 10:37:35 +0000 (22:37 +1200)]
Merge pull request #10138 from totten/master-hook-fix

CRM-19813 - Only dispatch through EventDispatcher after booting

7 years agoReformat hard code list as per suggestion from Tim
Seamus Lee [Tue, 11 Apr 2017 09:06:47 +0000 (19:06 +1000)]
Reformat hard code list as per suggestion from Tim

7 years agoMerge pull request #10137 from eileenmcnaughton/iida2
Monish Deb [Tue, 11 Apr 2017 09:03:04 +0000 (14:33 +0530)]
Merge pull request #10137 from eileenmcnaughton/iida2

Towards CRM-20392 fix receive_date to use date_picker

7 years agoSwitch to API calls and hard code execption list
Seamus Lee [Tue, 11 Apr 2017 05:09:06 +0000 (15:09 +1000)]
Switch to API calls and hard code execption list

7 years agoMinor code cleanup
Seamus Lee [Tue, 11 Apr 2017 01:32:11 +0000 (11:32 +1000)]
Minor code cleanup

Minor fix

7 years agoCRM-20410 Reformat CRM_SMS_BAO_Provider to use standard create function style rather...
Seamus Lee [Tue, 11 Apr 2017 00:43:44 +0000 (10:43 +1000)]
CRM-20410 Reformat CRM_SMS_BAO_Provider to use standard create function style rather than the split

Fix posthook

7 years agoMerge pull request #10136 from eileenmcnaughton/iida
Eileen McNaughton [Tue, 11 Apr 2017 08:53:00 +0000 (20:53 +1200)]
Merge pull request #10136 from eileenmcnaughton/iida

Towards CRM-20392 (IIDA-108), code cleanup, removed cruft code

7 years agoCRM-19813 - Only dispatch through EventDispatcher after booting
Tim Otten [Tue, 11 Apr 2017 08:00:32 +0000 (01:00 -0700)]
CRM-19813 - Only dispatch through EventDispatcher after booting

After merging #9949, some screens (like the contact-result list or "View
Contact") reported warnings like:

```
Notice: Undefined index: in CRM_Core_BAO_Country::countryLimit() (line 90 of /home/foo/buildkit/build/dmaster/sites/all/modules/civicrm/CRM/Core/BAO/Country.php).
Notice: Undefined index: in CRM_Core_BAO_Country::provinceLimit() (line 62 of /home/foo/buildkit/build/dmaster/sites/all/modules/civicrm/CRM/Core/BAO/Country.php).
```

Bisecting the git history revealed that it stemmed from switching
`hook_civicrm_entityTypes` to go through EventDispatcher.

https://github.com/civicrm/civicrm-core/pull/9949/commits/fb1d9ad2f5116245ba3488a26f8e0b065f328006#diff-8869a8f3c6318eb0580ce2aa04b713bfL1835

This hook is apparently similar to `hook_civicrm_container` in that both
fires pre-boot.  If we attempt to dispatch it through the container in a
pre-boot environment, something initializes incorrectly.

This change proposes a general rule:
 * If you fire a hook before the container or EventDispatcher is available...
 * Then don't try to use the container or EventDispatcher.

7 years agoTowards CRM-20392 (IIDA-108), code cleanup, removed cruft code
Pradeep Nayak [Mon, 3 Apr 2017 22:16:45 +0000 (10:16 +1200)]
Towards CRM-20392 (IIDA-108), code cleanup, removed cruft code

7 years agoTowards CRM-20392 fix receive_date to use date_picker
eileen [Tue, 11 Apr 2017 06:24:15 +0000 (18:24 +1200)]
Towards CRM-20392 fix receive_date to use date_picker

This might not have been necessary in the end - https://github.com/civicrm/civicrm-packages/pull/178
seems like the fix for the breakage, but we should be making this change on
every form we touch in order to get rid of code complexity.

7 years agoMerge pull request #9949 from totten/master-hook-ev2
Eileen McNaughton [Tue, 11 Apr 2017 02:06:25 +0000 (14:06 +1200)]
Merge pull request #9949 from totten/master-hook-ev2

CRM-19813 - Unify Symfony Events and hooks

7 years agoMerge pull request #9796 from seamuslee001/CRM-19961
Eileen McNaughton [Tue, 11 Apr 2017 00:45:47 +0000 (12:45 +1200)]
Merge pull request #9796 from seamuslee001/CRM-19961

CRM-19961 Make civicrm_sms_provider able to be domain specific

7 years agoMerge pull request #10132 from seamuslee001/CRM-20402
Eileen McNaughton [Mon, 10 Apr 2017 23:58:24 +0000 (11:58 +1200)]
Merge pull request #10132 from seamuslee001/CRM-20402

CRM-20402 Improve handling of spam bounces that get classified as syntax bounces

7 years agoCRM-19961 Add in tests to prove logic and fix logic
Seamus Lee [Mon, 10 Apr 2017 22:08:17 +0000 (08:08 +1000)]
CRM-19961 Add in tests to prove logic and fix logic

remove changes to update function

Fix style

7 years agoAdd in Upgrade script for CRM-20402
Seamus Lee [Sun, 9 Apr 2017 06:47:21 +0000 (16:47 +1000)]
Add in Upgrade script for CRM-20402

7 years agoimprove "spam" pattern match for bounces which otherwise get classified as syntax...
Greg Rundlett [Fri, 3 Feb 2017 13:56:33 +0000 (08:56 -0500)]
improve "spam" pattern match for bounces which otherwise get classified as syntax bounces

7 years agoAdd in Domain id handling into SMS provider BAO
Seamus Lee [Fri, 3 Feb 2017 05:37:13 +0000 (16:37 +1100)]
Add in Domain id handling into SMS provider BAO

Add in domain id filtering to delete function

CRM-19961 Treat NULL domain_id values as ok when retriving SMS providers

Ensure domain id only gets set if its not already set

Treat NULL domain_id as valid and also allow for any domain to delete providers that have domain_id which is NULL

Add in API default for domain_id for sms provider

Use value from database if provided even if null otherwise fall back to current domain as default but use the value submitted first

Fix null test on update

7 years agoMerge pull request #10080 from agileware/CRM-20360
Eileen McNaughton [Mon, 10 Apr 2017 20:08:58 +0000 (08:08 +1200)]
Merge pull request #10080 from agileware/CRM-20360

CRM-20360: Remove superfluous showing of payment options header on pa…

7 years agoMerge pull request #10114 from JMAConsulting/CRM-20385
Eileen McNaughton [Mon, 10 Apr 2017 20:02:30 +0000 (08:02 +1200)]
Merge pull request #10114 from JMAConsulting/CRM-20385

CRM-20385 (IIDA-72), fixed deferred revenue account validation

7 years agoMerge pull request #10128 from JMAConsulting/CRM-20400
colemanw [Mon, 10 Apr 2017 14:49:12 +0000 (10:49 -0400)]
Merge pull request #10128 from JMAConsulting/CRM-20400

CRM-20400, fixed payment receipt

7 years agoMerge pull request #10131 from colemanw/CRM-20367
colemanw [Sat, 8 Apr 2017 19:38:46 +0000 (15:38 -0400)]
Merge pull request #10131 from colemanw/CRM-20367

CRM-20367 - Allow addIndex $column to be an array

7 years agoCRM-20367 - Allow addIndex $column to be an array
Coleman Watts [Sat, 8 Apr 2017 02:52:00 +0000 (22:52 -0400)]
CRM-20367 - Allow addIndex $column to be an array

7 years agoMerge pull request #10123 from colemanw/CRM-16633
colemanw [Fri, 7 Apr 2017 23:37:44 +0000 (19:37 -0400)]
Merge pull request #10123 from colemanw/CRM-16633

CRM-16633 - Allow user to change case subject

7 years agoCRM-20400, Updated completed Text, Added upgrade code
Pradeep Nayak [Fri, 7 Apr 2017 22:48:22 +0000 (04:18 +0530)]
CRM-20400, Updated completed Text, Added upgrade code

----------------------------------------
* CRM-20400: Update the Payment Receipt to use for Contribution pyament
  https://issues.civicrm.org/jira/browse/CRM-20400

7 years agoCRM-20400, fixed payment receipt
Pradeep Nayak [Fri, 7 Apr 2017 19:47:45 +0000 (01:17 +0530)]
CRM-20400, fixed payment receipt

----------------------------------------
* CRM-20400: Update the Payment Receipt to use for Contribution pyament
  https://issues.civicrm.org/jira/browse/CRM-20400

7 years agoCRM-20385 : IIDA-72 oversensitive deferred revenue account validation
Pradeep Nayak [Tue, 21 Feb 2017 13:19:53 +0000 (18:49 +0530)]
CRM-20385 : IIDA-72 oversensitive deferred revenue account validation

7 years agoMerge pull request #9773 from monishdeb/CRM-19663
Monish Deb [Fri, 7 Apr 2017 07:18:53 +0000 (12:48 +0530)]
Merge pull request #9773 from monishdeb/CRM-19663

CRM-19663: A scheduled reminder set to use an absolute date does not allow repeats

7 years agoCRM-16633 - Allow user to change case subject
Coleman Watts [Thu, 6 Apr 2017 18:14:06 +0000 (14:14 -0400)]
CRM-16633 - Allow user to change case subject

7 years agoCRM-16633 - Return data with crmEditable formSuccess event
Coleman Watts [Thu, 6 Apr 2017 18:12:55 +0000 (14:12 -0400)]
CRM-16633 - Return data with crmEditable formSuccess event

7 years agoFix script loading race condition
Coleman Watts [Thu, 6 Apr 2017 18:12:13 +0000 (14:12 -0400)]
Fix script loading race condition

7 years agoMerge pull request #10113 from JMAConsulting/IIDA-116
Monish Deb [Thu, 6 Apr 2017 12:23:33 +0000 (17:53 +0530)]
Merge pull request #10113 from JMAConsulting/IIDA-116

IIDA-116 Refactored Deferred Revenue report to follow more standardized approach.

7 years agoIIDA-116 Fixed batch labels
Edsel [Thu, 6 Apr 2017 10:30:03 +0000 (16:00 +0530)]
IIDA-116 Fixed batch labels

7 years agoIIDA-116 Added extra columns and made existing columns selectable
Edsel [Fri, 17 Mar 2017 11:55:26 +0000 (17:25 +0530)]
IIDA-116 Added extra columns and made existing columns selectable

Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php

Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php

IIDA-116 Indentation for better readability

IIDA-116 Refactored deferred revenue report

Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php

Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php

IIDA-119 Used API rather than query

Conflicts:
CRM/Financial/BAO/FinancialAccount.php

IIDA-116 Added Revenue Recognition date toggle filter

IIDA-116 Added hotlinks

IIDA-116 Fixed jenkins errors

7 years agoMerge pull request #10122 from seamuslee001/CRM-20308
Eileen McNaughton [Thu, 6 Apr 2017 10:25:21 +0000 (22:25 +1200)]
Merge pull request #10122 from seamuslee001/CRM-20308

CRM-20308 CRM-19657 Toward CRM-20308 & support CRM-19657 Extract using domain from and lo…

7 years agoToward CRM-20308 & support CRM-19657 Extract using domain from and logged in user...
Seamus Lee [Thu, 6 Apr 2017 08:56:23 +0000 (18:56 +1000)]
Toward CRM-20308 & support CRM-19657 Extract using domain from and logged in user from email details into separate function for re-use

7 years agoMerge pull request #10028 from jitendrapurohit/is_public_group_fix
Monish Deb [Thu, 6 Apr 2017 07:17:29 +0000 (12:47 +0530)]
Merge pull request #10028 from jitendrapurohit/is_public_group_fix

CRM-20318: Add is_public setting on Custom groups

7 years agoMerge pull request #10120 from seamuslee001/CRM-19741
Eileen McNaughton [Thu, 6 Apr 2017 06:07:08 +0000 (18:07 +1200)]
Merge pull request #10120 from seamuslee001/CRM-19741

CRM-19741 Add back in fix and add in unit tests to lock in fix

7 years agoFix additional issues
Jitendra Purohit [Thu, 6 Apr 2017 04:45:26 +0000 (10:15 +0530)]
Fix additional issues

7 years agoCRM-19741 Add back in fix and add in unit tests to lock in fix
Seamus Lee [Thu, 6 Apr 2017 00:58:29 +0000 (10:58 +1000)]
CRM-19741 Add back in fix and add in unit tests to lock in fix

7 years agoMerge pull request #10084 from jitendrapurohit/CRM-19243
Eileen McNaughton [Thu, 6 Apr 2017 01:13:40 +0000 (13:13 +1200)]
Merge pull request #10084 from jitendrapurohit/CRM-19243

CRM-19243: Free membership results in two email receipts

7 years agoMerge pull request #10116 from colemanw/CRM-20390
Eileen McNaughton [Thu, 6 Apr 2017 00:24:53 +0000 (12:24 +1200)]
Merge pull request #10116 from colemanw/CRM-20390

CRM-20390 - Fix select2 data type mismatch

7 years agoMerge pull request #10119 from eileenmcnaughton/deprecated
Eileen McNaughton [Thu, 6 Apr 2017 00:02:15 +0000 (12:02 +1200)]
Merge pull request #10119 from eileenmcnaughton/deprecated

Add deprecation comments, CRM-19987

7 years agoMerge pull request #10021 from jitendrapurohit/CRM-20246
Eileen McNaughton [Wed, 5 Apr 2017 23:44:45 +0000 (11:44 +1200)]
Merge pull request #10021 from jitendrapurohit/CRM-20246

CRM-20246: maxfilesize on import should respect 0 as meaning 'no limit'

7 years agoMerge pull request #10093 from jitendrapurohit/CRM-20343
Eileen McNaughton [Wed, 5 Apr 2017 23:39:39 +0000 (11:39 +1200)]
Merge pull request #10093 from jitendrapurohit/CRM-20343

CRM-20343: skip status calculation when form dates are not modified.

7 years agoMerge pull request #9276 from seamuslee001/CRM-19517
Eileen McNaughton [Wed, 5 Apr 2017 23:16:22 +0000 (11:16 +1200)]
Merge pull request #9276 from seamuslee001/CRM-19517

CRM-19517 allow price fields that use disabled financial types to sho…

7 years agoAdd deprecation comments, CRM-19987
eileen [Wed, 5 Apr 2017 23:05:48 +0000 (11:05 +1200)]
Add deprecation comments, CRM-19987

7 years agoMerge pull request #10095 from mattwire/membership_force_auto_renew
Eileen McNaughton [Wed, 5 Apr 2017 22:15:59 +0000 (10:15 +1200)]
Merge pull request #10095 from mattwire/membership_force_auto_renew

CRM-20375: Show message instead of checkbox when renew required. Hide checkbox w…

7 years agoMerge pull request #10118 from civicrm/4.7.18-rc
Tim Otten [Wed, 5 Apr 2017 21:59:49 +0000 (14:59 -0700)]
Merge pull request #10118 from civicrm/4.7.18-rc

4.7.18 rc

7 years agoMerge pull request #10096 from jmcclelland/CRM-20376
Eileen McNaughton [Wed, 5 Apr 2017 21:37:17 +0000 (09:37 +1200)]
Merge pull request #10096 from jmcclelland/CRM-20376

Crm 20376 - Fix field names on PDF/Print vesion of survey report

7 years agoMerge pull request #9916 from JMAConsulting/CRM-20207
Eileen McNaughton [Wed, 5 Apr 2017 21:36:13 +0000 (09:36 +1200)]
Merge pull request #9916 from JMAConsulting/CRM-20207

CRM-20207 Added invocation for selectWhereClause hook in activity SQL

7 years agoMerge pull request #10117 from colemanw/CRM-20179
Tim Otten [Wed, 5 Apr 2017 20:09:45 +0000 (13:09 -0700)]
Merge pull request #10117 from colemanw/CRM-20179

CRM-20179 - Fix race condition on manage group page

7 years agoCRM-20179 - Fix race condition on manage group page
Coleman Watts [Wed, 5 Apr 2017 18:39:06 +0000 (14:39 -0400)]
CRM-20179 - Fix race condition on manage group page

7 years agoCRM-20390 - Fix select2 data type mismatch
Coleman Watts [Wed, 5 Apr 2017 16:44:38 +0000 (12:44 -0400)]
CRM-20390 - Fix select2 data type mismatch

7 years agoCRM-20388 - ensure connection errors are properly reported to user.
Jamie McClelland [Wed, 5 Apr 2017 15:35:54 +0000 (11:35 -0400)]
CRM-20388 - ensure connection errors are properly reported to user.

7 years agoCRM-20376 - fix typo in variable name.
Jamie McClelland [Wed, 5 Apr 2017 14:49:32 +0000 (10:49 -0400)]
CRM-20376 - fix typo in variable name.

7 years agoMerge pull request #10110 from mattwire/contributor
Eileen McNaughton [Wed, 5 Apr 2017 12:50:47 +0000 (00:50 +1200)]
Merge pull request #10110 from mattwire/contributor

Add my details

7 years agoMerge pull request #9880 from JMAConsulting/CRM-20158-4
Eileen McNaughton [Wed, 5 Apr 2017 12:17:40 +0000 (00:17 +1200)]
Merge pull request #9880 from JMAConsulting/CRM-20158-4

CRM-20158, added function to update credit card details like card typ…

7 years agominor
deb.monish [Wed, 5 Apr 2017 12:06:36 +0000 (17:36 +0530)]
minor

7 years agoAdd is_public setting on Custom groups
Jitendra Purohit [Wed, 22 Mar 2017 04:53:11 +0000 (10:23 +0530)]
Add is_public setting on Custom groups

7 years agoAdditional test fixes and adding CRM unit test
deb.monish [Mon, 3 Apr 2017 11:05:45 +0000 (16:35 +0530)]
Additional test fixes and adding CRM unit test

7 years agorefactor activity listing using API instead of SQL
deb.monish [Fri, 31 Mar 2017 10:40:14 +0000 (16:10 +0530)]
refactor activity listing using API instead of SQL

7 years agoCRM-20207 Added invocation for selectWhereClause hook in activity SQL
Edsel [Thu, 2 Mar 2017 11:48:08 +0000 (17:18 +0530)]
CRM-20207 Added invocation for selectWhereClause hook in activity SQL

----------------------------------------
* CRM-20207: Introduce selectWhereClause hook for activity results on activity tab contact summary page
  https://issues.civicrm.org/jira/browse/CRM-20207

7 years agoCRM-20158, added comments
Pradeep Nayak [Wed, 5 Apr 2017 09:46:37 +0000 (15:16 +0530)]
CRM-20158, added comments

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

7 years ago CRM-20158, added function to update credit card details like card type and pan trunc...
Pradeep Nayak [Wed, 22 Feb 2017 23:31:05 +0000 (05:01 +0530)]
 CRM-20158, added function to update credit card details like card type and pan truncation for contribution

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

CRM-20158, added test

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

CRM-20158, changed code to use api for update to financial trxn table and to retrieve data from financial trxn table

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

CRM-20158, placed function contribution BAO to update card details

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

CRM-20158, changed function defination and params and updated function calling

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

7 years agoAdd my details
Matthew Wire [Wed, 5 Apr 2017 08:06:22 +0000 (09:06 +0100)]
Add my details

7 years agoMerge pull request #10106 from eileenmcnaughton/index
Eileen McNaughton [Wed, 5 Apr 2017 04:25:04 +0000 (16:25 +1200)]
Merge pull request #10106 from eileenmcnaughton/index

CRM-20312 Add indices to DAO classes

7 years ago CRM-20312 regenerated DAOS with indexes
Aidan Saunders [Wed, 5 Apr 2017 03:05:06 +0000 (15:05 +1200)]
 CRM-20312 regenerated DAOS with indexes

7 years agoCRM-20312 Add indices to DAO classes
Aidan Saunders [Tue, 4 Apr 2017 22:56:29 +0000 (10:56 +1200)]
CRM-20312 Add indices to DAO classes

7 years agoMerge pull request #10108 from eileenmcnaughton/localizable
Eileen McNaughton [Wed, 5 Apr 2017 02:14:17 +0000 (14:14 +1200)]
Merge pull request #10108 from eileenmcnaughton/localizable

CRM-20312 add field localisation data to DAO.  …

7 years agoMerge pull request #10098 from agh1/4.7.18-release-notes
colemanw [Wed, 5 Apr 2017 01:48:43 +0000 (21:48 -0400)]
Merge pull request #10098 from agh1/4.7.18-release-notes

Release notes 4.7.18

7 years ago4.7.18 release notes: update contributors and key
Andrew Hunt [Wed, 5 Apr 2017 01:40:24 +0000 (21:40 -0400)]
4.7.18 release notes: update contributors and key

7 years agoCRM-20312 regenerated DAO with localisation
Aidan Saunders [Wed, 5 Apr 2017 01:27:34 +0000 (13:27 +1200)]
CRM-20312 regenerated DAO with localisation

7 years agoCRM-20312 add field localisation data to DAO.
Aidan Saunders [Wed, 5 Apr 2017 01:19:50 +0000 (13:19 +1200)]
CRM-20312 add field localisation data to DAO.

Towards index reconciliation

7 years agoMerge pull request #10107 from eileenmcnaughton/index_tidy
Eileen McNaughton [Wed, 5 Apr 2017 00:38:24 +0000 (12:38 +1200)]
Merge pull request #10107 from eileenmcnaughton/index_tidy

Minor spelling & casing  tidy ups

7 years agoMinor spelling & casing tidy ups
Aidan Saunders [Tue, 4 Apr 2017 23:09:41 +0000 (11:09 +1200)]
Minor spelling & casing  tidy ups

7 years ago4.7.18 release notes: finished issues, still need to fix credits
Andrew Hunt [Tue, 4 Apr 2017 21:57:15 +0000 (17:57 -0400)]
4.7.18 release notes: finished issues, still need to fix credits

7 years agoMerge pull request #9616 from ErichBSchulz/feature/drupal_boot_no_exit
Tim Otten [Tue, 4 Apr 2017 19:05:35 +0000 (12:05 -0700)]
Merge pull request #9616 from ErichBSchulz/feature/drupal_boot_no_exit

Feature/drupal boot no exit

7 years agoCRM-20376 - ensure questions are labelled Q1, Q2, etc in pdf report.
Jamie McClelland [Mon, 3 Apr 2017 17:44:32 +0000 (13:44 -0400)]
CRM-20376 - ensure questions are labelled Q1, Q2, etc in pdf report.

Also, replace deprecated method.

7 years agoMerge pull request #10036 from jitendrapurohit/CRM-20329
Monish Deb [Tue, 4 Apr 2017 12:24:39 +0000 (17:54 +0530)]
Merge pull request #10036 from jitendrapurohit/CRM-20329

CRM-20329: Backend Membership with Payment set to Failed results in M…

7 years agoMerge pull request #10101 from eileenmcnaughton/contribution
Eileen McNaughton [Tue, 4 Apr 2017 06:54:09 +0000 (18:54 +1200)]
Merge pull request #10101 from eileenmcnaughton/contribution

CRM-20379 move payment details above less important info

7 years agoMerge pull request #10100 from seamuslee001/CRM-19961-schema
Eileen McNaughton [Tue, 4 Apr 2017 06:02:57 +0000 (18:02 +1200)]
Merge pull request #10100 from seamuslee001/CRM-19961-schema

CRM-19961 Schema changes to make sms provider multisite aware

7 years agoCRM-20379 move payment details above less important info
eileen [Tue, 4 Apr 2017 05:49:12 +0000 (17:49 +1200)]
CRM-20379 move payment details above less important info