civicrm-core.git
5 years agoUse events for CMS resource loading
Coleman Watts [Thu, 25 Apr 2019 14:41:49 +0000 (10:41 -0400)]
Use events for CMS resource loading

5 years agoMerge pull request #14108 from mattwire/form_activity_hardcoded_ids
Eileen McNaughton [Tue, 23 Apr 2019 23:06:49 +0000 (09:06 +1000)]
Merge pull request #14108 from mattwire/form_activity_hardcoded_ids

REF Replace hardcoded IDs with pseudoconstants in activity form

5 years agoMerge pull request #14115 from civicrm/5.13
Seamus Lee [Tue, 23 Apr 2019 05:49:37 +0000 (15:49 +1000)]
Merge pull request #14115 from civicrm/5.13

5.13

5 years agoMerge pull request #14114 from lcdservices/5.13
Seamus Lee [Tue, 23 Apr 2019 04:17:21 +0000 (14:17 +1000)]
Merge pull request #14114 from lcdservices/5.13

dev/core#891 condition on id existenced when retrieving mailing hash

5 years agodev/core#891 condition on id existenced when retrieving mailing hash
Brian Shaughnessy [Tue, 23 Apr 2019 01:43:19 +0000 (21:43 -0400)]
dev/core#891 condition on id existenced when retrieving mailing hash

5 years agoMerge pull request #14084 from colemanw/UFFieldBAO
Seamus Lee [Tue, 23 Apr 2019 01:51:26 +0000 (11:51 +1000)]
Merge pull request #14084 from colemanw/UFFieldBAO

(REF) Standardize UFField create function

5 years agoAdd UFField to syntaxConformanceTest
Coleman Watts [Mon, 22 Apr 2019 12:22:13 +0000 (08:22 -0400)]
Add UFField to syntaxConformanceTest

5 years agoMerge pull request #14105 from eileenmcnaughton/import
Seamus Lee [Mon, 22 Apr 2019 20:27:38 +0000 (06:27 +1000)]
Merge pull request #14105 from eileenmcnaughton/import

 [REF] calll formatLocationBlock from parent function.

5 years agoMerge pull request #14107 from mattwire/formbuttons_formatting
Seamus Lee [Mon, 22 Apr 2019 20:27:18 +0000 (06:27 +1000)]
Merge pull request #14107 from mattwire/formbuttons_formatting

NFC Whitespace formatting for formButtons.tpl

5 years agoMerge pull request #14111 from mlutfy/sms-ts
Seamus Lee [Mon, 22 Apr 2019 20:26:53 +0000 (06:26 +1000)]
Merge pull request #14111 from mlutfy/sms-ts

Fix ts() usage in CRM_SMS_Form_Schedule

5 years agoReplace hardcoded IDs with pseudoconstants in activity form
Matthew Wire (MJW Consulting) [Mon, 22 Apr 2019 12:22:08 +0000 (13:22 +0100)]
Replace hardcoded IDs with pseudoconstants in activity form

5 years agoFix ts() usage in CRM_SMS_Form_Schedule
Mathieu Lutfy [Mon, 22 Apr 2019 13:20:28 +0000 (09:20 -0400)]
Fix ts() usage in CRM_SMS_Form_Schedule

5 years ago(REF) Standardize UFField create function
Coleman Watts [Thu, 18 Apr 2019 18:00:51 +0000 (14:00 -0400)]
(REF) Standardize UFField create function

5 years agoFix creating Formatting fields in api and UI
Coleman Watts [Thu, 18 Apr 2019 17:52:25 +0000 (13:52 -0400)]
Fix creating Formatting fields in api and UI

5 years agoWhitespace formatting for formButtons.tpl
Matthew Wire (MJW Consulting) [Mon, 22 Apr 2019 11:54:41 +0000 (12:54 +0100)]
Whitespace formatting for formButtons.tpl

5 years agoRemove now-redundant if
eileen [Fri, 12 Apr 2019 07:55:15 +0000 (17:55 +1000)]
Remove now-redundant if

This is no longer called when location_type_id is empty

5 years ago[REF] calll formatLocationBlock from parent function.
eileen [Fri, 12 Apr 2019 07:18:11 +0000 (17:18 +1000)]
[REF] calll formatLocationBlock from parent function.

This is about starting to unnest the spaghetti of functions here.....
Just deprecating for now in case

5 years agoMerge pull request #14099 from seamuslee001/pledge_dates_contribution_form_conversion
Eileen McNaughton [Mon, 22 Apr 2019 08:03:25 +0000 (18:03 +1000)]
Merge pull request #14099 from seamuslee001/pledge_dates_contribution_form_conversion

Convert Pledge Calander Date and Start Date for pledges to use datepic…

5 years agoConvert Pledge Calander Date and Start Date for pleges to use datepicker rather than...
Seamus Lee [Sun, 21 Apr 2019 23:45:41 +0000 (09:45 +1000)]
Convert Pledge Calander Date and Start Date for pleges to use datepicker rather than jcalendar

5 years agoMerge pull request #14101 from civicrm/5.13
Seamus Lee [Mon, 22 Apr 2019 02:41:41 +0000 (12:41 +1000)]
Merge pull request #14101 from civicrm/5.13

5.13

5 years agoMerge pull request #14100 from seamuslee001/5.13
Seamus Lee [Mon, 22 Apr 2019 01:52:07 +0000 (11:52 +1000)]
Merge pull request #14100 from seamuslee001/5.13

Add release-notes/5.12.3.md

5 years agoAdd release-notes/5.12.3.md
Tim Otten [Sat, 20 Apr 2019 15:44:42 +0000 (08:44 -0700)]
Add release-notes/5.12.3.md

5 years agoMerge pull request #13890 from aydun/joomla#6
Seamus Lee [Mon, 22 Apr 2019 00:27:38 +0000 (10:27 +1000)]
Merge pull request #13890 from aydun/joomla#6

Fix bug preventing affecting `cv --user` on Joomla

5 years agoMerge pull request #14096 from colemanw/tags
colemanw [Sun, 21 Apr 2019 17:32:18 +0000 (13:32 -0400)]
Merge pull request #14096 from colemanw/tags

Add serialize metadata to tag used_for field

5 years agoRemove problematic serialize handing from conformance test
Coleman Watts [Sun, 21 Apr 2019 15:08:18 +0000 (11:08 -0400)]
Remove problematic serialize handing from conformance test

5 years agoMerge pull request #14088 from MegaphoneJon/membership-9
Eileen McNaughton [Sun, 21 Apr 2019 01:27:35 +0000 (11:27 +1000)]
Merge pull request #14088 from MegaphoneJon/membership-9

membership#9 - show user a notification on back-office renewals

5 years agoAdd serialize metadata to tag used_for field
Coleman Watts [Sun, 21 Apr 2019 00:24:08 +0000 (20:24 -0400)]
Add serialize metadata to tag used_for field

The used_for field is a comma separated list.

5 years agoMerge pull request #13963 from eileenmcnaughton/event_report
Seamus Lee [Sat, 20 Apr 2019 20:41:11 +0000 (06:41 +1000)]
Merge pull request #13963 from eileenmcnaughton/event_report

Readability cleanup on EventIncome report (towards bringing it under testing)

5 years agoMerge pull request #14094 from seamuslee001/node_dedupe_exception_test
colemanw [Sat, 20 Apr 2019 13:42:47 +0000 (09:42 -0400)]
Merge pull request #14094 from seamuslee001/node_dedupe_exception_test

(NFC) Add tests of retreiving notes for display on a contact record a…

5 years agoMerge pull request #14091 from civicrm/5.13
Eileen McNaughton [Sat, 20 Apr 2019 07:35:23 +0000 (17:35 +1000)]
Merge pull request #14091 from civicrm/5.13

5.13

5 years ago(NFC) Add tests of retreiving notes for display on a contact record and returning...
Seamus Lee [Sat, 20 Apr 2019 03:50:28 +0000 (13:50 +1000)]
(NFC) Add tests of retreiving notes for display on a contact record and returning DedupeExecptions for output on page

Update Unit test to check output of note browse as well

5 years agoMerge pull request #14073 from seamuslee001/dev_core_881_unit_test
Seamus Lee [Sat, 20 Apr 2019 03:20:55 +0000 (13:20 +1000)]
Merge pull request #14073 from seamuslee001/dev_core_881_unit_test

dev/core#881 Add in unit test demonstrating issue Stoob found with is…

5 years agoMerge pull request #14092 from eileenmcnaughton/search_513
Seamus Lee [Sat, 20 Apr 2019 02:18:43 +0000 (12:18 +1000)]
Merge pull request #14092 from eileenmcnaughton/search_513

dev/core#887 Fix fatal error on pledge search

5 years agoMerge pull request #14083 from grischard/patch-1
Eileen McNaughton [Sat, 20 Apr 2019 01:23:04 +0000 (11:23 +1000)]
Merge pull request #14083 from grischard/patch-1

Fix upgrade message db setting location

5 years agoReadability cleanup on EventIncome report to bring it under testing
eileen [Fri, 5 Apr 2019 01:15:12 +0000 (14:15 +1300)]
Readability cleanup on EventIncome report to bring it under testing

5 years agoMerge pull request #14052 from yashodha/dev-876
colemanw [Sat, 20 Apr 2019 01:06:08 +0000 (21:06 -0400)]
Merge pull request #14052 from yashodha/dev-876

(dev/core#876) Allow url to set IS NULL/ NOT NULL in report for opera…

5 years agoMerge pull request #14059 from Stoob/patch-2
colemanw [Sat, 20 Apr 2019 01:04:25 +0000 (21:04 -0400)]
Merge pull request #14059 from Stoob/patch-2

change is_override logic

5 years agoMerge pull request #14077 from pradpnayak/AutoComplete
colemanw [Sat, 20 Apr 2019 01:00:42 +0000 (21:00 -0400)]
Merge pull request #14077 from pradpnayak/AutoComplete

Fixed auto populate of contact refrence field on membership signup form

5 years agoMerge pull request #14050 from eileenmcnaughton/import
colemanw [Sat, 20 Apr 2019 00:58:27 +0000 (20:58 -0400)]
Merge pull request #14050 from eileenmcnaughton/import

[REF] cleanup input parameters on extracted function

5 years agodev/core#887 Fix fatal error on pledge search
eileen [Sat, 20 Apr 2019 00:56:36 +0000 (10:56 +1000)]
dev/core#887 Fix fatal error on pledge search

5 years agoMerge pull request #14090 from seamuslee001/5.13
Tim Otten [Fri, 19 Apr 2019 23:05:14 +0000 (16:05 -0700)]
Merge pull request #14090 from seamuslee001/5.13

Add release-notes/5.12.2.md

5 years agoAdd release-notes/5.12.2.md
Tim Otten [Fri, 19 Apr 2019 22:59:22 +0000 (15:59 -0700)]
Add release-notes/5.12.2.md

5 years agomembership#9 - show user a notification on back-office renewals
Jon Goldberg [Fri, 19 Apr 2019 22:20:00 +0000 (18:20 -0400)]
membership#9 - show user a notification on back-office renewals

5 years agoMerge pull request #14085 from totten/master-cron-doc
colemanw [Fri, 19 Apr 2019 13:12:18 +0000 (09:12 -0400)]
Merge pull request #14085 from totten/master-cron-doc

Cron Status Check - Better hyperlinks

5 years agoMerge pull request #14079 from colemanw/setValues
Matthew Wire [Thu, 18 Apr 2019 20:44:09 +0000 (21:44 +0100)]
Merge pull request #14079 from colemanw/setValues

(REF) Fix accepted params in CustomValueTable::setValues

5 years agoMerge pull request #14075 from colemanw/contactBAO
Matthew Wire [Thu, 18 Apr 2019 20:35:03 +0000 (21:35 +0100)]
Merge pull request #14075 from colemanw/contactBAO

(REF) Fix unnecessary required param in contact BAO update

5 years agoMerge pull request #14067 from colemanw/menuZindex
colemanw [Thu, 18 Apr 2019 17:58:18 +0000 (13:58 -0400)]
Merge pull request #14067 from colemanw/menuZindex

Menubar z-index fixes

5 years agoCron Status Check - Better hyperlinks
Tim Otten [Thu, 18 Apr 2019 17:31:27 +0000 (10:31 -0700)]
Cron Status Check - Better hyperlinks

* The old link pointed to a frozen wiki page with bad styling
* The old link was buried

5 years agoCRM_Utils_System - Allow docURL functions to support "sysadmin" and "dev" links
Tim Otten [Thu, 18 Apr 2019 17:30:35 +0000 (10:30 -0700)]
CRM_Utils_System - Allow docURL functions to support "sysadmin" and "dev" links

5 years agoMerge pull request #14014 from MegaphoneJon/reporting-14
colemanw [Thu, 18 Apr 2019 14:21:47 +0000 (10:21 -0400)]
Merge pull request #14014 from MegaphoneJon/reporting-14

fix getAddressColumns() to respect tableAlias

5 years agoFix upgrade message db setting location
Guillaume Rischard [Thu, 18 Apr 2019 13:58:19 +0000 (15:58 +0200)]
Fix upgrade message db setting location

5 years agoBetter variable name
Coleman Watts [Tue, 16 Apr 2019 20:40:36 +0000 (16:40 -0400)]
Better variable name

5 years agoSimplify hiding CMS elements behind modal dialogs
Coleman Watts [Tue, 16 Apr 2019 20:36:42 +0000 (16:36 -0400)]
Simplify hiding CMS elements behind modal dialogs

Using css instead of js makes this a lot simpler

5 years agoMerge pull request #14062 from civicrm/5.13
Seamus Lee [Thu, 18 Apr 2019 04:52:59 +0000 (14:52 +1000)]
Merge pull request #14062 from civicrm/5.13

5.13

5 years agoMerge pull request #13956 from seamuslee001/dev_mail_41
Eileen McNaughton [Thu, 18 Apr 2019 04:43:42 +0000 (14:43 +1000)]
Merge pull request #13956 from seamuslee001/dev_mail_41

dev/mail#41 Do not generate tracking urls if no mailing id has been p…

5 years agoMerge pull request #14076 from seamuslee001/e2e_rest_test_get_admin_contact_id
colemanw [Thu, 18 Apr 2019 01:33:34 +0000 (21:33 -0400)]
Merge pull request #14076 from seamuslee001/e2e_rest_test_get_admin_contact_id

(NFC) Add in unit test checking that E2E test returns sensible contac…

5 years agoFix unnecessary required param in contact BAO create
Coleman Watts [Wed, 17 Apr 2019 00:45:36 +0000 (20:45 -0400)]
Fix unnecessary required param in contact BAO create

Normally a BAO should require an id and nothing else for an update op
But the contact BAO required contact_type for no good reason.

5 years agoDrupal#56 - fix quicksearch text color on D8
Jon Goldberg [Wed, 17 Apr 2019 20:04:06 +0000 (16:04 -0400)]
Drupal#56 - fix quicksearch text color on D8

5 years agodev/mail#41 Do not generate tracking urls if no mailing id has been passed in
Seamus Lee [Thu, 4 Apr 2019 04:33:57 +0000 (15:33 +1100)]
dev/mail#41 Do not generate tracking urls if no mailing id has been passed in

5 years agoMerge pull request #14078 from mattwire/mastercard_branding
Seamus Lee [Wed, 17 Apr 2019 20:39:40 +0000 (06:39 +1000)]
Merge pull request #14078 from mattwire/mastercard_branding

Update mastercard icon to match branding guidelines

5 years agoMerge pull request #14080 from MegaphoneJon/drupal-56
colemanw [Wed, 17 Apr 2019 20:37:24 +0000 (16:37 -0400)]
Merge pull request #14080 from MegaphoneJon/drupal-56

Drupal#56 - fix quicksearch text color on D8

5 years agoDrupal#56 - fix quicksearch text color on D8
Jon Goldberg [Wed, 17 Apr 2019 20:04:06 +0000 (16:04 -0400)]
Drupal#56 - fix quicksearch text color on D8

5 years ago/usr/local/sbin/gitcom
Coleman Watts [Wed, 17 Apr 2019 14:23:23 +0000 (10:23 -0400)]
/usr/local/sbin/gitcom

5 years ago(REF) Fix accepted params in CustomValueTable::setValues
Coleman Watts [Wed, 17 Apr 2019 14:16:57 +0000 (10:16 -0400)]
(REF) Fix accepted params in CustomValueTable::setValues

5 years agoUpdate mastercard icon to match branding guidelines
Matthew Wire (MJW Consulting) [Wed, 17 Apr 2019 14:04:52 +0000 (15:04 +0100)]
Update mastercard icon to match branding guidelines

5 years agoFixed auto populate of contact refrence field on membership signup form
Pradeep Nayak [Wed, 17 Apr 2019 13:12:37 +0000 (14:12 +0100)]
Fixed auto populate of contact refrence field on membership signup form

5 years ago(NFC) Add in unit test checking that E2E test returns sensible contact_id when passed...
Seamus Lee [Wed, 17 Apr 2019 03:48:23 +0000 (13:48 +1000)]
(NFC) Add in unit test checking that E2E test returns sensible contact_id when passed in a special token proving that session is working

Fix test on first run

5 years agoMerge pull request #14070 from eileenmcnaughton/bee_free
Seamus Lee [Wed, 17 Apr 2019 01:00:15 +0000 (11:00 +1000)]
Merge pull request #14070 from eileenmcnaughton/bee_free

dev/core#562 Remove remaining free() instances from tests

5 years agoMerge pull request #14072 from eileenmcnaughton/dao
Seamus Lee [Wed, 17 Apr 2019 00:59:40 +0000 (10:59 +1000)]
Merge pull request #14072 from eileenmcnaughton/dao

Make DAO fields more consistent

5 years agoMerge pull request #14071 from eileenmcnaughton/bee_freeer
Seamus Lee [Tue, 16 Apr 2019 22:43:54 +0000 (08:43 +1000)]
Merge pull request #14071 from eileenmcnaughton/bee_freeer

dev/core#562 Remove more DAO->free() calls

5 years agodev/core#881 Add in unit test demonstrating issue Stoob found with is_override
Seamus Lee [Tue, 16 Apr 2019 22:13:49 +0000 (08:13 +1000)]
dev/core#881 Add in unit test demonstrating issue Stoob found with is_override

5 years agoMerge pull request #14068 from eileenmcnaughton/search_test
Eileen McNaughton [Tue, 16 Apr 2019 21:48:15 +0000 (07:48 +1000)]
Merge pull request #14068 from eileenmcnaughton/search_test

[REF] Clean up CRM_Contribute_Form_SearchTest

5 years agoRegenerate DAO files to have 'where' fields defined
eileen [Mon, 15 Apr 2019 03:27:41 +0000 (13:27 +1000)]
Regenerate DAO files to have 'where' fields defined

5 years agoUpdate dao.tpl to not make presence of import or export required to add 'where' param
eileen [Mon, 15 Apr 2019 03:25:52 +0000 (13:25 +1000)]
Update dao.tpl to not make presence of import or export required to add 'where' param

Import & export have been hopelessly overloaded & misued in the code. One reason is that without them
'where' is not present. Logically import & export should have a narrow usage and should not
be a pre-requisite for being available as a search field, in reality not so much.

This simply makes the 'where' field available regardless of the presence of these fields

By doing this we can make the metadata in the Query object able to handle more fields
without special handling (e.g Contribution Recur fields)

5 years agodev/core#562 Remove more DAO->free() calls
eileen [Tue, 16 Apr 2019 21:12:22 +0000 (07:12 +1000)]
dev/core#562 Remove more DAO->free() calls

We have been removing a few of these each release. They no longer provide any benefit
as the resources are released in the deconstructor. OTOH they can in rare circumstances cause bugs.

Previous removals have not caused any issues so the slow approach is starting to
look overly cautious now

5 years agoRemove remaining free() instances from tests
eileen [Tue, 16 Apr 2019 20:57:56 +0000 (06:57 +1000)]
Remove remaining free() instances from tests

5 years agoMerge pull request #14065 from colemanw/summaryBlock
Eileen McNaughton [Tue, 16 Apr 2019 20:48:57 +0000 (06:48 +1000)]
Merge pull request #14065 from colemanw/summaryBlock

Ensure edit tooltip is always initially hidden in contact summary block

5 years agoClean up CRM_Contribute_Form_SearchTest
eileen [Mon, 15 Apr 2019 03:05:46 +0000 (13:05 +1000)]
Clean up CRM_Contribute_Form_SearchTest

This is mostly about switching to a data provider to include flexibility & re-usability
of the test

5 years agoRemove unnecessary d7 script
Coleman Watts [Tue, 16 Apr 2019 17:40:59 +0000 (13:40 -0400)]
Remove unnecessary d7 script

This is now obsolete due to the new SmartMenus, the drupal tool-drawer
is no longer in the way of dialogs.

5 years agoLower z-index of menubar in body
Coleman Watts [Tue, 16 Apr 2019 17:37:28 +0000 (13:37 -0400)]
Lower z-index of menubar in body

Avoid menubar appearing on top of dialogs which have a z-index of 101

5 years agoCorrectly size UI dialog accounting for height of menubar
Coleman Watts [Tue, 16 Apr 2019 17:36:32 +0000 (13:36 -0400)]
Correctly size UI dialog accounting for height of menubar

5 years agoAdd body class when dialog is open
Coleman Watts [Tue, 16 Apr 2019 17:33:05 +0000 (13:33 -0400)]
Add body class when dialog is open

This should make it easier for reacting to the presence of a dialog with css.

5 years agoEnsure edit tooltip is always initially hidden in contact summary block
Coleman Watts [Tue, 16 Apr 2019 13:46:52 +0000 (09:46 -0400)]
Ensure edit tooltip is always initially hidden in contact summary block

5 years ago5.12.1.md - Fix attribution
Tim Otten [Tue, 16 Apr 2019 09:08:37 +0000 (02:08 -0700)]
5.12.1.md - Fix attribution

5 years agoMerge pull request #14061 from totten/5.13-port-notes
Seamus Lee [Tue, 16 Apr 2019 08:47:02 +0000 (18:47 +1000)]
Merge pull request #14061 from totten/5.13-port-notes

Add release-notes/5.12.1.md

5 years agoAdd release-notes/5.12.1.md
Tim Otten [Tue, 16 Apr 2019 00:37:18 +0000 (17:37 -0700)]
Add release-notes/5.12.1.md

5 years agoMerge pull request #14057 from civicrm/5.13
Seamus Lee [Tue, 16 Apr 2019 00:14:07 +0000 (10:14 +1000)]
Merge pull request #14057 from civicrm/5.13

5.13

5 years agowhhops this is more like it
Stoob [Mon, 15 Apr 2019 23:24:06 +0000 (16:24 -0700)]
whhops this is more like it

5 years agochange is_override logic
Stoob [Mon, 15 Apr 2019 23:08:15 +0000 (16:08 -0700)]
change is_override logic

if (!$dao->is_override was prior code.  IS NOT NULL not functional equivalent

5 years agoMerge pull request #14051 from eileenmcnaughton/inv
Seamus Lee [Mon, 15 Apr 2019 21:16:25 +0000 (07:16 +1000)]
Merge pull request #14051 from eileenmcnaughton/inv

dev/core#534 Re-instate pay-now button

5 years ago(dev/core#876) Allow url to set IS NULL/ NOT NULL in report for operations
yashodha [Mon, 15 Apr 2019 05:44:39 +0000 (11:14 +0530)]
(dev/core#876) Allow url to set IS NULL/ NOT NULL in report for operations

5 years agodev/core#534 Re-instate pay-now button
eileen [Mon, 15 Apr 2019 02:01:21 +0000 (12:01 +1000)]
dev/core#534 Re-instate pay-now button

This is regression - likely for a few months? Fix adds a unit test & does some additional tidy up

We should consider for 5.12

5 years agoMerge pull request #14011 from colemanw/typeValidateCleanup
Eileen McNaughton [Mon, 15 Apr 2019 00:11:30 +0000 (10:11 +1000)]
Merge pull request #14011 from colemanw/typeValidateCleanup

(REF) Reduce redundant code in CRM_Utils_Type::validate

5 years ago[REF] remove fields from input parameters of formatLocationBlock
eileen [Fri, 12 Apr 2019 06:37:43 +0000 (16:37 +1000)]
[REF] remove fields from input parameters of formatLocationBlock

As part of a tidy up of this function I am removing  as an input parameter & getting it from
a function. Unit testing added in testAddressWithCustomData to ensure custom data is still imported.

Additional related tests are in that function. This is preliminary to fixing
primary handling & related test for phone & email import - and to tidying up general mess in this function

5 years agoAdd unit test to ensure address custom data is imported
eileen [Fri, 12 Apr 2019 06:06:17 +0000 (16:06 +1000)]
Add unit test to ensure address custom data is imported

5 years agoMerge pull request #14010 from colemanw/assetCheck
Matthew Wire [Sun, 14 Apr 2019 20:12:05 +0000 (21:12 +0100)]
Merge pull request #14010 from colemanw/assetCheck

Skip adding core resources when building assets

5 years agoMerge pull request #14033 from eileenmcnaughton/recur_cancel_api
Matthew Wire [Sun, 14 Apr 2019 20:07:52 +0000 (21:07 +0100)]
Merge pull request #14033 from eileenmcnaughton/recur_cancel_api

Switch to using ContributionRecur.cancel api from CancelSubscription form

5 years agoMerge pull request #14030 from aydun/casecontact_hooks
Matthew Wire [Sun, 14 Apr 2019 19:59:38 +0000 (20:59 +0100)]
Merge pull request #14030 from aydun/casecontact_hooks

Make hook_civicrm_pre() and hook_civicrm_post() fire on CaseContacts

5 years agoMerge pull request #13993 from eileenmcnaughton/recur_fixes
Matthew Wire [Sun, 14 Apr 2019 19:47:16 +0000 (20:47 +0100)]
Merge pull request #13993 from eileenmcnaughton/recur_fixes

dev/core#846 Rationalise loading of payment processor across the 3 update forms

5 years agoMerge pull request #14040 from eileenmcnaughton/import
Matthew Wire [Sun, 14 Apr 2019 19:39:21 +0000 (20:39 +0100)]
Merge pull request #14040 from eileenmcnaughton/import

[REF] Extract formatLocationBlock from import parsing