civicrm-core.git
7 years agoNFC minor code simplification on comparing pledge status
eileen [Tue, 15 Aug 2017 18:21:53 +0000 (14:21 -0400)]
NFC minor code simplification on comparing pledge status

7 years agoCRM-17281: BAO test for pledge payments where the amount is greater than the usual...
Mathieu Lutfy [Thu, 9 Jun 2016 18:39:55 +0000 (18:39 +0000)]
CRM-17281: BAO test for pledge payments where the amount is greater than the usual installment amount.

7 years agoMerge pull request #10854 from agileware/patch-2
Eileen McNaughton [Tue, 15 Aug 2017 14:56:49 +0000 (10:56 -0400)]
Merge pull request #10854 from agileware/patch-2

CRM-21061 - Change report_id from 64 to 512 to match civicrm_option_v…

7 years agoMerge pull request #10855 from JKingsnorth/patch-7
Eileen McNaughton [Tue, 15 Aug 2017 14:55:56 +0000 (10:55 -0400)]
Merge pull request #10855 from JKingsnorth/patch-7

[NFC] Simplify method of getting logged in contact ID

7 years agoMerge pull request #1 from seamuslee001/agileware-patch-2
Agileware [Mon, 14 Aug 2017 20:28:03 +0000 (06:28 +1000)]
Merge pull request #1 from seamuslee001/agileware-patch-2

Regenerate DAOs and Upgrade step to fix current installs

7 years agoMerge pull request #10728 from mattwire/CRM-18082_civicase-api-custom-data
colemanw [Mon, 14 Aug 2017 17:11:08 +0000 (13:11 -0400)]
Merge pull request #10728 from mattwire/CRM-18082_civicase-api-custom-data

CRM-18082 - Allow case API create to work with custom data

7 years ago[NFC] Simplify method of getting logged in contact ID
John Kingsnorth [Mon, 14 Aug 2017 13:38:31 +0000 (14:38 +0100)]
[NFC] Simplify method of getting logged in contact ID

Use the existing utility function getLoggedInContactID, rather than loading the session and then calling get->userID.

7 years agoRegenerate DAOs and Upgrade step to fix current installs
Seamus Lee [Mon, 14 Aug 2017 09:10:54 +0000 (19:10 +1000)]
Regenerate DAOs and Upgrade step to fix current installs

7 years agoCRM-21061 - Change report_id from 64 to 512 to match civicrm_option_value
Agileware [Mon, 14 Aug 2017 07:38:17 +0000 (17:38 +1000)]
CRM-21061 - Change report_id from 64 to 512 to match civicrm_option_value

Change civicrm_report_instance, report_id from 64 characters to 512 characters to match civicrm_option_value, value to avoid errors caused by truncating CiviCRM report name which are greater than 64 chars.

https://issues.civicrm.org/jira/browse/CRM-21061

7 years agoMerge pull request #10716 from jitendrapurohit/CRM-20933
Eileen McNaughton [Sat, 12 Aug 2017 18:20:29 +0000 (14:20 -0400)]
Merge pull request #10716 from jitendrapurohit/CRM-20933

CRM-20933 - Updating Pay later event registration from backend produc…

7 years agoMerge pull request #10661 from jitendrapurohit/CRM-20507
Eileen McNaughton [Sat, 12 Aug 2017 18:18:42 +0000 (14:18 -0400)]
Merge pull request #10661 from jitendrapurohit/CRM-20507

CRM-20507 - Allow only public custom groups to display on participant receipts

7 years agoCRM-21054 - Fix is_create_activities param for fetch_activities job (#10846)
Jitendra Purohit [Sat, 12 Aug 2017 18:17:32 +0000 (23:47 +0530)]
CRM-21054 - Fix is_create_activities param for fetch_activities job (#10846)

* Fix is_create_activities param for fetch_activities

* set create activity to always be true

7 years agoMerge pull request #10694 from dsnopek/composer-library
Tim Otten [Sat, 12 Aug 2017 07:29:32 +0000 (00:29 -0700)]
Merge pull request #10694 from dsnopek/composer-library

CRM-17652 - Update composer and Symfony for Drupal 8

7 years agoMerge pull request #10825 from mattwire/tag_deprecated_comments
Eileen McNaughton [Fri, 11 Aug 2017 22:05:23 +0000 (18:05 -0400)]
Merge pull request #10825 from mattwire/tag_deprecated_comments

CRM-21036 NFC Change comments to tags so phpstorm picks up the deprecated functions

7 years agoMerge pull request #10828 from JMAConsulting/CRM-21039
Eileen McNaughton [Fri, 11 Aug 2017 22:03:37 +0000 (18:03 -0400)]
Merge pull request #10828 from JMAConsulting/CRM-21039

CRM-21039, Trying to add Asset account relationship throws validation error

7 years agoMerge pull request #10843 from agileware/patch-1
Eileen McNaughton [Fri, 11 Aug 2017 21:54:33 +0000 (17:54 -0400)]
Merge pull request #10843 from agileware/patch-1

Update CONTRIBUTORS.txt

7 years agoMerge pull request #10848 from lcdservices/CRM-21057
colemanw [Fri, 11 Aug 2017 13:51:04 +0000 (09:51 -0400)]
Merge pull request #10848 from lcdservices/CRM-21057

CRM-21057: pass limit to retrieve all mapping values

7 years agoMerge pull request #10845 from JMAConsulting/CRM-21055
colemanw [Fri, 11 Aug 2017 13:17:57 +0000 (09:17 -0400)]
Merge pull request #10845 from JMAConsulting/CRM-21055

CRM-21055,   Change the label of cancel button to close on Contribution form

7 years agoCRM-21057: pass limit to retrieve all mapping values
Brian Shaughnessy [Fri, 11 Aug 2017 02:23:40 +0000 (22:23 -0400)]
CRM-21057: pass limit to retrieve all mapping values

7 years agoRemove blank lines
Matthew Wire [Thu, 10 Aug 2017 20:37:58 +0000 (21:37 +0100)]
Remove blank lines

7 years agoUse CRM_Utils_Array:first() for robustness
Matthew Wire [Thu, 10 Aug 2017 20:33:12 +0000 (21:33 +0100)]
Use CRM_Utils_Array:first() for robustness

7 years agoMerge pull request #10836 from JMAConsulting/CRM-21047
colemanw [Thu, 10 Aug 2017 16:48:13 +0000 (12:48 -0400)]
Merge pull request #10836 from JMAConsulting/CRM-21047

CRM-21047, fixed JS error on new contribution form

7 years agoMerge pull request #10791 from JMAConsulting/CRM-20988
colemanw [Thu, 10 Aug 2017 16:47:06 +0000 (12:47 -0400)]
Merge pull request #10791 from JMAConsulting/CRM-20988

CRM-20988,Don't display option of Export, Delete etc to users who lack that permission

7 years agoCRM-21055, Changed label of cancel button
Pradeep Nayak [Wed, 9 Aug 2017 17:23:47 +0000 (22:53 +0530)]
CRM-21055, Changed label of cancel button

----------------------------------------
* CRM-21055: Change label of cancel button
  https://issues.civicrm.org/jira/browse/CRM-21055

7 years agoUpdate CONTRIBUTORS.txt
Agileware [Thu, 10 Aug 2017 03:13:14 +0000 (13:13 +1000)]
Update CONTRIBUTORS.txt

Include names of actual Agileware team members who have submitted PRs for CiviCRM 4.7 and 4.6

7 years agoMerge pull request #10840 from MegaphoneJon/contributor-update
Tim Otten [Wed, 9 Aug 2017 19:03:44 +0000 (12:03 -0700)]
Merge pull request #10840 from MegaphoneJon/contributor-update

Update Jon Goldberg in CONTRIBUTORS.txt

7 years agoUpdate Jon Goldberg in CONTRIBUTORS.txt
Jon goldberg [Wed, 9 Aug 2017 17:55:35 +0000 (13:55 -0400)]
Update Jon Goldberg in CONTRIBUTORS.txt

7 years agoMerge pull request #10394 from JMAConsulting/DonotExport
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

7 years agoMerge pull request #10837 from civicrm/4.7.24-rc
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

7 years agoMerge pull request #10814 from JMAConsulting/CRM-20610-3-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

7 years agoCRM-21047, fixed JS error
Pradeep Nayak [Wed, 9 Aug 2017 13:14:11 +0000 (18:44 +0530)]
CRM-21047, fixed JS error

----------------------------------------
* CRM-21047: TypeError: financialtypeIds is undefined, on contribution form
  https://issues.civicrm.org/jira/browse/CRM-21047

7 years agoMerge pull request #10833 from JMAConsulting/CRM-20800-rc
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

7 years agoWe don't need to return custom data on create
Matthew Wire [Wed, 9 Aug 2017 08:32:54 +0000 (09:32 +0100)]
We don't need to return custom data on create

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

7 years agoMerge pull request #10793 from eileenmcnaughton/tpl
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

7 years agoMerge pull request #10427 from mattwire/report_bounce_type
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

7 years agoMerge pull request #10824 from seamuslee001/CRM-21026
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…

7 years agoMerge pull request #10827 from mattwire/CRM-17157_support_multiple_decimalplaces_form...
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

7 years agoRevert usage of dirname()'s 2nd argument to support PHP version used by Jenkins
David Snopek [Tue, 8 Aug 2017 21:08:17 +0000 (16:08 -0500)]
Revert usage of dirname()'s 2nd argument to support PHP version used by Jenkins

7 years agoMerge pull request #10817 from JMAConsulting/CRM-21005
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

7 years agoMinor comment fixes and further reduction of passing by reference with changing to...
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

7 years agoDon't use ts for exceptions
Matthew Wire [Mon, 7 Aug 2017 15:20:08 +0000 (16:20 +0100)]
Don't use ts for exceptions

7 years agoUse 2nd argument of dirname() and add a comment explaining paths.
David Snopek [Mon, 7 Aug 2017 14:11:09 +0000 (09:11 -0500)]
Use 2nd argument of dirname() and add a comment explaining paths.

7 years agoMerge pull request #10818 from eileenmcnaughton/recur_date
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

7 years agoCRM-21039, Retrieve relationship using entity table
Pradeep Nayak [Mon, 7 Aug 2017 11:01:09 +0000 (16:31 +0530)]
CRM-21039, Retrieve relationship using entity table

----------------------------------------
* CRM-21039: Trying to add Asset account relationship throws validation error
  https://issues.civicrm.org/jira/browse/CRM-21039

fixed style warning

7 years agoAdd unit tests for case create api custom data
Matthew Wire [Mon, 7 Aug 2017 11:33:28 +0000 (12:33 +0100)]
Add unit tests for case create api custom data

7 years agocontact_id is optional when updating case, this change allows existing Case unit...
Matthew Wire [Mon, 7 Aug 2017 11:20:41 +0000 (12:20 +0100)]
contact_id is optional when updating case, this change allows existing Case unit tests to pass

7 years agoCheckstyle
Matthew Wire [Mon, 7 Aug 2017 11:08:25 +0000 (12:08 +0100)]
Checkstyle

7 years agoAdd unit test
Matthew Wire [Mon, 7 Aug 2017 10:56:14 +0000 (11:56 +0100)]
Add unit test

7 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

7 years agoStyle warning
Matthew Wire [Mon, 7 Aug 2017 10:34:16 +0000 (11:34 +0100)]
Style warning

7 years agoFix style warnings
Matthew Wire [Mon, 7 Aug 2017 10:31:22 +0000 (11:31 +0100)]
Fix style warnings

7 years agoAdd deprecated label to case update api function
Matthew Wire [Mon, 7 Aug 2017 10:24:50 +0000 (11:24 +0100)]
Add deprecated label to case update api function

7 years agoRefactor based on comments from @davialexandre
Matthew Wire [Mon, 7 Aug 2017 10:20:54 +0000 (11:20 +0100)]
Refactor based on comments from @davialexandre

7 years agoChange comments to tags so phpstorm picks up the deprecated functions
Matthew Wire [Mon, 7 Aug 2017 08:52:55 +0000 (09:52 +0100)]
Change comments to tags so phpstorm picks up the deprecated functions

7 years agoadditional fix
deb.monish [Mon, 7 Aug 2017 08:42:53 +0000 (14:12 +0530)]
additional fix

7 years agoCode updates as per Eileen
Seamus Lee [Mon, 7 Aug 2017 06:31:31 +0000 (16:31 +1000)]
Code updates as per Eileen

7 years agoAttempt to get rid of pasing by reference and change variable as needed
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

7 years agoCRM-21026 fix issue with ContributionCount not including disabled financialtypes
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

7 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

7 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

7 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

7 years agotest build failure fix
deb.monish [Fri, 4 Aug 2017 17:40:03 +0000 (23:10 +0530)]
test build failure fix

7 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

7 years agoMerge pull request #10820 from JMAConsulting/CRM-21029
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

7 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

7 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

7 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

7 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

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

7 years agoconcatenate check_number and trxn_id in contribution
deb.monish [Fri, 4 Aug 2017 12:44:02 +0000 (18:14 +0530)]
concatenate check_number and trxn_id in contribution

7 years agoadditional fixes
deb.monish [Fri, 4 Aug 2017 11:07:29 +0000 (16:37 +0530)]
additional fixes

7 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

7 years agoCRM-21027 Fix next recurring payment not accurately calculated when effective date...
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

7 years agoCRM-21005, mark payment instrument as required
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

7 years agoCRM-21005, set amount to default owed
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

7 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

7 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

7 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.

7 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>

7 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

7 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`.

7 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.

7 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`

7 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`

7 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`.

7 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.

7 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

7 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

7 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

7 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.

7 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

7 years agoCRM-17652 - composer.lock - Add unit test to redflag policy change
Tim Otten [Fri, 21 Jul 2017 18:12:38 +0000 (11:12 -0700)]
CRM-17652 - composer.lock - Add unit test to redflag policy change

7 years agoOops! Bad conversion of Symfony 2.5 to 2.6 code
David Snopek [Fri, 21 Jul 2017 16:36:48 +0000 (11:36 -0500)]
Oops! Bad conversion of Symfony 2.5 to 2.6 code

7 years agoGot bin/cli.php bootstrapping Drupal (or at least not crashing when trying to do so)
David Snopek [Fri, 21 Jul 2017 16:27:59 +0000 (11:27 -0500)]
Got bin/cli.php bootstrapping Drupal (or at least not crashing when trying to do so)

7 years agoSwitch back to old PHP array syntax
David Snopek [Fri, 21 Jul 2017 15:56:25 +0000 (10:56 -0500)]
Switch back to old PHP array syntax

7 years agoUpdate to Symfony 2.6 as lowest supported version, so we can be compatible with Symfo...
David Snopek [Fri, 21 Jul 2017 15:50:30 +0000 (10:50 -0500)]
Update to Symfony 2.6 as lowest supported version, so we can be compatible with Symfony 3.x (need new method to replace deprecated method)

7 years agoTry Symfony 3.x for Drupal 8.4.x
David Snopek [Fri, 21 Jul 2017 14:11:23 +0000 (09:11 -0500)]
Try Symfony 3.x for Drupal 8.4.x

7 years agoOnly load autoload.php from local vendor directory if it exists
David Snopek [Thu, 20 Jul 2017 17:31:04 +0000 (12:31 -0500)]
Only load autoload.php from local vendor directory if it exists

7 years agoSwitch 'authors' to CiviCRM core team and community
David Snopek [Wed, 19 Jul 2017 18:30:02 +0000 (13:30 -0500)]
Switch 'authors' to CiviCRM core team and community