Jamie McClelland [Wed, 23 Aug 2017 16:09:39 +0000 (12:09 -0400)]
CRM-16964 - change what I thought was typo back
Maybe not a typo? tests are failing.
Jamie McClelland [Thu, 10 Aug 2017 19:22:41 +0000 (15:22 -0400)]
CRM-16964 - one more style fix - indententation.
Jamie McClelland [Wed, 9 Aug 2017 16:08:24 +0000 (12:08 -0400)]
CRM-16964 - fixing style warnings.
Jamie McClelland [Wed, 9 Aug 2017 15:58:39 +0000 (11:58 -0400)]
CRM-16964: ensure FILL works on import with custom fields.
colemanw [Wed, 9 Aug 2017 13:59:31 +0000 (09:59 -0400)]
Merge pull request #10394 from JMAConsulting/DonotExport
CRM-20615 Export only those batches whose status is exported
Eileen McNaughton [Wed, 9 Aug 2017 13:31:18 +0000 (09:31 -0400)]
Merge pull request #10837 from civicrm/4.7.24-rc
4.7.24 rc
Eileen McNaughton [Wed, 9 Aug 2017 13:28:17 +0000 (09:28 -0400)]
Merge pull request #10814 from JMAConsulting/CRM-20610-3-rc
CRM-20610: Handle payment instrument change on Payment Edit form
colemanw [Wed, 9 Aug 2017 13:03:15 +0000 (09:03 -0400)]
Merge pull request #10833 from JMAConsulting/CRM-20800-rc
CRM-20800 : User Cannot Cancel Recurring Payment With Paypal
deb.monish [Wed, 9 Aug 2017 07:57:31 +0000 (13:27 +0530)]
CRM-20800 : User Cannot Cancel Recurring Payment With Paypal
Monish Deb [Wed, 9 Aug 2017 06:54:10 +0000 (12:24 +0530)]
Merge pull request #10793 from eileenmcnaughton/tpl
CRM-20990 add contributionStatus to online template
Eileen McNaughton [Wed, 9 Aug 2017 00:11:52 +0000 (12:11 +1200)]
Merge pull request #10427 from mattwire/report_bounce_type
CRM-20643 Fix invalid bounce type filter for bounce report
Eileen McNaughton [Wed, 9 Aug 2017 00:03:31 +0000 (12:03 +1200)]
Merge pull request #10824 from seamuslee001/CRM-21026
CRM-21026 fix issue with ContributionCount not including disabled fin…
Eileen McNaughton [Tue, 8 Aug 2017 23:51:12 +0000 (11:51 +1200)]
Merge pull request #10827 from mattwire/CRM-17157_support_multiple_decimalplaces_formrule_money
CRM-17157 support multiple decimalplaces formrule money
colemanw [Tue, 8 Aug 2017 02:51:57 +0000 (22:51 -0400)]
Merge pull request #10817 from JMAConsulting/CRM-21005
CRM-21005, "Record Payment" dialogue lacks required field and is clunky
Seamus Lee [Mon, 7 Aug 2017 21:30:43 +0000 (07:30 +1000)]
Minor comment fixes and further reduction of passing by reference with changing to new wrapper functions
Monish Deb [Mon, 7 Aug 2017 12:03:48 +0000 (17:33 +0530)]
Merge pull request #10818 from eileenmcnaughton/recur_date
CRM-21027 Fix next recurring payment not accurately calculated
Matthew Wire [Mon, 7 Aug 2017 11:08:25 +0000 (12:08 +0100)]
Checkstyle
Matthew Wire [Mon, 7 Aug 2017 10:56:14 +0000 (11:56 +0100)]
Add unit test
Matthew Wire [Mon, 7 Aug 2017 10:44:32 +0000 (11:44 +0100)]
Support multiple decimal places in CRM_Utils_Rule::money for currencies such as bitcoin, also helps towards CRM-20772 which requires higher precision decimals to be stored in the database to calculate tax inclusive amounts correctly
deb.monish [Mon, 7 Aug 2017 08:42:53 +0000 (14:12 +0530)]
additional fix
Seamus Lee [Mon, 7 Aug 2017 06:31:31 +0000 (16:31 +1000)]
Code updates as per Eileen
Seamus Lee [Mon, 7 Aug 2017 01:08:19 +0000 (11:08 +1000)]
Attempt to get rid of pasing by reference and change variable as needed
Seamus Lee [Sun, 6 Aug 2017 22:53:57 +0000 (08:53 +1000)]
CRM-21026 fix issue with ContributionCount not including disabled financialtypes
Fix references and move flushing of cache to all financialTypes for the safe side
Eileen McNaughton [Sun, 6 Aug 2017 21:49:58 +0000 (09:49 +1200)]
Merge pull request #10823 from mattwire/CRM-21031_financialtypedisplay
CRM-21031 Fix for id instead of financialtype name
Matthew Wire [Sun, 6 Aug 2017 19:49:38 +0000 (20:49 +0100)]
Fix for id instead of financialtype name
Eileen McNaughton [Sat, 5 Aug 2017 23:59:42 +0000 (11:59 +1200)]
Merge pull request #10801 from JMAConsulting/CRM-13309
CRM-13309: Participant Role on Event's Schedule Reminder form does not populate
deb.monish [Fri, 4 Aug 2017 17:40:03 +0000 (23:10 +0530)]
test build failure fix
Tim Otten [Fri, 4 Aug 2017 22:59:02 +0000 (15:59 -0700)]
Merge pull request #10812 from kainukempowerment/keikelboom-civicoop
Klaas Eikelboom (Kainuk Empowerment) is member of CiviCooP
colemanw [Fri, 4 Aug 2017 22:00:39 +0000 (18:00 -0400)]
Merge pull request #10820 from JMAConsulting/CRM-21029
CRM-21029 - Report - Fix Activity Report SQL Syntax Error
colemanw [Fri, 4 Aug 2017 20:37:50 +0000 (16:37 -0400)]
Merge pull request #10813 from JMAConsulting/CRM-21019
CRM-21019, Changed column labels on batch transaction listing page
Thomas Schüttler [Fri, 4 Aug 2017 10:40:40 +0000 (12:40 +0200)]
CRM-21029 - Report - Fix Activity Report SQL Syntax Error
Monish Deb [Fri, 4 Aug 2017 20:27:01 +0000 (01:57 +0530)]
Merge pull request #10819 from tschuettler/CRM-21029
CRM-21029 - Report - Fix Activity Report SQL Syntax Error
colemanw [Fri, 4 Aug 2017 20:22:21 +0000 (16:22 -0400)]
Merge pull request #10744 from JMAConsulting/CRM-20942
CRM-20942: Email location type must be 'primary' in profile or user creation won't work for event
deb.monish [Fri, 4 Aug 2017 18:59:31 +0000 (00:29 +0530)]
label change
deb.monish [Fri, 4 Aug 2017 12:44:02 +0000 (18:14 +0530)]
concatenate check_number and trxn_id in contribution
deb.monish [Fri, 4 Aug 2017 11:07:29 +0000 (16:37 +0530)]
additional fixes
Thomas Schüttler [Fri, 4 Aug 2017 10:40:40 +0000 (12:40 +0200)]
CRM-21029 - Report - Fix Activity Report SQL Syntax Error
eileen [Fri, 4 Aug 2017 08:49:32 +0000 (20:49 +1200)]
CRM-21027 Fix next recurring payment not accurately calculated when effective date passed in
Pradeep Nayak [Fri, 4 Aug 2017 05:40:12 +0000 (11:10 +0530)]
CRM-21005, mark payment instrument as required
----------------------------------------
* CRM-21005: "Record Payment" dialogue lacks required field and is clunky
https://issues.civicrm.org/jira/browse/CRM-21005
Pradeep Nayak [Fri, 4 Aug 2017 05:40:03 +0000 (11:10 +0530)]
CRM-21005, set amount to default owed
----------------------------------------
* CRM-21005: "Record Payment" dialogue lacks required field and is clunky
https://issues.civicrm.org/jira/browse/CRM-21005
colemanw [Fri, 4 Aug 2017 02:35:17 +0000 (22:35 -0400)]
Merge pull request #10816 from mattwire/nfc_activity_pseudoconstant
CRM-21023 Replace deprecated code and hardcoded IDs with pseudoconstants in Activity BAO
Tim Otten [Fri, 4 Aug 2017 01:26:11 +0000 (18:26 -0700)]
Merge pull request #10709 from totten/master-ids-cleanbreak
CRM-20926 - Allow extensions to flag PHPIDS html/json fields
Tim Otten [Tue, 1 Aug 2017 22:53:20 +0000 (15:53 -0700)]
CRM-20926 - Resolve "exception"/"exceptions" discrepency. Improve test.
The PHPIDS config format uses the property:
```
exceptions => array('field_1)`
```
But our XML format uses the tag:
```
<exception>field_1</exception>
```
Grammatically, those both make sense. But they were getting confused.
This modifies the XML parser to map the tags `<exception>` to property
`exceptions`, and it updates the unit-test to ensure that the data
(from the route and the default config) are correctly merged.
Tim Otten [Sat, 22 Jul 2017 03:15:30 +0000 (20:15 -0700)]
CRM-20926 - CRM_Core_Menu - Parse XML element <ids_arguments>
Tim Otten [Sat, 22 Jul 2017 03:00:39 +0000 (20:00 -0700)]
CRM-20926 - CRM_Core_MenuTest - Add basic test for XML parsing
Tim Otten [Sat, 15 Jul 2017 00:58:05 +0000 (17:58 -0700)]
CRM-20926 - Kill Config.IDS.ini
Background
==========
Previously, the IDS configuration was written to a temp file and then read from the tempfile.
Since we no longer read the tempfile, we don't need to write to it either.
Before
======
System autocreates the `Config.IDS.ini` file.
After
=====
System does not create `Config.IDS.ini`.
Tim Otten [Sat, 15 Jul 2017 03:00:08 +0000 (20:00 -0700)]
CRM-20926 - CRM_Core_IDS - Generate configuration from an array
Background
==========
PHPIDS scans all inputs and uses heuristic checks to identify malicious
content. It relies on a configuration with data about the fields we'll
process.
Before
======
The function `createConfigFile()` produces the standard configuration as an
INI file. The configuration was represented as an unalterable string.
After
=====
* The configuration is represented as an array.
* The configuration is generated via `createStandardConfig()`
* The function `createConfigFile()` only handles file I/O.
Tim Otten [Thu, 20 Jul 2017 06:07:25 +0000 (23:07 -0700)]
CRM-20927 - civicrm_menu - Add test for reading/writing `module_data`
Tim Otten [Thu, 20 Jul 2017 05:33:19 +0000 (22:33 -0700)]
CRM-20927 - civicrm_menu - Update examples in `civicrm_generated.mysql`
Tim Otten [Thu, 20 Jul 2017 02:16:10 +0000 (19:16 -0700)]
CRM-20927 - civicrm_menu - Add generic column for other data
Background
==========
We need a place to store per-page information about IDS configuration.
More generally, as we continue adding features through extensions, we should
anticipate that the route metadata will expand in ways that we can't
anticipate. Adding a general-purpose serialized field will help us define
new behaviors through extensions.
Before
======
All metadata in the routing table (`civicrm_menu`) had to stored in a
separate SQL column.
After
=====
Any unrecognized fields will be stored and loaded from the column
`module_data`.
Tim Otten [Thu, 20 Jul 2017 02:07:50 +0000 (19:07 -0700)]
CRM_Core_BAO_Navigation::getMenus() - Remove unused function
* This function does not appear to be called anywhere in `universe`.
* It references the table/DAO for `civicrm_menu`, which seems like a bad idea.
* This function goes back v3.0 (when the navbar and router were decoupled) -- but even then, it wasn't used!
I'm guessing it was an interim and forgotten artifact written while decoupling navbar and router.
Eileen McNaughton [Thu, 3 Aug 2017 23:34:52 +0000 (11:34 +1200)]
Merge pull request #10679 from yashodha/4.7.CRM-20733
CRM-20733 - Relationship report improvements
Eileen McNaughton [Thu, 3 Aug 2017 23:31:06 +0000 (11:31 +1200)]
Merge pull request #10802 from lcdservices/CRM-21004
CRM-21004 only remove html snippet task if setting enabled
Eileen McNaughton [Thu, 3 Aug 2017 23:28:55 +0000 (11:28 +1200)]
Merge pull request #10798 from jitendrapurohit/CRM-21000Fix
CRM-21000 : Fix DB error on Advance Search Mailings
Matthew Wire [Thu, 3 Aug 2017 22:30:24 +0000 (23:30 +0100)]
Replace deprecated code and hardcoded IDs with pseudoconstants.
colemanw [Thu, 3 Aug 2017 21:22:56 +0000 (17:22 -0400)]
Merge pull request #10712 from davidjosephhayes/master
Change "Last Action Date" filter variable name CRM-20930
colemanw [Thu, 3 Aug 2017 16:58:16 +0000 (12:58 -0400)]
Merge pull request #10794 from tschuettler/CRM-20993
CRM-20993 - API - Extention get - Fix filtering by ID
Monish Deb [Thu, 3 Aug 2017 12:39:30 +0000 (18:09 +0530)]
Merge pull request #10781 from eileenmcnaughton/postal
Unit test for CRM-20970
deb.monish [Thu, 3 Aug 2017 11:50:11 +0000 (17:20 +0530)]
added unit test and other changes
deb.monish [Wed, 2 Aug 2017 20:54:03 +0000 (02:24 +0530)]
CRM-20610: Handle payment instrument change on Payment Edit form
Thomas Schüttler [Mon, 31 Jul 2017 10:30:23 +0000 (12:30 +0200)]
Allow filtering when return options are set
Thomas Schüttler [Mon, 31 Jul 2017 10:04:24 +0000 (12:04 +0200)]
CRM-20993 - API - Extention get - Fix filtering by ID
----------------------------------------
* CRM-20993: API - Extension get - Cannot filter by ID anymore
https://issues.civicrm.org/jira/browse/CRM-20993
Eileen McNaughton [Thu, 3 Aug 2017 07:25:46 +0000 (19:25 +1200)]
Merge pull request #10808 from jmcclelland/CRM-20790
CRM-20790 - ensure relationships are created on import
Klaas Eikelboom [Thu, 3 Aug 2017 07:07:46 +0000 (03:07 -0400)]
Klaas Eikelboom (Kainuk Empowerment) is member of CiviCooP
Pradeep Nayak [Tue, 1 Aug 2017 18:20:01 +0000 (23:50 +0530)]
CRM-21019, Changed column labels
----------------------------------------
* CRM-21019: Change column labels
https://issues.civicrm.org/jira/browse/CRM-21019
changed labels
fixed labels
CiviCRM [Thu, 3 Aug 2017 05:24:44 +0000 (05:24 +0000)]
Set version to 4.7.25
Eileen McNaughton [Thu, 3 Aug 2017 04:14:15 +0000 (16:14 +1200)]
Merge pull request #10811 from jitendrapurohit/CRM-20913-sync-inprogress
CRM-20913: Fix inprogress value to match with contribution status
Jitendra Purohit [Thu, 3 Aug 2017 04:01:07 +0000 (09:31 +0530)]
CRM-20913: Fix inprogress value to match with contribution status
Eileen McNaughton [Wed, 2 Aug 2017 20:19:27 +0000 (08:19 +1200)]
Merge pull request #10807 from mattwire/link_to_release_notes
CRM-21012 Add link to release notes
Eileen McNaughton [Wed, 2 Aug 2017 19:45:54 +0000 (07:45 +1200)]
Merge pull request #10803 from jitendrapurohit/CRM-20913-sync-ov
CRM-20913 use pledge option group for pledge payments
colemanw [Wed, 2 Aug 2017 18:58:04 +0000 (14:58 -0400)]
Merge pull request #10806 from JMAConsulting/CRM-20610-2
CRM-20610: 'Payment Edit' form improvements
Jamie McClelland [Wed, 2 Aug 2017 17:54:20 +0000 (13:54 -0400)]
CRM-20790 - ensure relationships are created on import
Matthew Wire [Wed, 2 Aug 2017 15:51:13 +0000 (16:51 +0100)]
Add link to release notes
deb.monish [Wed, 2 Aug 2017 14:11:03 +0000 (19:41 +0530)]
add metadata to trxn_id
Brian Shaughnessy [Wed, 2 Aug 2017 13:54:52 +0000 (09:54 -0400)]
CRM-21004: change conditions under which we remove html snippet action
deb.monish [Tue, 1 Aug 2017 10:45:40 +0000 (16:15 +0530)]
CRM-20610: 'Payment Edit' form improvements
Monish Deb [Wed, 2 Aug 2017 09:33:59 +0000 (15:03 +0530)]
Merge pull request #10677 from fuzionnz/CRM-20885-suppress_fakefile_error
Suppress error if fakeFile cannot be created.
Jitendra Purohit [Wed, 2 Aug 2017 08:56:16 +0000 (14:26 +0530)]
sync value for overdue with contribution status for safety
eileen [Mon, 31 Jul 2017 04:57:44 +0000 (16:57 +1200)]
CRM-20913 use pledge option group for pledge payments
Monish Deb [Wed, 2 Aug 2017 06:53:20 +0000 (12:23 +0530)]
Merge pull request #10303 from seamuslee001/CRM-20521
CRM-20521 Convert returning groups and mailings for CiviMail new mail…
Brian Shaughnessy [Wed, 2 Aug 2017 02:42:29 +0000 (22:42 -0400)]
CRM-21004 only remove html snippet task if setting enabled
Eileen McNaughton [Tue, 1 Aug 2017 22:45:34 +0000 (10:45 +1200)]
Merge pull request #10799 from JMAConsulting/CRM-21002
CRM-21002: Credit card type icons are incorrectly populated on backoffice live mode
deb.monish [Tue, 1 Aug 2017 21:52:40 +0000 (03:22 +0530)]
CRM-13309: Participant Role on Event's Schedule Reminder form does not populate
Seamus Lee [Mon, 31 Jul 2017 21:51:02 +0000 (21:51 +0000)]
CRM-20521 Ensure that only Mailing List groups appear in the receipients box
Seamus Lee [Thu, 1 Jun 2017 22:21:47 +0000 (08:21 +1000)]
CRM-20521 Ensure that Disabled groups are also excluded
Seamus Lee [Thu, 4 May 2017 11:23:31 +0000 (21:23 +1000)]
CRM-20521 Convert returning groups and mailings for CiviMail new mailing screen into an API request rather than loading in the DOM
deb.monish [Tue, 1 Aug 2017 18:45:30 +0000 (00:15 +0530)]
CRM-21002: Credit card type icons are incorrectly populated on backoffice live mode
colemanw [Tue, 1 Aug 2017 16:06:08 +0000 (12:06 -0400)]
Merge pull request #10796 from tschuettler/CRM-20995
CRM-20995 - API - Extension get - Filter by full_name
Thomas Schüttler [Tue, 1 Aug 2017 10:55:06 +0000 (12:55 +0200)]
Change new parameter to default to 'keys'
Jitendra Purohit [Tue, 1 Aug 2017 07:32:05 +0000 (13:02 +0530)]
CRM-21000 : Fix DB error on Advance Search Mailings
Eileen McNaughton [Mon, 31 Jul 2017 23:37:40 +0000 (11:37 +1200)]
Merge pull request #10340 from Stoob/master
CRM-20563 change fatal error message
colemanw [Mon, 31 Jul 2017 19:38:08 +0000 (15:38 -0400)]
Merge pull request #10795 from jitendrapurohit/CRM-20994
CRM-20994 : Fix hardcoded relationship type value
Monish Deb [Mon, 31 Jul 2017 17:38:03 +0000 (23:08 +0530)]
Merge pull request #10792 from seamuslee001/CRM-20989
CRM-20989 Fix Active provider count to know about multisite
Monish Deb [Mon, 31 Jul 2017 17:37:14 +0000 (23:07 +0530)]
Merge pull request #10789 from JMAConsulting/CRM-20987
CRM-20987, added batch transaction column
Thomas Schüttler [Mon, 31 Jul 2017 15:41:44 +0000 (17:41 +0200)]
Fix coding standard
Thomas Schüttler [Mon, 31 Jul 2017 15:39:32 +0000 (17:39 +0200)]
Fix undefined index in UnitTests
Thomas Schüttler [Mon, 31 Jul 2017 10:55:38 +0000 (12:55 +0200)]
CRM-20995 - API - Extension get - Filter by full_name
----------------------------------------
* CRM-20995: API - Extension get - Ignores parameter full_name as created by API explorer
https://issues.civicrm.org/jira/browse/CRM-20995
Jitendra Purohit [Mon, 31 Jul 2017 10:50:09 +0000 (16:20 +0530)]
CRM-20994 : Fix hardcoded relationship type value
Eileen McNaughton [Mon, 31 Jul 2017 07:08:09 +0000 (19:08 +1200)]
Merge pull request #10788 from JMAConsulting/CRM-20947
CRM-20947, fixed notice error on Activity tab
Pradeep Nayak [Mon, 31 Jul 2017 06:03:48 +0000 (11:33 +0530)]
CRM-20987, fixed unit test
----------------------------------------
* CRM-20987: Add transaction date field to listings of transactions
https://issues.civicrm.org/jira/browse/CRM-20987
fixed indexes