Matthew Wire [Tue, 28 Apr 2020 15:22:18 +0000 (16:22 +0100)]
Cleanup and throw exceptions in OpenCase form
Matthew Wire [Mon, 27 Apr 2020 13:42:30 +0000 (14:42 +0100)]
Merge pull request #17071 from eileenmcnaughton/payment
Refactor api3 Payment.Get API to support options + most fields in civicrm_financial_trxn
Matthew Wire [Thu, 20 Feb 2020 17:15:37 +0000 (17:15 +0000)]
Refactor api3 Payment.Get API to support options + most fields in civicrm_financial_trxn
Unit test for PR#16603
Alternative for fix ups on Payment.get
Eileen McNaughton [Mon, 27 Apr 2020 03:07:28 +0000 (15:07 +1200)]
Merge pull request #17173 from civicrm/5.25
5.25 to master
Eileen McNaughton [Mon, 27 Apr 2020 02:56:09 +0000 (14:56 +1200)]
Merge pull request #17128 from seamuslee001/dev_core_1710
dev/core#1710 Ensure that civicrm_case_activity is properly populated…
Seamus Lee [Tue, 21 Apr 2020 09:21:23 +0000 (19:21 +1000)]
dev/core#1710 Ensure that civicrm_case_activity is properly populated for use by report query when run in force mode
Move table definition into constructor to set alias using standard ways and only rely on the code in the buildQuery to add in the case_id column as necessary
Fix hiding of case_id column
Update to include Case ID column
Matthew Wire [Sun, 26 Apr 2020 21:34:23 +0000 (22:34 +0100)]
Merge pull request #17131 from eileenmcnaughton/batch
Remove unused parameter, immediately overwritten parameter
Matthew Wire [Sun, 26 Apr 2020 21:27:13 +0000 (22:27 +0100)]
Merge pull request #16733 from eileenmcnaughton/smarty
Do not create smarty cached templates for processed greetings
Eileen McNaughton [Sun, 26 Apr 2020 02:45:59 +0000 (14:45 +1200)]
Merge pull request #17171 from civicrm/5.25
5.25
Eileen McNaughton [Sat, 25 Apr 2020 23:24:46 +0000 (11:24 +1200)]
Merge pull request #17170 from colemanw/optionValueDefault
OptionValue - Use DB defaults instead of setting them in BAO::add
Seamus Lee [Sat, 25 Apr 2020 21:18:28 +0000 (07:18 +1000)]
Merge pull request #17164 from pradpnayak/invoicingHidden
Invoice action not shown when invoicing enabled
Pradeep Nayak [Fri, 24 Apr 2020 15:17:06 +0000 (16:17 +0100)]
Invoice action not shown when invoicing enabled
Coleman Watts [Sat, 25 Apr 2020 13:22:21 +0000 (09:22 -0400)]
OptionValue - Use DB defaults instead of setting them in BAO::add
Of the 4 defaults being set in the DAO, 3 already had db defaults; I added DEFAULT NULL for the last.
colemanw [Sat, 25 Apr 2020 13:12:29 +0000 (09:12 -0400)]
Merge pull request #17168 from colemanw/contactFieldPerms
[REF] APIv4 - Enforce contact field permissions via metadata
Eileen McNaughton [Sat, 25 Apr 2020 03:26:38 +0000 (15:26 +1200)]
Merge pull request #17165 from pradpnayak/ActivitySource
Add contribution id as activity source record when downloading or emailing invoice
Eileen McNaughton [Sat, 25 Apr 2020 03:21:22 +0000 (15:21 +1200)]
Merge pull request #17166 from colemanw/optionGroupTitle
Correct option_group pseudoconstant and regenerate dao
colemanw [Sat, 25 Apr 2020 03:14:24 +0000 (23:14 -0400)]
Merge pull request #17161 from eileenmcnaughton/out
[REF] Code readability changes on activity tokens.
Coleman Watts [Fri, 24 Apr 2020 19:32:42 +0000 (15:32 -0400)]
APIv4 - Enforce contact field permissions via metadata instead of class override
Now that 'permission' metadata has been added to the schema, there's no need for specialized code for that field.
This adds generic code to handle any field with permissions declared.
Coleman Watts [Fri, 24 Apr 2020 17:00:04 +0000 (13:00 -0400)]
Correct option_group pseudoconstant and regenerate dao
The option_group_id pseudoconstant was returning the `name` field as both "name" and "label"
whereas the `title` field works better as "label".
Pradeep Nayak [Fri, 24 Apr 2020 15:23:29 +0000 (16:23 +0100)]
activity api accepts name in activity type
Pradeep Nayak [Fri, 24 Apr 2020 15:20:51 +0000 (16:20 +0100)]
Add contribution id as activity source record when downloading or emailing invoice
Eileen McNaughton [Fri, 24 Apr 2020 06:21:11 +0000 (18:21 +1200)]
Merge pull request #17159 from eileenmcnaughton/ids
Less svn
eileen [Fri, 24 Apr 2020 04:33:26 +0000 (16:33 +1200)]
[REF] Code readability changes on activity tokens.
I've been trying to get to grips with this code and this addresses 2 things I found very confusing - notably
- using activityId when we were referring to a fieldname - we use a combination of & for
variables but normally when it's closely related to a query we use activity_id
- the function name getEntityContextSchema() was unclear to me - I concluded that in fact we were retrieving
the nname of the field for the entity ID
Yashodha Chaku [Fri, 24 Apr 2020 04:37:25 +0000 (10:07 +0530)]
Merge pull request #17160 from eileenmcnaughton/out
[REF] Minor extraction
eileen [Fri, 24 Apr 2020 00:31:24 +0000 (12:31 +1200)]
[REF] Minor extraction
Extract the code that renders the generated html it pdfs or word docs
eileen [Thu, 23 Apr 2020 11:33:19 +0000 (23:33 +1200)]
Less svn
Eileen McNaughton [Fri, 24 Apr 2020 00:13:34 +0000 (12:13 +1200)]
Merge pull request #17158 from colemanw/optionNames
OptionValues - Munge custom value names and return names in validate context
Coleman Watts [Thu, 23 Apr 2020 17:58:55 +0000 (13:58 -0400)]
REF - Code cleaup: replace clunky coalesce conditionals with simple coalesce expressions using ??
Coleman Watts [Thu, 23 Apr 2020 17:50:25 +0000 (13:50 -0400)]
OptionValues - Munge custom value names and return names in validate context
Fixes a couple core bugs, where option value names were not being munged by default,
and custom field options were not being returned correctly in the 'validate' context.
This is the core change as part of APIV4 work
See https://lab.civicrm.org/dev/core/-/issues/1705
Yashodha Chaku [Thu, 23 Apr 2020 15:27:15 +0000 (20:57 +0530)]
Merge pull request #17155 from eileenmcnaughton/pdf
[NFC] Superficial code clean up
Eileen McNaughton [Thu, 23 Apr 2020 12:42:52 +0000 (00:42 +1200)]
Merge pull request #17157 from eileenmcnaughton/ids
[NFC] A bit less svn in our code
eileen [Thu, 23 Apr 2020 11:18:05 +0000 (23:18 +1200)]
[NFC] A bit less svn in our code
eileen [Thu, 23 Apr 2020 06:57:54 +0000 (18:57 +1200)]
[NFC] Superficial code clean up
Seamus Lee [Thu, 23 Apr 2020 09:04:06 +0000 (19:04 +1000)]
Merge pull request #17154 from eileenmcnaughton/disp
[REF] Consistently lookup dispatcher via `Civi::dispatcher()`
Seamus Lee [Thu, 23 Apr 2020 07:34:28 +0000 (17:34 +1000)]
Merge pull request #17153 from eileenmcnaughton/acti
Convert test to use APIV4 in setup for cleaner code
eileen [Thu, 23 Apr 2020 06:25:08 +0000 (18:25 +1200)]
[REF] Make instantiation of dispatcher consistent.
We have 3 ways of iniatiging a dispatcher
Civi\Core\Container::singleton()->get('dispatcher')
Civi::service('dispatcher')
Civi::dispatcher()
Tim confirms there is no functional difference, so this consolidates on the shortest one :-)
eileen [Thu, 23 Apr 2020 04:33:24 +0000 (16:33 +1200)]
Convert test to use APIV4 in setup for cleaner code
Eileen McNaughton [Thu, 23 Apr 2020 05:23:27 +0000 (17:23 +1200)]
Merge pull request #17152 from eileenmcnaughton/act2
[NFC] [Test] minor code cleanup
Eileen McNaughton [Thu, 23 Apr 2020 04:31:45 +0000 (16:31 +1200)]
Merge pull request #17138 from colemanw/api4pseudoconstants
dev/core#1705 APIv4 - Support pseudoconstant lookups
eileen [Thu, 23 Apr 2020 03:33:45 +0000 (15:33 +1200)]
[NFC] [Test] minor code cleanup
Seamus Lee [Thu, 23 Apr 2020 02:50:34 +0000 (12:50 +1000)]
Merge pull request #17150 from civicrm/5.25
5.25
Seamus Lee [Thu, 23 Apr 2020 02:48:46 +0000 (12:48 +1000)]
Merge pull request #17149 from seamuslee001/5.25
Add release-notes/5.24.5.md
Tim Otten [Thu, 23 Apr 2020 00:03:35 +0000 (17:03 -0700)]
Add release-notes/5.24.5.md
Coleman Watts [Wed, 22 Apr 2020 21:48:34 +0000 (17:48 -0400)]
APIv4 - Fix contactFieldsToRemove to work with joins and pseudoconstants
Coleman Watts [Mon, 20 Apr 2020 13:00:07 +0000 (09:00 -0400)]
APIv4 - Support pseudoconstant lookups
Appending a suffix to a field name e.g. location_type_id:name or gender_id:label
will automatically lookup values from field option lists.
colemanw [Wed, 22 Apr 2020 15:57:36 +0000 (11:57 -0400)]
Merge pull request #17141 from mlutfy/reportOutput
[NFC] Cleanup CRM_Report_Form
Matthew Wire [Wed, 22 Apr 2020 12:33:42 +0000 (13:33 +0100)]
Merge pull request #17136 from demeritcowboy/portugal-provinces
Update more Portugal provinces
Seamus Lee [Wed, 22 Apr 2020 06:32:08 +0000 (16:32 +1000)]
Merge pull request #17139 from civicrm/5.25
5.25
Seamus Lee [Wed, 22 Apr 2020 03:54:42 +0000 (13:54 +1000)]
Merge pull request #17134 from jitendrapurohit/core-1723-rc
dev/core#1723 - Adv Search - Reciprocal relationship search with custom fields leads to error
Jitendra Purohit [Tue, 21 Apr 2020 11:31:34 +0000 (17:01 +0530)]
RC fix for #17132
unit test fix
Tim Otten [Wed, 22 Apr 2020 02:07:27 +0000 (19:07 -0700)]
Merge pull request #17133 from eileenmcnaughton/dep
(NFC) Comment clarification in test class
Mathieu Lutfy [Wed, 22 Apr 2020 02:03:37 +0000 (22:03 -0400)]
Cleanup CRM_Report_Form
Seamus Lee [Wed, 22 Apr 2020 01:26:33 +0000 (11:26 +1000)]
Merge pull request #17137 from seamuslee001/dev_core_1717
dev/core#1717 - Fix SMTP failure involving `disconnect()` method
Seamus Lee [Tue, 21 Apr 2020 21:11:29 +0000 (07:11 +1000)]
dev/core#1717 Fix SMTP failure on fail to disconnect due to new wrapper smtp mailer
Add in wrapper around to check if we can call it
Tim Otten [Tue, 21 Apr 2020 22:05:23 +0000 (15:05 -0700)]
Merge pull request #17105 from colemanw/psr-4
dev/core#1684 - Use PSR-4 autoloader instead of PSR-0 for "Civi" namespace
colemanw [Tue, 21 Apr 2020 21:49:52 +0000 (17:49 -0400)]
Merge pull request #16716 from mattwire/cancelsubscriptionaddemail
Add contributor email address to cancelSubscription form so it is cle…
demeritcowboy [Tue, 21 Apr 2020 21:07:32 +0000 (17:07 -0400)]
update Portugal provinces
Eileen McNaughton [Tue, 21 Apr 2020 20:00:30 +0000 (08:00 +1200)]
Merge pull request #17135 from demeritcowboy/leftover-description
dev/user-interface#19 - Remove leftover description text on contribution form mistakenly left in
demeritcowboy [Tue, 21 Apr 2020 18:31:50 +0000 (14:31 -0400)]
leftover description text from net amount field removal years ago
Matthew Wire [Mon, 9 Mar 2020 12:35:28 +0000 (12:35 +0000)]
Add contributor email address to cancelSubscription form so it is clear where it will be sent
eileen [Tue, 21 Apr 2020 11:25:16 +0000 (23:25 +1200)]
Comment clarification in test class
I just updated the comments on this helper to clarify the limitations of the function & the
fact that it should not be our only way to test thousand separators.
I was noticing perfect was becoming the enemy of the good here. The function was marked as deprecated
because it doesn't cover all scenarios - but the upshot was that we stopped increasing out
thousand separator testing. In fact we need lots of form tests to do some testing of
the separators and a very small number to test more variants - this latter has been added
& the comments point to the need for more without going as far as deprecating
eileen [Tue, 21 Apr 2020 11:02:23 +0000 (23:02 +1200)]
Remove unused parameter, immediately overwritten parameter
Seamus Lee [Tue, 21 Apr 2020 04:19:13 +0000 (14:19 +1000)]
Merge pull request #17123 from civicrm/5.25
5.25
Yashodha Chaku [Tue, 21 Apr 2020 03:21:50 +0000 (08:51 +0530)]
Merge pull request #17099 from lcdservices/dev-core-1718
dev/core#1718 membership batch entry join date fix
Seamus Lee [Tue, 21 Apr 2020 02:27:10 +0000 (12:27 +1000)]
Merge pull request #17119 from agh1/5.25.0-releasenotes
5.25.0 release notes first run
colemanw [Tue, 21 Apr 2020 00:14:29 +0000 (20:14 -0400)]
Merge pull request #17064 from eileenmcnaughton/email3
Convert bcc field to use an entity reference.
colemanw [Tue, 21 Apr 2020 00:10:03 +0000 (20:10 -0400)]
Merge pull request #17121 from eileenmcnaughton/update
[REF] Minor var simplification
eileen [Mon, 20 Apr 2020 22:39:33 +0000 (10:39 +1200)]
[REF] Minor var simplification
Eileen McNaughton [Mon, 20 Apr 2020 22:11:35 +0000 (10:11 +1200)]
Merge pull request #17106 from pradpnayak/statepro1
Update Colmbra state/province to Coimbra
Eileen McNaughton [Mon, 20 Apr 2020 22:09:48 +0000 (10:09 +1200)]
Merge pull request #17109 from colemanw/noAlias
APIv4 - Prevent field alias conflicts.
Andrew Hunt [Mon, 20 Apr 2020 21:52:21 +0000 (17:52 -0400)]
5.25.0 release notes: added boilerplate
Andrew Hunt [Mon, 20 Apr 2020 21:47:41 +0000 (17:47 -0400)]
5.25.0 release notes: raw from script
colemanw [Mon, 20 Apr 2020 17:29:33 +0000 (13:29 -0400)]
Merge pull request #17113 from colemanw/restoreApiSql
Restore #16947 - APIv4 support for sql functions and grouping
Coleman Watts [Mon, 20 Apr 2020 15:43:18 +0000 (11:43 -0400)]
Restore #16947 - APIv4 support for sql functions and grouping
Seamus Lee [Mon, 20 Apr 2020 09:17:44 +0000 (19:17 +1000)]
Merge pull request #17111 from seamuslee001/master
5.25
Seamus Lee [Mon, 20 Apr 2020 09:16:14 +0000 (19:16 +1000)]
Merge in 5.25
Seamus Lee [Mon, 20 Apr 2020 09:11:39 +0000 (19:11 +1000)]
Merge pull request #17093 from eileenmcnaughton/cont
[NFC] Remove calculation of unused parameter
Seamus Lee [Mon, 20 Apr 2020 08:54:32 +0000 (18:54 +1000)]
Merge pull request #17108 from colemanw/revertSqlFn
Revert #16947 from 5.25RC
Coleman Watts [Mon, 20 Apr 2020 00:55:19 +0000 (20:55 -0400)]
APIv4 - Prevent field alias conflicts.
Do not allow regular fields to be aliased - only expressions.
Prevent an alias from using the same name as an existing field.
colemanw [Mon, 20 Apr 2020 00:50:55 +0000 (20:50 -0400)]
Merge pull request #17069 from colemanw/removeUselessChecks
[REF] Remove duplicate checks for an array key existing
Coleman Watts [Sun, 19 Apr 2020 23:56:26 +0000 (19:56 -0400)]
Revert "APIv4 - Add rudimentary support for groupBy"
This reverts commit
fba513f62ec8815e08fa838e0d0501279bf34501.
Coleman Watts [Sun, 19 Apr 2020 23:56:25 +0000 (19:56 -0400)]
Revert "Api4SelectQuery - add more metadata to apiFieldSpec"
This reverts commit
9b06167d3c8dc54bb51e22e3583b18799a46c930.
Coleman Watts [Sun, 19 Apr 2020 23:56:20 +0000 (19:56 -0400)]
Revert "APIv4 - Add SQL expression handling and aggregate functions"
This reverts commit
3176b04cb62b0e8f94454e367736f50454f89de8.
Pradeep Nayak [Sun, 19 Apr 2020 19:58:58 +0000 (20:58 +0100)]
updated civicrm_generated.mysql file
Pradeep Nayak [Sun, 19 Apr 2020 17:39:50 +0000 (18:39 +0100)]
Update Colmbra state/province to Coimbra
Coleman Watts [Sun, 19 Apr 2020 01:08:38 +0000 (21:08 -0400)]
dev/core#1684 Use psr-4 autoloader instead of psr-0 for Civi directory
This change is to allow underscores in class names, which were being misinterpreted as directory separators.
colemanw [Sun, 19 Apr 2020 01:33:06 +0000 (21:33 -0400)]
Merge pull request #17080 from colemanw/importExtract
[REF] Import - extract duplicate code to function
colemanw [Sat, 18 Apr 2020 15:50:56 +0000 (11:50 -0400)]
Merge pull request #17101 from totten/master-gitlab-tpl
(NFC) Gitlab Template - Request more detail about upgrade problems
colemanw [Sat, 18 Apr 2020 15:14:09 +0000 (11:14 -0400)]
Merge pull request #17100 from artfulrobot/artfulrobot-lab-1917
Replace CaseType's own XML encoding function
Rich Lott / Artful Robot [Sat, 18 Apr 2020 07:55:51 +0000 (08:55 +0100)]
dev-core/1719: replace xml encoding function in CaseType
colemanw [Fri, 17 Apr 2020 23:32:06 +0000 (19:32 -0400)]
Merge pull request #17098 from mattwire/removeunusedparameterjob
Remove unused parameter from function
Seamus Lee [Fri, 17 Apr 2020 21:49:07 +0000 (07:49 +1000)]
Merge pull request #17051 from eileenmcnaughton/ex
Remove outputHeader as a param for writeCSVFile as it is always true
Seamus Lee [Fri, 17 Apr 2020 21:48:22 +0000 (07:48 +1000)]
Merge pull request #17102 from mattwire/removevar
Remove var that is defined on parent
Matthew Wire [Fri, 17 Apr 2020 19:47:51 +0000 (20:47 +0100)]
Remove var that is defined on parent
Tim Otten [Fri, 17 Apr 2020 19:25:27 +0000 (12:25 -0700)]
(NFC) Gitlab Template - Request more detail about upgrades
Brian Shaughnessy [Fri, 17 Apr 2020 15:34:04 +0000 (11:34 -0400)]
dev/core#1718 membership batch entry join date fix
Matthew Wire [Fri, 17 Apr 2020 14:40:34 +0000 (15:40 +0100)]
Merge pull request #17087 from eileenmcnaughton/ids
[REF] Stop passing ids to membership::create from createRelatedMemberships
Matthew Wire [Fri, 17 Apr 2020 14:39:46 +0000 (15:39 +0100)]
Merge pull request #17086 from eileenmcnaughton/memview
Don't pass empty ids parameter, fix fatal
Matthew Wire [Fri, 17 Jan 2020 19:02:32 +0000 (19:02 +0000)]
Remove unused parameter from function
colemanw [Fri, 17 Apr 2020 12:40:59 +0000 (08:40 -0400)]
Merge pull request #17089 from eileenmcnaughton/memdate
[REF] get rid of variable variable structure