Yashodha Chaku [Wed, 20 Sep 2017 02:04:31 +0000 (07:34 +0530)]
CRM-21170 - Provide option to filter by contact id & external id (#10966)
* CRM-21170 - Provide option to filter by contact id & external id
Eileen McNaughton [Wed, 20 Sep 2017 01:08:32 +0000 (13:08 +1200)]
Merge pull request #10989 from seamuslee001/CRM-21014
CRM-21014 Ensure that preimum name is EOU
Seamus Lee [Tue, 19 Sep 2017 22:50:58 +0000 (08:50 +1000)]
CRM-21014 only modify the alt tags
Eileen McNaughton [Tue, 19 Sep 2017 22:35:06 +0000 (10:35 +1200)]
Merge pull request #10992 from seamuslee001/CRM-20907
CRM-20907 Ensure that contact_type is valid in deduperules
Monish Deb [Tue, 19 Sep 2017 20:43:40 +0000 (02:13 +0530)]
Merge pull request #11001 from seanmadsen/CRM-20895
CRM-20895 - Encode display of search criteria
Sean Madsen [Tue, 19 Sep 2017 20:26:02 +0000 (14:26 -0600)]
CRM-20895 - Encode display of search criteria
Monish Deb [Tue, 19 Sep 2017 13:17:53 +0000 (18:47 +0530)]
Merge pull request #10935 from eileenmcnaughton/dd
CRM-21134 fix enotices in payment processor code assignment.
Mathieu Lu [Tue, 19 Sep 2017 12:48:31 +0000 (08:48 -0400)]
Merge pull request #10997 from francescbassas/CRM-21196
CRM-21196 - Event Income Details and Income Count Summary report localization
Francesc Bassas i Bullich [Tue, 19 Sep 2017 11:08:39 +0000 (13:08 +0200)]
CRM-21196 - Event reports localization
Eileen McNaughton [Tue, 19 Sep 2017 08:07:30 +0000 (20:07 +1200)]
Merge pull request #10978 from jitendrapurohit/CRM-21117
CRM-21117: Line item not shown when paying later using membership priceset
Eileen McNaughton [Tue, 19 Sep 2017 08:01:12 +0000 (20:01 +1200)]
Merge pull request #10991 from seamuslee001/CRM-21011
CRM-21011 Sort out tag descriptions when displaying better
Monish Deb [Tue, 19 Sep 2017 06:22:38 +0000 (11:52 +0530)]
Merge pull request #10982 from eileenmcnaughton/trxn_currency
CRM-21187 Fix handling of currency when updating a contribution to be…
Seamus Lee [Tue, 19 Sep 2017 04:57:56 +0000 (14:57 +1000)]
CRM-20907 only throw Execption if contactType is set in the Ruquest
Yashodha Chaku [Tue, 19 Sep 2017 04:53:53 +0000 (10:23 +0530)]
Merge pull request #10857 from adixon/CRM-21063
CRM-21063 Add date to survey/details report
Seamus Lee [Tue, 19 Sep 2017 01:16:16 +0000 (11:16 +1000)]
CRM-20907 Ensure that contact_type is valid in deduperules
Seamus Lee [Tue, 19 Sep 2017 00:58:38 +0000 (10:58 +1000)]
CRM-21011 Sort out tag descriptions when displaying better
Seamus Lee [Tue, 19 Sep 2017 00:07:53 +0000 (10:07 +1000)]
CRM-21014 Ensure that preimum name is EOU
eileen [Fri, 1 Sep 2017 23:49:00 +0000 (11:49 +1200)]
CRM-21134 fix enotices in payment processor code assignment.
This is generally a code tidy up to push out the principles we have been implementing (ie.
the idea that the processors define their fields. The code can cause e-notices in extensions as is
because it is prescriptive about fields.
I removed the ANDing in the tpl because actually we are not looking to match numbers like 2
2 is the number we have hard-coded for direct debits (we should be using an option group but that
is another story
eileen [Thu, 14 Sep 2017 23:51:47 +0000 (11:51 +1200)]
CRM-21187 Fix handling of currency when updating a contribution to be completed.
This is replicable via the api & potentially other flows. The currency id
of NULL is not accepted in financialTrxn BAO without it replacing with a
default, which is not appropriate on an update.
colemanw [Sun, 17 Sep 2017 00:25:13 +0000 (20:25 -0400)]
Merge pull request #10984 from colemanw/CRM-21127
CRM-21127 - Fix return properties in api.Event.get
Eileen McNaughton [Fri, 15 Sep 2017 23:50:51 +0000 (11:50 +1200)]
Merge pull request #10981 from jitendrapurohit/CRM-21183
CRM-21183: Updating Partially paid contribution to Completed doesn't …
Eileen McNaughton [Fri, 15 Sep 2017 23:43:22 +0000 (11:43 +1200)]
Merge pull request #10985 from colemanw/CRM-21178
CRM-21178 - Make custom field of type Link clickable
Coleman Watts [Fri, 15 Sep 2017 14:31:53 +0000 (10:31 -0400)]
CRM-21178 - Make custom field of type Link clickable
Coleman Watts [Fri, 15 Sep 2017 13:41:05 +0000 (09:41 -0400)]
CRM-21127 - Fix return properties in api.Event.get
Monish Deb [Fri, 15 Sep 2017 13:18:30 +0000 (18:48 +0530)]
Merge pull request #10980 from eileenmcnaughton/qa
CRM-20750 follow up fix from QA
colemanw [Fri, 15 Sep 2017 13:05:45 +0000 (09:05 -0400)]
Merge pull request #10964 from yashodha/CRM-21169
CRM-21169 - Fix broken inline edit for profiles
colemanw [Fri, 15 Sep 2017 00:56:31 +0000 (20:56 -0400)]
Merge pull request #10979 from colemanw/CRM-21182
CRM-21182 - Activity API: Fetch case fields via the join syntax
Coleman Watts [Thu, 14 Sep 2017 21:47:26 +0000 (17:47 -0400)]
CRM-21182 - Add test for fetching case fields in activity.get
Jitendra Purohit [Thu, 14 Sep 2017 13:23:05 +0000 (18:53 +0530)]
Minor fixes
Jitendra Purohit [Thu, 14 Sep 2017 12:02:09 +0000 (17:32 +0530)]
CRM-21183: Updating Partially paid contribution to Completed doesn't update membership
Eileen McNaughton [Wed, 13 Sep 2017 22:10:05 +0000 (10:10 +1200)]
Merge pull request #10680 from JMAConsulting/CRM-20889
CRM-20889 : Toggle check_number field on backoffice form as payment form fields
Eileen McNaughton [Wed, 13 Sep 2017 21:54:28 +0000 (09:54 +1200)]
Merge pull request #10970 from JMAConsulting/CRM-20276
CRM-20276, fixed code to store correct value in financial item table …
eileen [Wed, 13 Sep 2017 21:25:09 +0000 (09:25 +1200)]
CRM-20750 follow up fix from QA
In pr #10920 @sunilpawar spotted this error
colemanw [Wed, 13 Sep 2017 19:28:37 +0000 (15:28 -0400)]
Merge pull request #10920 from eileenmcnaughton/pi
CRM-20750: Incorrect financial trxn entries when payment instrument i…
Coleman Watts [Wed, 13 Sep 2017 15:09:50 +0000 (11:09 -0400)]
CRM-21182 - Activity API: Fetch case fields via the join syntax
Jitendra Purohit [Wed, 13 Sep 2017 12:10:42 +0000 (17:40 +0530)]
add unit test
Jitendra Purohit [Tue, 29 Aug 2017 05:19:15 +0000 (10:49 +0530)]
CRM-21117: Enable useForMember for pending membership signup
Pradeep Nayak [Tue, 12 Sep 2017 08:43:41 +0000 (14:13 +0530)]
fixed jenkins style
Pradeep Nayak [Mon, 11 Sep 2017 12:58:07 +0000 (18:28 +0530)]
CRM-20276, fixed code to store correct value in financial item table for amount when contribution amount is changed
----------------------------------------
* CRM-20276: When editing a contribution the value in civicrm_financial_item_amount is not updated
https://issues.civicrm.org/jira/browse/CRM-20276
deb.monish [Wed, 13 Sep 2017 08:33:19 +0000 (14:03 +0530)]
fix payment type label
deb.monish [Thu, 31 Aug 2017 19:31:31 +0000 (01:01 +0530)]
additional fix to load selected payment instrument field on edit
deb.monish [Mon, 17 Jul 2017 12:09:12 +0000 (17:39 +0530)]
CRM-20889: Toggle check_number field on backoffice form as payment form fields
Pradeep Nayak [Thu, 13 Jul 2017 20:02:12 +0000 (01:32 +0530)]
CRM-20869, removed cruft code for check number
----------------------------------------
* CRM-20869: Remove cruft code for check number
https://issues.civicrm.org/jira/browse/CRM-20869
Eileen McNaughton [Wed, 13 Sep 2017 07:41:58 +0000 (19:41 +1200)]
Merge pull request #10976 from eileenmcnaughton/4.7.25-rc
4.7.25 rc
eileen [Wed, 13 Sep 2017 07:35:31 +0000 (19:35 +1200)]
Merge branch '4.7.25-rc' of https://github.com/civicrm/civicrm-core
Tim Otten [Tue, 12 Sep 2017 22:08:22 +0000 (15:08 -0700)]
Merge pull request #10975 from eileenmcnaughton/4.7.25-rc
CRM-21175 fix fatal error on multiple custom field import.
eileen [Tue, 12 Sep 2017 06:53:02 +0000 (18:53 +1200)]
CRM-21175 fix fatal error on multiple custom field import.
Additional test is tangental....
Monish Deb [Tue, 12 Sep 2017 16:56:02 +0000 (22:26 +0530)]
Merge pull request #10439 from jitendrapurohit/CRM-20657
CRM-20657: get all participant ids if multiple contacts register from…
Eileen McNaughton [Tue, 12 Sep 2017 13:00:34 +0000 (01:00 +1200)]
Merge pull request #10838 from jmcclelland/CRM-16964
CRM-16964: ensure FILL works on import with custom fields.
Tim Otten [Mon, 11 Sep 2017 21:45:23 +0000 (14:45 -0700)]
Merge pull request #10952 from civicrm/michaelmcandrew-patch-1
Fixing type (missing function call) in example for hook_civicrm_alterAngular
Eileen McNaughton [Mon, 11 Sep 2017 21:41:01 +0000 (09:41 +1200)]
Merge pull request #10973 from civicrm/4.7.25-rc
4.7.25 rc
Tim Otten [Mon, 11 Sep 2017 21:35:39 +0000 (14:35 -0700)]
Merge pull request #10963 from eileenmcnaughton/cleanup
[NFC] comments clean up in test classes.
Eileen McNaughton [Mon, 11 Sep 2017 21:27:42 +0000 (09:27 +1200)]
Merge pull request #10972 from totten/4.7.25-rc-tpl
CRM-18231 - Cleanup `environment` example in `civicrm.settings.php.template`
Tim Otten [Mon, 11 Sep 2017 18:45:35 +0000 (11:45 -0700)]
CRM-18231 - civicrm.settings.php.template - Remove extra whitespace
Tim Otten [Mon, 11 Sep 2017 18:42:34 +0000 (11:42 -0700)]
CRM-18231 - civicrm.settings.php.template - Move `global` declaration
When using the example snippets in the settings file, it's easy to
accidentally leave `global $civicrm_setting` commented out -- which is
fairly confusing/mysterious way to have your settings ignored.
There's no cost to declaring `global $civicrm_setting` by default in new
config files.
Tim Otten [Mon, 11 Sep 2017 18:40:26 +0000 (11:40 -0700)]
CRM-18231 - civicrm.settings.php.template - Fix broken `environment` example
The expression `CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME` does not
work within `civicrm.settings.php` because the classloader has not been
initialized yet. This file is just supposed to store the data needed for
bootstrap.
Monish Deb [Mon, 11 Sep 2017 12:57:08 +0000 (18:27 +0530)]
Merge pull request #10922 from eileenmcnaughton/tpl
CRM-21125 allow class assignment on report row links
Monish Deb [Mon, 11 Sep 2017 12:40:27 +0000 (18:10 +0530)]
Merge pull request #10969 from yashodha/CRM-21172
CRM-21172 - Fix 'Edit Contact Information' link on contact dashboard
yashodha [Mon, 11 Sep 2017 09:32:11 +0000 (15:02 +0530)]
CRM-21172 - Fix 'Edit Contact Information' link on contact dashboard
Michael McAndrew [Mon, 11 Sep 2017 09:27:30 +0000 (10:27 +0100)]
Update Hook.php
Eileen McNaughton [Mon, 11 Sep 2017 09:11:24 +0000 (21:11 +1200)]
Merge pull request #10968 from civicrm/4.7.25-rc
4.7.25 rc
Monish Deb [Mon, 11 Sep 2017 09:08:29 +0000 (14:38 +0530)]
Merge pull request #10936 from seamuslee001/CRM-18231
CRM-18231 Remove need for define statement and replace with new setti…
Seamus Lee [Mon, 4 Sep 2017 01:31:10 +0000 (11:31 +1000)]
CRM-18231 Remove need for define statement and replace with new setting not settable in UI and always use settings to get information
Switch to getMandatory function as per Tim's comment
Eileen McNaughton [Mon, 11 Sep 2017 07:35:42 +0000 (19:35 +1200)]
Merge pull request #10953 from seamuslee001/CRM-20892
CRM-20892 Add in modified_date column to civicrm_mailing to assist in…
Seamus Lee [Mon, 11 Sep 2017 05:43:57 +0000 (15:43 +1000)]
CRM-20892 Fix issue where saving to the database wasn't creating a new modified_date
yashodha [Mon, 11 Sep 2017 05:50:12 +0000 (11:20 +0530)]
CRM-21169 - Fix broken inline edit for profiles
eileen [Mon, 11 Sep 2017 05:33:37 +0000 (17:33 +1200)]
CRM-20750 follow up.
Change logic for determinig paymentInstrumentChange to look at whether
['payment_instrument_id'] isset. If not it has not been passed by the calling
function and by definition the calling function is not attempting to change it
eileen [Mon, 11 Sep 2017 02:37:50 +0000 (14:37 +1200)]
CRM-20750 follow up fix, reversal should be against original account.
On trying to investigate why a test change was required in the original PR I came to the following conclusions:
1) the test function was causing problems by being hard to read. As a result it was too easy to see it as
'accounts magic' - I started a cleanup here
2) Once I understood what was being tested & failing I concluded the change in the PR was in fact wrong
as it was putting a negative entry against the new financial account rather than the original one.
deb.monish [Wed, 21 Jun 2017 15:44:58 +0000 (21:14 +0530)]
CRM-20750: Incorrect financial trxn entries when payment instrument is changed on backoffice Contribution edit form
added unit test
CRM-20750, fixed db entries
----------------------------------------
* CRM-20750: Incorrect financial trxn entries when payment instrument is changed on backoffice Contribution edit form
https://issues.civicrm.org/jira/browse/CRM-20750
Seamus Lee [Sun, 10 Sep 2017 03:50:42 +0000 (13:50 +1000)]
CRM-20892 Convert Created_date to default NULL and add in trigger to set it
Remove duplicate was
Move field around in table definition as per Eileen's comment
Seamus Lee [Wed, 6 Sep 2017 21:04:38 +0000 (07:04 +1000)]
CRM-20892 Add in modified_date column to civicrm_mailing to assist in preventing cross edit of mailings
Eileen McNaughton [Sun, 10 Sep 2017 22:59:17 +0000 (10:59 +1200)]
Merge pull request #10954 from seamuslee001/CRM-21157
CRM-21157 Convert civicrm_subscription_history.date column to be time…
eileen [Sun, 10 Sep 2017 22:47:30 +0000 (10:47 +1200)]
[NFC] comments clean up in test classes.
Also remove a few unused variables
Eileen McNaughton [Sun, 10 Sep 2017 21:48:32 +0000 (09:48 +1200)]
Merge pull request #10947 from JMAConsulting/CRM-21133
CRM-21133: Price set error with NULL financial types
colemanw [Sun, 10 Sep 2017 01:29:30 +0000 (21:29 -0400)]
Merge pull request #10957 from coldrunKacper/CRM-20630-change-activity-form-to-accept-url-search-parameters
CRM-20630: Modifying CRM_Activity_Form_Search to use URL parameters as search form values when passing force=1.
Mathieu Lu [Sat, 9 Sep 2017 21:31:27 +0000 (17:31 -0400)]
Merge pull request #10959 from mlutfy/cleanup-pcp
templates/CRM/PCP/Form/Campaign.tpl: remove comment (not relevant).
Mathieu Lutfy [Sat, 9 Sep 2017 20:43:17 +0000 (16:43 -0400)]
templates/CRM/PCP/Form/Campaign.tpl: remove comment (not relevant).
coldrunKacper [Fri, 8 Sep 2017 15:25:26 +0000 (17:25 +0200)]
CRM-20630: Fixing indentations.
coldrunKacper [Fri, 8 Sep 2017 14:55:45 +0000 (16:55 +0200)]
CRM-20630: Modifying CRM_Activity_Form_Search to use URL parameters as search form values when passing force=1.
Eileen McNaughton [Fri, 8 Sep 2017 02:53:36 +0000 (14:53 +1200)]
Merge pull request #10826 from jitendrapurohit/CRM-21038
CRM-21038 - select default processor if displayed by amount selection.
Seamus Lee [Thu, 7 Sep 2017 20:38:34 +0000 (06:38 +1000)]
CRM-21157 date column information into array of converted columns in System Check
Seamus Lee [Thu, 7 Sep 2017 01:03:28 +0000 (11:03 +1000)]
CRM-21157 Convert civicrm_subscription_history.date column to be timestamp rather than datetime to help with timezone issues
Michael McAndrew [Thu, 7 Sep 2017 15:28:18 +0000 (16:28 +0100)]
Update Hook.php
Michael McAndrew [Thu, 7 Sep 2017 15:24:34 +0000 (16:24 +0100)]
Update Hook.php
Monish Deb [Thu, 7 Sep 2017 13:29:10 +0000 (18:59 +0530)]
Merge pull request #10883 from mickadoo/CRM-21086-allow-inline-file-view
CRM-21086: Allow Inline Download of Files
Monish Deb [Thu, 7 Sep 2017 13:05:58 +0000 (18:35 +0530)]
Merge pull request #10911 from lcdservices/CRM-21113
CRM-21113: find case - search by id, subject
Eileen McNaughton [Thu, 7 Sep 2017 06:01:42 +0000 (18:01 +1200)]
Merge pull request #10904 from seamuslee001/CRM-21106
CRM-21106 Add Warnings about new required extension to support Financ…
Eileen McNaughton [Thu, 7 Sep 2017 05:58:26 +0000 (17:58 +1200)]
Merge pull request #10955 from fuzionnz/typofix_in_deprecation
Correct spelling.
CiviCRM [Thu, 7 Sep 2017 05:35:30 +0000 (05:35 +0000)]
Set version to 4.7.26
Tim Otten [Thu, 7 Sep 2017 03:59:20 +0000 (20:59 -0700)]
Merge pull request #10956 from civicrm/4.7.24-rc
4.7.24 rc
Tim Otten [Thu, 7 Sep 2017 03:11:08 +0000 (20:11 -0700)]
Merge pull request #10897 from agh1/4.7.24-releasenotes
4.7.24 release notes
Chris Burgess [Thu, 7 Sep 2017 02:24:55 +0000 (14:24 +1200)]
Correct spelling.
Andrew Hunt [Wed, 6 Sep 2017 23:25:33 +0000 (19:25 -0400)]
4.7.24 Release notes: contributors
Andrew Hunt [Wed, 6 Sep 2017 23:09:18 +0000 (19:09 -0400)]
Release notes 4.7.24: edits and reorganization
Coleman Watts [Wed, 6 Sep 2017 22:24:37 +0000 (18:24 -0400)]
Remove unnecessary line
Andrew Hunt [Wed, 6 Sep 2017 22:01:09 +0000 (18:01 -0400)]
Merge pull request #3 from alifrumin/4.7.24-releasenotes
4.7.24 releasenotes edits
Seamus Lee [Sun, 27 Aug 2017 08:29:38 +0000 (18:29 +1000)]
CRM-21106 Add Warnings about new required extension to support Financial Type ACLs in reports
CRM-21106 Make language less urgent indicating it will in the futre need the extension
Alice Frumin [Wed, 6 Sep 2017 21:24:39 +0000 (17:24 -0400)]
cleaning up and dealing with documentation of bigger changes
Alice Frumin [Wed, 6 Sep 2017 20:04:50 +0000 (16:04 -0400)]
moving around issues between bugs and features
Michael McAndrew [Wed, 6 Sep 2017 18:47:10 +0000 (19:47 +0100)]
Fixing type (missing function call) in example for hook_civicrm_alterAngular