Seamus Lee [Fri, 30 Aug 2019 22:03:32 +0000 (08:03 +1000)]
Merge pull request #15167 from mattwire/testRenewMembership_note
Add note about testRenewMembership failing on certain days
Eileen McNaughton [Fri, 30 Aug 2019 21:56:20 +0000 (09:56 +1200)]
Merge pull request #15119 from seamuslee001/fix_dashboard_domain_fk
Ensure that civicrm_dashboard has a foreign key to civicrm_domain
Seamus Lee [Fri, 30 Aug 2019 21:43:38 +0000 (07:43 +1000)]
Merge pull request #15099 from christianwach/lab-1200
Ensure Dashboard respects multiple Domains
colemanw [Fri, 30 Aug 2019 17:30:31 +0000 (13:30 -0400)]
Merge pull request #15155 from eileenmcnaughton/merge_perm
Use merge duplicate contacts as api permission for merging
colemanw [Fri, 30 Aug 2019 17:29:44 +0000 (13:29 -0400)]
Merge pull request #15157 from eileenmcnaughton/dedupe6
Adjust permissions on dedupe exception api to 'merge duplicate contacts'
Matthew Wire (MJW Consulting) [Fri, 30 Aug 2019 15:55:53 +0000 (16:55 +0100)]
Add note about testRenewMembership failing on certain days
Eileen McNaughton [Thu, 29 Aug 2019 21:04:07 +0000 (09:04 +1200)]
Merge pull request #15164 from mlutfy/ppIpnTranslation
Fix PayPalImpl Contribution Status PseudoConstant for non-English
Mathieu Lutfy [Thu, 29 Aug 2019 18:12:55 +0000 (14:12 -0400)]
Fix PayPalImpl Contribution Status PseudoConstant for non-English (use name, not label)
Mathieu Lu [Thu, 29 Aug 2019 18:10:17 +0000 (14:10 -0400)]
Merge pull request #15161 from vakeesan26/dev/core#1218
dev/core#1218 Fix Word Replacements on manage case Roles
Vakeesan [Thu, 29 Aug 2019 11:34:24 +0000 (12:34 +0100)]
fix for dev/core#1218
Eileen McNaughton [Thu, 29 Aug 2019 04:34:03 +0000 (16:34 +1200)]
Merge pull request #15114 from eileenmcnaughton/weird2
Make sure inherited memberships are not themselves inherited
eileen [Thu, 29 Aug 2019 01:49:32 +0000 (13:49 +1200)]
Use merge duplicate contacts as api permission for merging
eileen [Thu, 29 Aug 2019 02:08:25 +0000 (14:08 +1200)]
Adjust permissions on dedupe exception api to 'merge duplicate contacts'
Seamus Lee [Thu, 29 Aug 2019 00:53:11 +0000 (10:53 +1000)]
Merge pull request #15152 from eileenmcnaughton/dedupe
Open up permissions on Dedupe.getduplicates
eileen [Wed, 28 Aug 2019 22:59:18 +0000 (10:59 +1200)]
Open up permissions on Dedupe.getduplicates
Currently the action Dedupe.getduplicates is defaulting to 'administer CiviCRM'.
The function manages permissions internally (ie. you can't retrieve contacts you don't have permission to see)
so the function itself can have fairly open permissions - hence I went for 'access CiviCRM' rather than
'merge duplicate contacts' - it might even be argued this should be open & rely solely on contact ACLs but
I have not gone that far
This function is part of moving towards api based rather than form based logic. It is not in use in core yet
outside tests.
Tim Otten [Wed, 28 Aug 2019 21:36:06 +0000 (14:36 -0700)]
Merge pull request #15145 from colemanw/js
Better error handling in CRM_Utils_JS::decode
colemanw [Wed, 28 Aug 2019 12:14:33 +0000 (08:14 -0400)]
Merge pull request #15150 from demeritcowboy/teststatusbycasetype
[Test] Bring to life dormant test
Monish Deb [Wed, 28 Aug 2019 11:38:45 +0000 (17:08 +0530)]
Merge pull request #14892 from eileenmcnaughton/lines
dev/financial#40 add missing financial item when altering a radio amount
Monish Deb [Wed, 28 Aug 2019 11:38:35 +0000 (17:08 +0530)]
Merge pull request #14408 from eileenmcnaughton/payment
Switch recordAdditionalPayment fully over to api
eileen [Wed, 28 Aug 2019 08:35:29 +0000 (20:35 +1200)]
Add check to ensure only 3 rows
eileen [Sat, 27 Jul 2019 03:59:30 +0000 (15:59 +1200)]
dev/financial#40 add missing financial item when altering a radio amount
Monish Deb [Sat, 27 Jul 2019 02:25:22 +0000 (14:25 +1200)]
[test] dev/financial#40: Missing Financial type and Credit Account Code in Bookkeeping Transaction Report
Eileen McNaughton [Wed, 28 Aug 2019 08:31:03 +0000 (20:31 +1200)]
Merge pull request #15148 from totten/master-debower
distmaker - Finish migrating bower.json => composer.json
Eileen McNaughton [Wed, 28 Aug 2019 08:29:24 +0000 (20:29 +1200)]
Merge pull request #15149 from totten/master-d8json
(dev/release#9) distmaker - Report on head for commit civicrm-drupal-8
DemeritCowboy [Wed, 28 Aug 2019 07:02:30 +0000 (03:02 -0400)]
resurrect old test
Tim Otten [Wed, 28 Aug 2019 00:56:40 +0000 (17:56 -0700)]
(dev/release#9) distmaker - Report on head for commit civicrm-drupal-8
Overview
--------
The general goal is to produce tags for `civicrm-drupal-8` during the release
process.
The workflow for producing release tags is generally as follows:
* Run `distmaker` to prepare a release candidate (a collection of files - e.g.
`civicrm-5.18.0-drupal.tar.gz`, `civicrm-5.18.0-joomla.zip`, `civicrm-5.18.0.json`, etc).
Note that the JSON file describes the build (i.e. the list of inputs/git-commits and
outputs/tarballs).
* Use the candidate for `civihydra` testing (i.e. use the tarballs for normal GUI-based installation)
* If they work, then run `releaser` - which takes the release candidate files and:
* Pushes the tarballs out to CDNs
* Pushes the git tags to Github
Before
------
* The JSON report describes inputs from the following repos:
`civicrm-{backdrop,core,drupal,joomla,packages,wordpress}.git`
* To create a complete set of build artifacts, one should have file tree:
```
src/ (civicrm-core.git)
WordPress/ (civicrm-wordpress.git)
backdrop/ (civicrm-backdrop.git)
drupal/ (civicrm-drupal.git)
joomla/ (civicrm-joomla.git)
packages/ (civicrm-packages.git)
```
After
-----
* The JSON report *additionally* reports on `civicrm-drupal-8.git`
* To create a complete set of build artifacts, one should also have `drupal-8` in the tree:
```
src/ (civicrm-core.git)
WordPress/ (civicrm-wordpress.git)
backdrop/ (civicrm-backdrop.git)
drupal-8/ (civicrm-drupal-8.git)
drupal/ (civicrm-drupal.git)
joomla/ (civicrm-joomla.git)
packages/ (civicrm-packages.git)
```
Technical Details
-----------------
* To produce a report with the D8 commits, one needs have a copy of
`drupal-8/` (`civicrm-drupal-8.git`).
* However, `distmaker` can still be used without `drupal-8`. (As in the
past, so this is still: *if you're only building the Joomla zip file, then
you don't need the code for drupal-8 or WordPress*).
* There will be a separate patch to:
* Checkout `drupal-8` when CI does an automated build
* Use the JSON to create tags
Tim Otten [Tue, 27 Aug 2019 21:45:48 +0000 (14:45 -0700)]
distmaker - Finish migrating bower.json => composer.json
This is a follow-up to #15044 - since we don't have/need `bower.json`, it
doesn't make sense for `distmaker` to call `bower install`.
Coleman Watts [Tue, 27 Aug 2019 12:51:32 +0000 (08:51 -0400)]
Better error handling in CRM_Utils_JS::decode
eileen [Fri, 23 Aug 2019 02:43:17 +0000 (14:43 +1200)]
Make sure inherited memberships are not themselves inherited
In trying to make sense of the code / fix / test for https://github.com/civicrm/civicrm-core/pull/15062
I discovered the tests wouldn't pass due to a weird edge case where an individual inherited a membership
and that membership was inherited in turn via a relationship the individual had (with the same organization)
I don't believe that inheriting inherited memberships is an intentional feature & it DOEs cause issues
- this removes that possibility
Seamus Lee [Mon, 26 Aug 2019 22:05:16 +0000 (08:05 +1000)]
Merge pull request #15136 from eileenmcnaughton/batch_test
Add minimal test for testExportFinancialBatch
Seamus Lee [Mon, 26 Aug 2019 21:56:21 +0000 (07:56 +1000)]
Merge pull request #15141 from colemanw/permission
Code cleanup in CRM_Core_Permission::check
Eileen McNaughton [Mon, 26 Aug 2019 20:37:51 +0000 (08:37 +1200)]
Merge pull request #15140 from jaapjansma/issue_event_14
dev/event#14 Fix excessive cache clearing on creating an event
Coleman Watts [Mon, 26 Aug 2019 20:20:02 +0000 (16:20 -0400)]
Code cleanup in CRM_Core_Permission::check
Jaap Jansma [Mon, 26 Aug 2019 16:39:37 +0000 (18:39 +0200)]
Fixed issue #14
Eileen McNaughton [Mon, 26 Aug 2019 01:57:43 +0000 (13:57 +1200)]
Merge pull request #15004 from davejenx/dev-core-860-discount-line-items-fix2
dev/core/issues/860: discount not applied to line item: call buildAmount hook in CRM_Member_Form_Membership::submit().
eileen [Sun, 25 Aug 2019 14:26:44 +0000 (02:26 +1200)]
Add minimal test for testExportFinancialBatch
This adds the minimal test suggested as needed for https://github.com/civicrm/civicrm-core/pull/14621
In the process I needed to add some api defaults
Eileen McNaughton [Sun, 25 Aug 2019 21:04:21 +0000 (09:04 +1200)]
Merge pull request #15134 from mattwire/927_extractparticipant_membership
Extract cancelParticipant and cancelMembership functions in baseIPN
Matthew Wire [Sun, 25 Aug 2019 14:28:14 +0000 (15:28 +0100)]
Merge pull request #15113 from eileenmcnaughton/weird_stuff
[Ref] Extract addInheritedMembership
Matthew Wire (MJW Consulting) [Sun, 25 Aug 2019 10:06:28 +0000 (11:06 +0100)]
Extract cancelParticipant and cancelMembership functions in baseIPN
Eileen McNaughton [Sun, 25 Aug 2019 13:50:37 +0000 (01:50 +1200)]
Merge pull request #15030 from mattwire/changecasestatus_relationshipapi
Switch to relationship BAO when modifying relationships in change case status so we don't bypass hooks
Eileen McNaughton [Sun, 25 Aug 2019 13:15:44 +0000 (01:15 +1200)]
Merge pull request #15133 from mattwire/activityemail_extract
Extract function to create email activity when sending an email to contact
Matthew Wire (MJW Consulting) [Tue, 13 Aug 2019 16:15:24 +0000 (17:15 +0100)]
Switch to relationship API when modifying relationships in change case status so we don't bypass hooks
Matthew Wire (MJW Consulting) [Sun, 25 Aug 2019 09:43:33 +0000 (10:43 +0100)]
Extract function to create email activity when sending an email to contact
Eileen McNaughton [Sat, 24 Aug 2019 04:46:25 +0000 (16:46 +1200)]
Merge pull request #15129 from mattwire/refactor_baseipn_1
Initial refactor of BaseIPN
Eileen McNaughton [Sat, 24 Aug 2019 01:38:47 +0000 (13:38 +1200)]
Merge pull request #15123 from mattwire/fixhardcodedheadofhouseholdrelationship
Fix hardcoded ID for Head of Household relationship
colemanw [Sat, 24 Aug 2019 01:31:25 +0000 (21:31 -0400)]
Merge pull request #15044 from totten/master-composer-all-the-things
Migrate bower.json into composer.json via composer-downloads-plugin
Seamus Lee [Sat, 24 Aug 2019 00:25:27 +0000 (10:25 +1000)]
Merge pull request #15128 from mattwire/minorcleanup
(dev/core#927) (NFC) Add comments to relate to gitlab ticket
Seamus Lee [Sat, 24 Aug 2019 00:24:33 +0000 (10:24 +1000)]
Merge pull request #15126 from mattwire/deprecateaddresssequence
Deprecate CRM_Core_Config::addressSequence()
Seamus Lee [Fri, 23 Aug 2019 23:45:45 +0000 (09:45 +1000)]
Merge pull request #15127 from mattwire/deprecatedefaultcountry
Deprecate CRM_Core_Config::defaultContactCountry and defaultContactCountryName
Seamus Lee [Fri, 23 Aug 2019 23:45:27 +0000 (09:45 +1000)]
Merge pull request #15125 from eileenmcnaughton/mem_param
Remove unused skipRedirect param
Seamus Lee [Fri, 23 Aug 2019 23:44:48 +0000 (09:44 +1000)]
Merge pull request #15116 from eileenmcnaughton/import_website
[Ref] [Import] Use processor to determine website type, location type, test
Eileen McNaughton [Fri, 23 Aug 2019 23:25:04 +0000 (11:25 +1200)]
Merge pull request #15120 from mattwire/apimembershiptype_defaultdomain
Add default domain to membershiptype API
Matthew Wire (MJW Consulting) [Fri, 23 Aug 2019 23:16:03 +0000 (00:16 +0100)]
Add comments to relate to gitlab ticket
Matthew Wire (MJW Consulting) [Fri, 23 Aug 2019 23:14:19 +0000 (00:14 +0100)]
Initial refactor of BaseIPN
Matthew Wire (MJW Consulting) [Fri, 23 Aug 2019 22:45:10 +0000 (23:45 +0100)]
Deprecate CRM_Core_Config::defaultContactCountry and defaultContactCountryName
Matthew Wire (MJW Consulting) [Fri, 23 Aug 2019 22:44:13 +0000 (23:44 +0100)]
Deprecate CRM_Core_Config::addressSequence()
Eileen McNaughton [Fri, 23 Aug 2019 22:11:26 +0000 (10:11 +1200)]
Merge pull request #14367 from MegaphoneJon/financial-58
financial#58: Don't crash the View Batches page after a failed batch …
eileen [Fri, 23 Aug 2019 22:09:54 +0000 (10:09 +1200)]
Remove unused skipRedirect param
No longer used for anything - it can go
Eileen McNaughton [Fri, 23 Aug 2019 22:01:19 +0000 (10:01 +1200)]
Merge pull request #15124 from mattwire/REF_processMembershipPending
Minor refactor of 'Pending' parameter for processMembership
Seamus Lee [Fri, 23 Aug 2019 21:46:51 +0000 (07:46 +1000)]
Merge pull request #15112 from demeritcowboy/whats-my-name
[Test] Fix Last_name in CiviUnitTestCase::activityCreate
Seamus Lee [Fri, 23 Aug 2019 08:29:22 +0000 (18:29 +1000)]
Ensure that civicrm_dashboard has a foreign key to civicrm_domain
Fix upgrade on multilingual installs
Matthew Wire (MJW Consulting) [Fri, 23 Aug 2019 14:31:10 +0000 (15:31 +0100)]
Fix hardcoded ID for Head of Household relationship
Eileen McNaughton [Fri, 23 Aug 2019 20:15:08 +0000 (08:15 +1200)]
Merge pull request #15121 from demeritcowboy/test-bao-relationship
test for PR 15103
Matthew Wire (MJW Consulting) [Fri, 23 Aug 2019 17:37:24 +0000 (18:37 +0100)]
Minor refactor of 'Pending' parameter for processMembership
colemanw [Fri, 23 Aug 2019 14:37:35 +0000 (10:37 -0400)]
Merge pull request #15103 from mattwire/relationshipaddbao
Refactor CRM_Contact_BAO_Relationship::add to autoload missing params from existing record
DemeritCowboy [Fri, 23 Aug 2019 13:38:27 +0000 (09:38 -0400)]
test for PR 15103
Matthew Wire (MJW Consulting) [Fri, 23 Aug 2019 09:33:43 +0000 (10:33 +0100)]
Add default domain to membershiptype API
Matthew Wire (MJW Consulting) [Sat, 17 Aug 2019 16:28:42 +0000 (17:28 +0100)]
Refactor CRM_Contact_BAO_Relationship::add to autoload missing params from existing record
eileen [Fri, 23 Aug 2019 03:38:23 +0000 (15:38 +1200)]
[Ref] [Import] Use processor to determine website type, location type, test
eileen [Fri, 23 Aug 2019 03:33:59 +0000 (15:33 +1200)]
Add test to ensure cleanup does not change js
Eileen McNaughton [Fri, 23 Aug 2019 02:32:33 +0000 (14:32 +1200)]
Merge pull request #15097 from eileenmcnaughton/import_cleanup
[Import] [ref] - minor cleanup to reduce code complexity
eileen [Fri, 23 Aug 2019 02:26:27 +0000 (14:26 +1200)]
[Ref] Extract addInheritedMembership
DemeritCowboy [Fri, 23 Aug 2019 01:08:31 +0000 (21:08 -0400)]
fix last name
eileen [Thu, 22 Aug 2019 02:18:13 +0000 (14:18 +1200)]
Use Processor to determine the phone_type_id & im_provider_id
What we are doing here is actually very simple - despite the code being kinda insane - we are just getting
the fields from the database for each column in the mapping.
The fields are all loaded into the processor already & those functions are tested. This switches to using them
and to passing around less variables...
Follow ons will do the same for other fields (website_type_id, location_type_id but I will add more tests as I do that
Eileen McNaughton [Fri, 23 Aug 2019 00:40:24 +0000 (12:40 +1200)]
Merge pull request #15109 from civicrm/5.17
5.17
Eileen McNaughton [Fri, 23 Aug 2019 00:40:10 +0000 (12:40 +1200)]
Merge pull request #15111 from seamuslee001/5_16_3_release_notes
Add in release notes for 5.16.3 drop
Tim Otten [Fri, 23 Aug 2019 00:39:10 +0000 (17:39 -0700)]
Merge pull request #15105 from greenpeace-cee/fix-id-additionalinfo
dev/financial#66 - Fix missing contribution ID for AdditionalInfo
Eileen McNaughton [Fri, 23 Aug 2019 00:32:54 +0000 (12:32 +1200)]
Merge pull request #15104 from christianwach/lab-1203
Add `pre` and `post` hooks to Domain create and edit operations
Tim Otten [Thu, 22 Aug 2019 23:07:44 +0000 (16:07 -0700)]
Update release-notes.md
Tim Otten [Thu, 22 Aug 2019 23:05:09 +0000 (16:05 -0700)]
Update 5.16.3.md
Seamus Lee [Thu, 22 Aug 2019 22:39:34 +0000 (08:39 +1000)]
Add in release notes for 5.16.3 drop
Seamus Lee [Thu, 22 Aug 2019 22:18:59 +0000 (08:18 +1000)]
Merge pull request #15106 from alifrumin/5.17.0-rn
5.17.0 release notes: first pass at sorting and annotating
Patrick Figel [Thu, 22 Aug 2019 20:27:52 +0000 (22:27 +0200)]
dev/financial#66 - Fix missing contribution ID for AdditionalInfo
This fixes an issues where the contribution ID is not being passed
when the AdditionalInfo form block is retrieved in the contribution
form. This causes existing values of fields in this block to not be
loaded, leading to data loss when the form is saved.
Alice Frumin [Wed, 21 Aug 2019 15:16:21 +0000 (11:16 -0400)]
5.17.0 release notes: first pass at sorting and annotating
Christian Wach [Thu, 22 Aug 2019 18:03:55 +0000 (19:03 +0100)]
Add `pre` and `post` hooks to Domain create and edit operations
Christian Wach [Thu, 22 Aug 2019 12:08:19 +0000 (13:08 +0100)]
Ensure Dashboard respects multiple Domains
Tim Otten [Thu, 22 Aug 2019 11:15:48 +0000 (04:15 -0700)]
composer.lock - Update to include civicrm/composer-downloads-plugin
Tim Otten [Thu, 15 Aug 2019 09:24:40 +0000 (02:24 -0700)]
composer.json - Add all bower assets via composer-downloads-plugin
Before
------
* JS and CSS libraries and downloaded via `bower`.
* `bower` is deprecated.
* `bower` is slow.
* `bower` requires installing NodeJS
* `bower` requries installing Bower
After
-----
* `composer install` downloads the `bower_components` folder
* `composer` has a better cache
* `composer` is fast
* You can setup a dev build with fewer dependencies.
Comments
--------
There are many, many composer plugins which can be referenced when managing
assets. This particular one has an important distinction:
* It does not require root-level package configuration.
* It produces a file-structure that closely matches the current one.
* It works just as well as whether 'civicrm-core' is used as a root-package
or as an dependency.
Tim Otten [Thu, 15 Aug 2019 09:24:20 +0000 (02:24 -0700)]
Remove bower.json
This will be replaced in an adjacent commit with updates to composer.json
Eileen McNaughton [Thu, 22 Aug 2019 09:03:17 +0000 (21:03 +1200)]
Merge pull request #15064 from seamuslee001/fee_amount_id_search_fix
CRM-17182 Fix Search on fee_level_id and ensure that participant.fee_amount isn't updated when label changes
Seamus Lee [Sun, 18 Aug 2019 03:17:09 +0000 (13:17 +1000)]
Add in unit test of searching when price field value label has changed
Seamus Lee [Sun, 18 Aug 2019 02:11:09 +0000 (12:11 +1000)]
Resolve CRM-17182 by filtering on civicrm_line_item.price_field_value_id instead of th fee_amount column
Pass id in the params array rather than in the ids array
Seamus Lee [Sat, 17 Aug 2019 22:56:18 +0000 (08:56 +1000)]
Add in unit test demonstrating that fee label changes when the price field value label changes
Seamus Lee [Thu, 22 Aug 2019 05:37:18 +0000 (15:37 +1000)]
Merge pull request #15095 from eileenmcnaughton/export_metadata
[Test] [NFC] upgrade remaining export tests
Eileen McNaughton [Thu, 22 Aug 2019 05:18:19 +0000 (17:18 +1200)]
Merge pull request #15098 from civicrm/5.17
5.17
Eileen McNaughton [Thu, 22 Aug 2019 05:15:55 +0000 (17:15 +1200)]
Merge pull request #15089 from totten/5.17-install-msg
(dev/drupal#79) Fail more gracefully when attempting to install on PHP 5.x
eileen [Thu, 22 Aug 2019 02:10:02 +0000 (14:10 +1200)]
Add test cover for js for an im provider mapping
Seamus Lee [Thu, 22 Aug 2019 01:07:53 +0000 (11:07 +1000)]
Merge pull request #15061 from eileenmcnaughton/agile
Fix readability & caching on CRM_Contact_BAO_Relationship::isInheritedMembershipInvalidated
colemanw [Thu, 22 Aug 2019 00:40:58 +0000 (20:40 -0400)]
Merge pull request #15068 from eileenmcnaughton/mapping_test
[REF] minor code refactor on import - Pass ProcessorObject into loadSavedMapping & use it to load the formName
eileen [Sun, 18 Aug 2019 08:08:24 +0000 (20:08 +1200)]
Pass ProcessorObject into loadSavedMapping & use it to load the formName
After a few more steps we can eliminate most of this function & use the processor but this is jusut a very small
change....