civicrm-core.git
6 years agoSupport multiple decimal places in CRM_Utils_Rule::money for currencies such as bitco...
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

6 years agoMerge pull request #10823 from mattwire/CRM-21031_financialtypedisplay
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

6 years agoFix 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

6 years agoMerge pull request #10801 from JMAConsulting/CRM-13309
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

6 years agoMerge pull request #10812 from kainukempowerment/keikelboom-civicoop
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

6 years agoMerge pull request #10813 from JMAConsulting/CRM-21019
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

6 years agoMerge pull request #10819 from tschuettler/CRM-21029
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

6 years agoMerge pull request #10744 from JMAConsulting/CRM-20942
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

6 years agolabel change
deb.monish [Fri, 4 Aug 2017 18:59:31 +0000 (00:29 +0530)]
label change

6 years agoCRM-21029 - Report - Fix Activity Report SQL Syntax Error
Thomas Schüttler [Fri, 4 Aug 2017 10:40:40 +0000 (12:40 +0200)]
CRM-21029 - Report - Fix Activity Report SQL Syntax Error

6 years agoMerge pull request #10816 from mattwire/nfc_activity_pseudoconstant
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

6 years agoMerge pull request #10709 from totten/master-ids-cleanbreak
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

6 years agoCRM-20926 - Resolve "exception"/"exceptions" discrepency. Improve test.
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.

6 years agoCRM-20926 - CRM_Core_Menu - Parse XML element <ids_arguments>
Tim Otten [Sat, 22 Jul 2017 03:15:30 +0000 (20:15 -0700)]
CRM-20926 - CRM_Core_Menu - Parse XML element <ids_arguments>

6 years agoCRM-20926 - CRM_Core_MenuTest - Add basic test for XML parsing
Tim Otten [Sat, 22 Jul 2017 03:00:39 +0000 (20:00 -0700)]
CRM-20926 - CRM_Core_MenuTest - Add basic test for XML parsing

6 years agoCRM-20926 - Kill Config.IDS.ini
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`.

6 years agoCRM-20926 - CRM_Core_IDS - Generate configuration from an array
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.

6 years agoCRM-20927 - civicrm_menu - Add test for reading/writing `module_data`
Tim Otten [Thu, 20 Jul 2017 06:07:25 +0000 (23:07 -0700)]
CRM-20927 - civicrm_menu - Add test for reading/writing `module_data`

6 years agoCRM-20927 - civicrm_menu - Update examples in `civicrm_generated.mysql`
Tim Otten [Thu, 20 Jul 2017 05:33:19 +0000 (22:33 -0700)]
CRM-20927 - civicrm_menu - Update examples in `civicrm_generated.mysql`

6 years agoCRM-20927 - civicrm_menu - Add generic column for other data
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`.

6 years agoCRM_Core_BAO_Navigation::getMenus() - Remove unused function
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.

6 years agoMerge pull request #10679 from yashodha/4.7.CRM-20733
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

6 years agoMerge pull request #10802 from lcdservices/CRM-21004
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

6 years agoMerge pull request #10798 from jitendrapurohit/CRM-21000Fix
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

6 years agoReplace deprecated code and hardcoded IDs with pseudoconstants.
Matthew Wire [Thu, 3 Aug 2017 22:30:24 +0000 (23:30 +0100)]
Replace deprecated code and hardcoded IDs with pseudoconstants.

6 years agoMerge pull request #10712 from davidjosephhayes/master
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

6 years agoMerge pull request #10794 from tschuettler/CRM-20993
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

6 years agoMerge pull request #10781 from eileenmcnaughton/postal
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

6 years agoAllow filtering when return options are set
Thomas Schüttler [Mon, 31 Jul 2017 10:30:23 +0000 (12:30 +0200)]
Allow filtering when return options are set

6 years agoCRM-20993 - API - Extention get - Fix filtering by ID
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

6 years agoMerge pull request #10808 from jmcclelland/CRM-20790
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

6 years agoKlaas Eikelboom (Kainuk Empowerment) is member of CiviCooP
Klaas Eikelboom [Thu, 3 Aug 2017 07:07:46 +0000 (03:07 -0400)]
Klaas Eikelboom (Kainuk Empowerment) is member of CiviCooP

6 years agoCRM-21019, Changed column labels
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

6 years agoSet version to 4.7.25
CiviCRM [Thu, 3 Aug 2017 05:24:44 +0000 (05:24 +0000)]
Set version to 4.7.25

6 years agoMerge pull request #10811 from jitendrapurohit/CRM-20913-sync-inprogress
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

6 years agoCRM-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

6 years agoMerge pull request #10807 from mattwire/link_to_release_notes
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

6 years agoMerge pull request #10803 from jitendrapurohit/CRM-20913-sync-ov
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

6 years agoMerge pull request #10806 from JMAConsulting/CRM-20610-2
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

6 years agoCRM-20790 - ensure relationships are created on import
Jamie McClelland [Wed, 2 Aug 2017 17:54:20 +0000 (13:54 -0400)]
CRM-20790 - ensure relationships are created on import

6 years agoAdd link to release notes
Matthew Wire [Wed, 2 Aug 2017 15:51:13 +0000 (16:51 +0100)]
Add link to release notes

6 years agoadd metadata to trxn_id
deb.monish [Wed, 2 Aug 2017 14:11:03 +0000 (19:41 +0530)]
add metadata to trxn_id

6 years agoCRM-21004: change conditions under which we remove html snippet action
Brian Shaughnessy [Wed, 2 Aug 2017 13:54:52 +0000 (09:54 -0400)]
CRM-21004: change conditions under which we remove html snippet action

6 years agoCRM-20610: 'Payment Edit' form improvements
deb.monish [Tue, 1 Aug 2017 10:45:40 +0000 (16:15 +0530)]
CRM-20610: 'Payment Edit' form improvements

6 years agoMerge pull request #10677 from fuzionnz/CRM-20885-suppress_fakefile_error
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.

6 years agosync value for overdue with contribution status for safety
Jitendra Purohit [Wed, 2 Aug 2017 08:56:16 +0000 (14:26 +0530)]
sync value for overdue with contribution status for safety

6 years agoCRM-20913 use pledge option group for pledge payments
eileen [Mon, 31 Jul 2017 04:57:44 +0000 (16:57 +1200)]
CRM-20913 use pledge option group for pledge payments

6 years agoMerge pull request #10303 from seamuslee001/CRM-20521
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…

6 years agoCRM-21004 only remove html snippet task if setting enabled
Brian Shaughnessy [Wed, 2 Aug 2017 02:42:29 +0000 (22:42 -0400)]
CRM-21004 only remove html snippet task if setting enabled

6 years agoMerge pull request #10799 from JMAConsulting/CRM-21002
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

6 years agoCRM-13309: Participant Role on Event's Schedule Reminder form does not populate
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

6 years agoCRM-20521 Ensure that only Mailing List groups appear in the receipients box
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

6 years agoCRM-20521 Ensure that Disabled groups are also excluded
Seamus Lee [Thu, 1 Jun 2017 22:21:47 +0000 (08:21 +1000)]
CRM-20521 Ensure that Disabled groups are also excluded

6 years agoCRM-20521 Convert returning groups and mailings for CiviMail new mailing screen into...
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

6 years agoCRM-21002: Credit card type icons are incorrectly populated on backoffice live mode
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

6 years agoMerge pull request #10796 from tschuettler/CRM-20995
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

6 years agoChange new parameter to default to 'keys'
Thomas Schüttler [Tue, 1 Aug 2017 10:55:06 +0000 (12:55 +0200)]
Change new parameter to default to 'keys'

6 years agoCRM-21000 : Fix DB error on Advance Search Mailings
Jitendra Purohit [Tue, 1 Aug 2017 07:32:05 +0000 (13:02 +0530)]
CRM-21000 : Fix DB error on Advance Search Mailings

6 years agoMerge pull request #10340 from Stoob/master
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

6 years agoMerge pull request #10795 from jitendrapurohit/CRM-20994
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

6 years agoMerge pull request #10792 from seamuslee001/CRM-20989
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

6 years agoMerge pull request #10789 from JMAConsulting/CRM-20987
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

6 years agoFix coding standard
Thomas Schüttler [Mon, 31 Jul 2017 15:41:44 +0000 (17:41 +0200)]
Fix coding standard

6 years agoFix undefined index in UnitTests
Thomas Schüttler [Mon, 31 Jul 2017 15:39:32 +0000 (17:39 +0200)]
Fix undefined index in UnitTests

6 years agoCRM-20995 - API - Extension get - Filter by full_name
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

6 years agoCRM-20994 : Fix hardcoded relationship type value
Jitendra Purohit [Mon, 31 Jul 2017 10:50:09 +0000 (16:20 +0530)]
CRM-20994 : Fix hardcoded relationship type value

6 years agoMerge pull request #10788 from JMAConsulting/CRM-20947
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

6 years agoCRM-20987, fixed unit test
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

6 years agoAdd Unit test to provde domain filtering is working with activeProviderCount
Seamus Lee [Mon, 31 Jul 2017 06:36:48 +0000 (16:36 +1000)]
Add Unit test to provde domain filtering is working with activeProviderCount

6 years agoCRM-20989 Fix Active provider count to know about multistie and return a proper count
Seamus Lee [Mon, 31 Jul 2017 06:11:57 +0000 (16:11 +1000)]
CRM-20989 Fix Active provider count to know about multistie and return a proper count

6 years agoCRM-20947, fixed notice error
Pradeep Nayak [Mon, 31 Jul 2017 02:03:01 +0000 (07:33 +0530)]
CRM-20947, fixed notice error

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

fixed fieldname

6 years agoMerge pull request #10763 from JMAConsulting/CRM-20967
Eileen McNaughton [Mon, 31 Jul 2017 05:10:54 +0000 (17:10 +1200)]
Merge pull request #10763 from JMAConsulting/CRM-20967

CRM-20967, use is_payment = TRUE to retrieve payments

6 years agoMerge pull request #10787 from JMAConsulting/CRM-20984
Eileen McNaughton [Mon, 31 Jul 2017 03:39:16 +0000 (15:39 +1200)]
Merge pull request #10787 from JMAConsulting/CRM-20984

CRM-20984: Move placement of payment processor field

6 years agoCRM-20987, added batch transaction column
Pradeep Nayak [Mon, 31 Jul 2017 02:59:34 +0000 (08:29 +0530)]
CRM-20987, added batch transaction column

----------------------------------------
* CRM-20987: Add transaction date field to listings of transactions
  https://issues.civicrm.org/jira/browse/CRM-20987

6 years agoCRM-20947, fixed notice error on Activity tab
Pradeep Nayak [Mon, 31 Jul 2017 01:57:54 +0000 (07:27 +0530)]
CRM-20947, fixed notice error on Activity tab

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

6 years agoMerge pull request #10726 from JMAConsulting/CRM-20946
Eileen McNaughton [Sun, 30 Jul 2017 21:52:59 +0000 (09:52 +1200)]
Merge pull request #10726 from JMAConsulting/CRM-20946

CRM-20946, use line total of line item to store in financial item table

6 years agoCRM-20984: Move placement of payment processor field
deb.monish [Sun, 30 Jul 2017 20:43:26 +0000 (02:13 +0530)]
CRM-20984: Move placement of payment processor field

6 years agoMerge pull request #10765 from seamuslee001/report_fixes
Monish Deb [Sun, 30 Jul 2017 19:07:41 +0000 (00:37 +0530)]
Merge pull request #10765 from seamuslee001/report_fixes

CRM-20969 Fix issues in order by clauses of reports showing errors in 7.1

6 years agoadded unit test
deb.monish [Sat, 29 Jul 2017 18:42:10 +0000 (00:12 +0530)]
added unit test

6 years agoCRM-20946, use line total of line itme to store in financial item table
Pradeep Nayak [Sun, 23 Jul 2017 10:05:01 +0000 (15:35 +0530)]
CRM-20946, use line total of line itme to store in financial item table

----------------------------------------
* CRM-20946: Wrong entries in financial table when contribution is cancelled
  https://issues.civicrm.org/jira/browse/CRM-20946

6 years agoRemove orderBy function following Eileen's testing
Seamus Lee [Sun, 30 Jul 2017 06:39:24 +0000 (16:39 +1000)]
Remove orderBy function following Eileen's testing

6 years agoUse the orderByArray and groupByArray variables
Seamus Lee [Sat, 29 Jul 2017 05:26:42 +0000 (15:26 +1000)]
Use the orderByArray and groupByArray variables

6 years agoCRM-20969 alternate approach to resolving php 7.1 errors
eileen [Fri, 28 Jul 2017 02:23:03 +0000 (14:23 +1200)]
CRM-20969 alternate approach to resolving php 7.1 errors

I am proposing this as an alternate approach for fixing the 7.1 errors.

Note this only covers one report - I think we should move that function which is actually
generic to the parent class, however I think the one in contribute.summary is
a bit more nuanced.

Note this is also the approach taken by the extendedreport
extension (which takes it a little further). I will remove the declaration of
groupByArray from that extension if we add it here

I do have a medium term plan to move a lot of the helpers from extended report back into core.

Change-Id: I377d33a7417ff93169f12ccbda77f3662da5bac1

6 years agoFix issues in order by clauses of reports showing errors in 7.1
Seamus Lee [Tue, 25 Jul 2017 07:54:12 +0000 (17:54 +1000)]
Fix issues in order by clauses of reports showing errors in 7.1

6 years agoMerge pull request #10737 from jitendrapurohit/CRM-20913
Monish Deb [Sat, 29 Jul 2017 19:49:31 +0000 (01:19 +0530)]
Merge pull request #10737 from jitendrapurohit/CRM-20913

CRM-20913 - Add separate option group for pledge status

6 years agoMerge pull request #10699 from JMAConsulting/CRM-20321-1
colemanw [Sat, 29 Jul 2017 17:59:31 +0000 (13:59 -0400)]
Merge pull request #10699 from JMAConsulting/CRM-20321-1

[re-submitted and unchanged] CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity

6 years agoMerge pull request #10383 from MegaphoneJon/unsupervised-reserved-threshold
colemanw [Sat, 29 Jul 2017 14:15:59 +0000 (10:15 -0400)]
Merge pull request #10383 from MegaphoneJon/unsupervised-reserved-threshold

CRM-20607 - Dedupe - Allow saving reserved groups

6 years agogenerated data
Jitendra Purohit [Sat, 29 Jul 2017 05:12:09 +0000 (10:42 +0530)]
generated data

6 years agoMerge pull request #10782 from JMAConsulting/CRM-20947
Eileen McNaughton [Sat, 29 Jul 2017 02:58:44 +0000 (14:58 +1200)]
Merge pull request #10782 from JMAConsulting/CRM-20947

CRM-20947, fixed notice error for deprecated function on batch form

6 years agoMerge pull request #10784 from totten/master-prtpl
Eileen McNaughton [Sat, 29 Jul 2017 02:55:42 +0000 (14:55 +1200)]
Merge pull request #10784 from totten/master-prtpl

CRM-20965 - PULL_REQUEST_TEMPLATE - Change header notation

6 years agoCRM-20965 - PULL_REQUEST_TEMPLATE - Change header notation
Tim Otten [Sat, 29 Jul 2017 00:24:00 +0000 (17:24 -0700)]
CRM-20965 - PULL_REQUEST_TEMPLATE - Change header notation

If you use the `#` notation for headers, the Github CLI (`hub pull-request`)
would filter out those lines as comments.

Using the `---` notation should provide that.

6 years agoMerge pull request #10741 from JMAConsulting/CRM-20952
colemanw [Fri, 28 Jul 2017 20:01:06 +0000 (16:01 -0400)]
Merge pull request #10741 from JMAConsulting/CRM-20952

[ready for review] CRM-20952 Refresh membership tab if contribution is membership payment

6 years agoMerge pull request #10698 from jitendrapurohit/CRM-20910
colemanw [Fri, 28 Jul 2017 19:25:23 +0000 (15:25 -0400)]
Merge pull request #10698 from jitendrapurohit/CRM-20910

CRM-20910: Check permission param while retrieving participants from api

6 years agoMerge pull request #10348 from eileenmcnaughton/token
Monish Deb [Fri, 28 Jul 2017 17:57:54 +0000 (23:27 +0530)]
Merge pull request #10348 from eileenmcnaughton/token

CRM-20577 - When creating an activity per-contact when sending letters, store the version with rendered tokens

6 years agoCRM-20947, fixed notice error for deprecated function on batch form
Pradeep Nayak [Fri, 28 Jul 2017 16:44:49 +0000 (22:14 +0530)]
CRM-20947, fixed notice error for deprecated function on batch form

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

6 years agoCRM-20577 Fix activities to record actual html if activity per contact
eileen [Mon, 15 May 2017 06:47:59 +0000 (18:47 +1200)]
CRM-20577 Fix activities to record actual html if activity per contact

(At least, this covers contributions at this stage).

I have also tried to move towards clearer inputs & outpus on createActivities, with the
weirdness around contactIds being moved up to the forms themselves and
not being passed in. Would prefer not to see form passed in either but, next time.

Unit tests cover emails & activity create (for the first time)

6 years agoTowards CRM-20577 preliminary form tidy up
eileen [Mon, 15 May 2017 03:17:34 +0000 (15:17 +1200)]
Towards CRM-20577 preliminary form tidy up

6 years ago[nfc] Add Unit test for group by in pdf letters.
eileen [Sat, 13 May 2017 08:49:56 +0000 (20:49 +1200)]
[nfc] Add Unit test for group by in pdf letters.

In addition to the unit test there is a minor change to not do the early return before assigning variables
if smarty is not set. This doesn't really have any performance advantage, as they are already calculated,
blocks the unit test and also blocks using these variables from outside extensions

6 years agoMerge pull request #10758 from mickadoo/CRM-20965_add-pull-request-template
Eileen McNaughton [Fri, 28 Jul 2017 11:03:39 +0000 (23:03 +1200)]
Merge pull request #10758 from mickadoo/CRM-20965_add-pull-request-template

CRM-20965: Add PR template

6 years agoMerge pull request #10753 from seamuslee001/CRM-20962
Eileen McNaughton [Fri, 28 Jul 2017 06:42:45 +0000 (18:42 +1200)]
Merge pull request #10753 from seamuslee001/CRM-20962

CRM-20962 Fix issue where we were passing through a string when it sh…