Coleman Watts [Thu, 18 Apr 2019 17:52:25 +0000 (13:52 -0400)]
Fix creating Formatting fields in api and UI
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…
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
Seamus Lee [Mon, 22 Apr 2019 02:41:41 +0000 (12:41 +1000)]
Merge pull request #14101 from civicrm/5.13
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
Tim Otten [Sat, 20 Apr 2019 15:44:42 +0000 (08:44 -0700)]
Add release-notes/5.12.3.md
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
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
Coleman Watts [Sun, 21 Apr 2019 15:08:18 +0000 (11:08 -0400)]
Remove problematic serialize handing from conformance test
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
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.
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)
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…
Eileen McNaughton [Sat, 20 Apr 2019 07:35:23 +0000 (17:35 +1000)]
Merge pull request #14091 from civicrm/5.13
5.13
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
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…
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
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
eileen [Fri, 5 Apr 2019 01:15:12 +0000 (14:15 +1300)]
Readability cleanup on EventIncome report to bring it under testing
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…
colemanw [Sat, 20 Apr 2019 01:04:25 +0000 (21:04 -0400)]
Merge pull request #14059 from Stoob/patch-2
change is_override logic
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
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
eileen [Sat, 20 Apr 2019 00:56:36 +0000 (10:56 +1000)]
dev/core#887 Fix fatal error on pledge search
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
Tim Otten [Fri, 19 Apr 2019 22:59:22 +0000 (15:59 -0700)]
Add release-notes/5.12.2.md
Jon Goldberg [Fri, 19 Apr 2019 22:20:00 +0000 (18:20 -0400)]
membership#9 - show user a notification on back-office renewals
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
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
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
colemanw [Thu, 18 Apr 2019 17:58:18 +0000 (13:58 -0400)]
Merge pull request #14067 from colemanw/menuZindex
Menubar z-index fixes
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
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
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
Guillaume Rischard [Thu, 18 Apr 2019 13:58:19 +0000 (15:58 +0200)]
Fix upgrade message db setting location
Coleman Watts [Tue, 16 Apr 2019 20:40:36 +0000 (16:40 -0400)]
Better variable name
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
Seamus Lee [Thu, 18 Apr 2019 04:52:59 +0000 (14:52 +1000)]
Merge pull request #14062 from civicrm/5.13
5.13
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…
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…
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.
Jon Goldberg [Wed, 17 Apr 2019 20:04:06 +0000 (16:04 -0400)]
Drupal#56 - fix quicksearch text color on D8
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
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
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
Jon Goldberg [Wed, 17 Apr 2019 20:04:06 +0000 (16:04 -0400)]
Drupal#56 - fix quicksearch text color on D8
Coleman Watts [Wed, 17 Apr 2019 14:23:23 +0000 (10:23 -0400)]
/usr/local/sbin/gitcom
Coleman Watts [Wed, 17 Apr 2019 14:16:57 +0000 (10:16 -0400)]
(REF) Fix accepted params in CustomValueTable::setValues
Matthew Wire (MJW Consulting) [Wed, 17 Apr 2019 14:04:52 +0000 (15:04 +0100)]
Update mastercard icon to match branding guidelines
Pradeep Nayak [Wed, 17 Apr 2019 13:12:37 +0000 (14:12 +0100)]
Fixed auto populate of contact refrence field on membership signup form
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
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
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
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
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
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
eileen [Mon, 15 Apr 2019 03:27:41 +0000 (13:27 +1000)]
Regenerate DAO files to have 'where' fields defined
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)
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
eileen [Tue, 16 Apr 2019 20:57:56 +0000 (06:57 +1000)]
Remove remaining free() instances from tests
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
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
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.
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
Coleman Watts [Tue, 16 Apr 2019 17:36:32 +0000 (13:36 -0400)]
Correctly size UI dialog accounting for height of menubar
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.
Coleman Watts [Tue, 16 Apr 2019 13:46:52 +0000 (09:46 -0400)]
Ensure edit tooltip is always initially hidden in contact summary block
Tim Otten [Tue, 16 Apr 2019 09:08:37 +0000 (02:08 -0700)]
5.12.1.md - Fix attribution
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
Tim Otten [Tue, 16 Apr 2019 00:37:18 +0000 (17:37 -0700)]
Add release-notes/5.12.1.md
Seamus Lee [Tue, 16 Apr 2019 00:14:07 +0000 (10:14 +1000)]
Merge pull request #14057 from civicrm/5.13
5.13
Stoob [Mon, 15 Apr 2019 23:24:06 +0000 (16:24 -0700)]
whhops this is more like it
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
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
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
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
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
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
eileen [Fri, 12 Apr 2019 06:06:17 +0000 (16:06 +1000)]
Add unit test to ensure address custom data is imported
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
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
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
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
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
Matthew Wire [Sun, 14 Apr 2019 19:37:43 +0000 (20:37 +0100)]
Merge pull request #13837 from eileenmcnaughton/event_conf
Create contribution before taking payment, per contribution page workflow
Eileen McNaughton [Sun, 14 Apr 2019 00:31:33 +0000 (10:31 +1000)]
Merge pull request #14047 from totten/master-api-wrap
(dev/core#873) civi.api.prepare - Allow dynamic wrappers
Eileen McNaughton [Sun, 14 Apr 2019 00:28:39 +0000 (10:28 +1000)]
Merge pull request #14048 from civicrm/5.13
5.13
Seamus Lee [Sun, 14 Apr 2019 00:03:22 +0000 (10:03 +1000)]
Merge pull request #14046 from totten/5.13-schema-fmt
(NFC) SchemaStructure.php - Fix up mismatch between stored+generated code
Tim Otten [Wed, 10 Apr 2019 02:16:47 +0000 (19:16 -0700)]
(dev/core#873) civi.api.prepare - Allow dynamic wrappers
Overview
--------
Allow extensions to dynamically wrap an API. There are some existing mechanisms which sort-of allow wrapping, but
this enables additional use-cases.
Before
------
There are a few techniques for wrapping or overriding an API, but none is suitable to my current use-case. Limitations:
* `hook_civicrm_apiWrappers` - This allows registering things before and after the API call, but it does not allow
changing the underlying API call.
* `civi.api.{authorize,prepare,respond}` events - Same as above. These are a bit more nuanced/fine-grained, but still does not allow changing
* `civi.api.resolve` event with `AdhocProvider` - This allows you to swap an API completely, but it doesn't allow you
to delegate back to the original API call (if you've got nothing to add).
After
------
One may subscribe to `civi.api.prepare` and then call the `wrapApi()` helper:
```php
function onPrepare($event) {
if ($event->getApiRequestSig() === '3.widget.frobnicate') {
$event->wrapApi(function($apiRequest, $continue){
echo "Hello\n";
$r = $continue($apiRequest);
echo "Goodbye\n";
return $r;
});
}
}
```
Key characteristics:
* The wrapper only applies if you register it specifically for the given API call.
* The wrapper allows you to defer to the original implementation (`$continue`).
* The wrapper allows you to perform logic before and after.
* The wrapper allows you to *conditionally* replace -- you might call `$continue` or something entirely different.
The style here is more event-oriented, but you can see the same concept in OOP systems, such as PHP's function-override notation.
This would be analogous:
```php
class MyChild extends MyParent {
function frobnicate($arg1) {
echo "Hello\n";
$r = parent::frobnicate($arg1);
echo "Goodbye\n";
return $r;
}
}
```
Seamus Lee [Sat, 13 Apr 2019 21:12:11 +0000 (07:12 +1000)]
Merge pull request #14044 from totten/master-test-trait-2
(REF; dev/core#873) CiviUnitTestCase - Extract traits to facilitate extension testing
Tim Otten [Sat, 13 Apr 2019 20:19:09 +0000 (13:19 -0700)]
(NFC) SchemaStructure.php - Fix up mismatch between stored+generated code
Overview
--------
The class `CRM_Core_I18n_SchemaStructure` is autogenerated via GenCode, and it is also commited to git.
The two forms don't match because of the recent code-style cleanup.
Before
------
After running GenCode, there appears to be uncommitted changes in `CRM_Core_I18n_SchemaStructure`.
The changes indicate a reversion in code-style (e.g. `null` vs `NULL`; some whitespace).
After
-----
GenCode produces output which matches the recent cleanup.
Comments
--------
Fixing `null` / `NULL` was easy. However, the whitespace mismatch was more subtle -- because the
`PHP_Beautifier` was messing it up. To resolve, I disabled `PHP_Beautifier` for this file, and fixed
the underlying templates to generate well-formed code.
The output of the process matches the existing code; therefore, the change
have no functional impact (NFC). You can see this by running `setup.sh` and
checking the `git status`.
Tim Otten [Sat, 13 Apr 2019 00:42:40 +0000 (17:42 -0700)]
ContactTestTrait::createLoggedInUser() - Fix domain_id error when running from extension
Tim Otten [Sat, 13 Apr 2019 00:41:12 +0000 (17:41 -0700)]
Move helpers from CiviUnitTestCase to MailingTestTrait
* `createMailing(...)`
* `deleteMailing(...)`
Tim Otten [Sat, 13 Apr 2019 00:34:56 +0000 (17:34 -0700)]
Move helpers from CiviUnitTestCase to DbTestTrait
* `assertDBState(...)`
* `assertDBNotNull(...)`
* `assertDBNull(...)`
* `assertDBRowNotExist(...)`
* `assertDBRowExist(...)`
* `assertDBCompareValue(...)`
* `assertDBCompareValues(...)`
* `assertDBQuery(...)`
Tim Otten [Sat, 13 Apr 2019 00:32:15 +0000 (17:32 -0700)]
Move helpers from CiviUnitTestCase to GenericAssertionsTrait
* `assertType(...)`
* `assertTreeEquals(...)`
* `assertApproxEquals(...)`
* `assertAttributesEquals(...)`
* `assertArrayKeyExists(...)`
* `assertArrayValueNotNull(...)`
* `assertArrayValuesEqual(...)`
Tim Otten [Sat, 13 Apr 2019 00:20:44 +0000 (17:20 -0700)]
Move helpers from CiviUnitTestCase to ContactTestTrait
* `createLoggedInUser(...)`
* `organizationCreate(...)`
* `individualCreate(...)`
* `householdCreate(...)`
* `sampleContact(...)`
* `_contactCreate(...)`
* `contactDelete(...)`
* `groupContactCreate(...)`
* `groupCreate(...)`
* `groupDelete(...)`
Eileen McNaughton [Sat, 13 Apr 2019 01:22:38 +0000 (11:22 +1000)]
Merge pull request #14041 from colemanw/fieldTitles
Add pseudoconstant to UFField dao
Eileen McNaughton [Fri, 12 Apr 2019 22:10:04 +0000 (08:10 +1000)]
Merge pull request #14028 from yashodha/dev-865
(dev/core#865) Result filter criteria doesn't show IS NULL/IS NOT NUL…
Eileen McNaughton [Fri, 12 Apr 2019 21:54:48 +0000 (07:54 +1000)]
Merge pull request #14039 from eileenmcnaughton/cont_recur
Remove deprecated function
Coleman Watts [Fri, 12 Apr 2019 18:28:23 +0000 (14:28 -0400)]
Add pseudoconstant to UFField dao