eileen [Sat, 25 May 2019 07:41:54 +0000 (19:41 +1200)]
Convert event search to use metadata
This only converts one field (participant status) but lays the ground-work for converting more &
removing the jcalendar
Eileen McNaughton [Tue, 28 May 2019 19:56:56 +0000 (07:56 +1200)]
Merge pull request #14354 from eileenmcnaughton/cont_search
Fix inconsistent handling when searching contribution text fields
Eileen McNaughton [Tue, 28 May 2019 14:20:27 +0000 (02:20 +1200)]
Merge pull request #14098 from eileenmcnaughton/event_income
[REF] extract buildClause from CRM_Report_Form_Event_Income
Seamus Lee [Tue, 28 May 2019 05:17:21 +0000 (15:17 +1000)]
Merge pull request #14359 from seamuslee001/fix_cache_key_column
Fix name of cache key column to be all lower case rather than camel c…
Seamus Lee [Mon, 27 May 2019 22:45:33 +0000 (08:45 +1000)]
Fix name of cache key column to be all lower case rather than camel case in civicrm_prevnext_cache
Fix test failures
Eileen McNaughton [Tue, 28 May 2019 00:51:08 +0000 (12:51 +1200)]
Merge pull request #14360 from colemanw/byRef
Remove confusing pass params by ref
Coleman Watts [Mon, 27 May 2019 23:15:43 +0000 (19:15 -0400)]
Remove confusing pass params by ref
eileen [Sun, 26 May 2019 23:57:09 +0000 (11:57 +1200)]
Fix inconsistent handling when searching contribution text fields
I found that if you search on contribution source it adds wildcards & uses 'like' but with cancel_reason not
so much.
I found that for contribution_source there was field-specific hacky handling, so I converted both fields
to be metadata based and added handling for string fields on the form layer
colemanw [Mon, 27 May 2019 21:58:25 +0000 (17:58 -0400)]
Merge pull request #14298 from eileenmcnaughton/dedupe_stats
dev/core#982 add dedupe.getstatistics api
Eileen McNaughton [Mon, 27 May 2019 21:54:45 +0000 (09:54 +1200)]
Merge pull request #14358 from samuelsov/billingblockts
Translation in billingblock.tpl - dropping 'Information'
Eileen McNaughton [Mon, 27 May 2019 21:18:04 +0000 (09:18 +1200)]
Merge pull request #14357 from colemanw/api4Wrap
Don't apply api3 pre/post processing to api4 actions
Eileen McNaughton [Mon, 27 May 2019 21:13:07 +0000 (09:13 +1200)]
Merge pull request #14352 from eileenmcnaughton/fin_status
Fix bug where contribution status is mishandled if label is changed
Samuel Vanhove [Mon, 27 May 2019 18:17:59 +0000 (14:17 -0400)]
Translation in billingblock.tpl - dropping 'Information'
Coleman Watts [Fri, 24 May 2019 18:27:52 +0000 (14:27 -0400)]
Skip wrapping v4 api requests in a transaction
Transactions aren't a bad thing and we probably want to revisit this but
for now I'm disabling it becuase it's broken, as seen in api_v3_ActivityTest.
I think the problem is with the onApiException event not being dispatched
because api4 doesn't go through Kernel->runSafe, so transactions aren't
being rolled back when they should.
Coleman Watts [Fri, 24 May 2019 18:27:23 +0000 (14:27 -0400)]
Skip adding default api wrappers to v4 actions
Seamus Lee [Mon, 27 May 2019 08:40:42 +0000 (18:40 +1000)]
Merge pull request #14356 from civicrm/5.14
5.14
Seamus Lee [Mon, 27 May 2019 06:59:27 +0000 (16:59 +1000)]
Merge pull request #14351 from seamuslee001/ics_file
dev/core#974 Whitelist .ics extension
Seamus Lee [Mon, 20 May 2019 23:04:49 +0000 (09:04 +1000)]
Whitelist .ics file extension
Include Upgrade step and regenrate civicrm_generated file
Fix upgrade
Eileen McNaughton [Mon, 27 May 2019 04:15:37 +0000 (16:15 +1200)]
Merge pull request #14280 from seamuslee001/dev_core_975
dev/core#975 Fix url for new activity in breadcrumbs
Seamus Lee [Tue, 21 May 2019 09:11:41 +0000 (19:11 +1000)]
dev/core#975 Fix url for new activity in breadcrumbs in find activity search
eileen [Sun, 26 May 2019 22:03:06 +0000 (10:03 +1200)]
Fix bug where contribution status is mishandled if label is changed
Seamus Lee [Mon, 27 May 2019 00:01:39 +0000 (10:01 +1000)]
Merge pull request #14350 from seamuslee001/test_dev_627
dev/core#627 Extend a unit test to verify fix made by Sunil
Seamus Lee [Sun, 26 May 2019 22:42:52 +0000 (08:42 +1000)]
Merge pull request #14345 from mattwire/case_extraline
Remove duplicate line in case BAO
Seamus Lee [Sun, 26 May 2019 22:39:05 +0000 (08:39 +1000)]
Merge pull request #13374 from cividesk/dev-627
correct syntax "IS NOT NULL" to get pledge payment count
Seamus Lee [Sun, 26 May 2019 21:30:53 +0000 (07:30 +1000)]
dev/core#627 Extend a unit test to verify fix made by Sunil
Add in additional test for when no transactions have occured
Seamus Lee [Sun, 26 May 2019 21:12:25 +0000 (07:12 +1000)]
Merge pull request #14342 from eileenmcnaughton/deprecated
[REF] Remove input format function from deprecated utils to the only place that calls it
Seamus Lee [Sun, 26 May 2019 21:09:05 +0000 (07:09 +1000)]
Merge pull request #14335 from eileenmcnaughton/bao_contribution
[NFC] phpdoc cleanup
Eileen McNaughton [Sun, 26 May 2019 20:54:47 +0000 (08:54 +1200)]
Merge pull request #14332 from civicrm/colemanw-patch-1
dev/core#968 Fix javascript error on public pages
Matthew Wire [Sun, 26 May 2019 14:32:31 +0000 (15:32 +0100)]
Merge pull request #14334 from eileenmcnaughton/fin_status
[REF] extract updateFinancialAccountsOnContributionStatusChange
colemanw [Sun, 26 May 2019 12:12:25 +0000 (08:12 -0400)]
Merge pull request #14341 from eileenmcnaughton/deprecated2
Remove never-called function _civicrm_api3_deprecated_contact_check_custom_params
Matthew Wire (MJW Consulting) [Sun, 26 May 2019 11:53:03 +0000 (12:53 +0100)]
Remove duplicate line
Matthew Wire [Sun, 26 May 2019 11:03:20 +0000 (12:03 +0100)]
Merge pull request #14336 from eileenmcnaughton/pdfletter
[REF] extract isLiveMode
Seamus Lee [Sun, 26 May 2019 07:18:08 +0000 (17:18 +1000)]
Merge pull request #14344 from seamuslee001/test_tidy_up
[NFC] Further tests tidy up following removing of dbunit
Seamus Lee [Sun, 26 May 2019 05:53:28 +0000 (15:53 +1000)]
[NFC] Further tests tidy up following removing of dbunit
Eileen McNaughton [Sun, 26 May 2019 05:05:59 +0000 (17:05 +1200)]
Merge pull request #14331 from eileenmcnaughton/select
Fix fatal error when full group by mysql mode enabled & selecting contacts
Seamus Lee [Sun, 26 May 2019 03:14:45 +0000 (13:14 +1000)]
Merge pull request #14340 from eileenmcnaughton/select2
Unit test for FGB error in #14331
eileen [Sun, 26 May 2019 02:54:02 +0000 (14:54 +1200)]
Remove input format function from deprecated utils to the only place that calls it
eileen [Sun, 26 May 2019 02:56:00 +0000 (14:56 +1200)]
Remove never-called function _civicrm_api3_deprecated_contact_check_custom_params
colemanw [Sat, 25 May 2019 19:15:19 +0000 (15:15 -0400)]
dev/core#968 Fix javascript error on public pages
Checks for the existence of the toolbar item before referencing it.
eileen [Sun, 26 May 2019 01:56:16 +0000 (13:56 +1200)]
Unit test for FGB error in #14331
Eileen McNaughton [Sun, 26 May 2019 01:05:36 +0000 (13:05 +1200)]
Merge pull request #14338 from eileenmcnaughton/contact_search
[REF] use generic loadStandardSearchOptionsFromUrl
eileen [Sun, 26 May 2019 00:05:08 +0000 (12:05 +1200)]
[REF] use generic loadStandardSearchOptionsFromUrl
I picked this up as a reviewer's commit of https://github.com/civicrm/civicrm-core/pull/13651
That PR is stale but I like to pick out a bit I can get merged when closing a stale pr
Eileen McNaughton [Sat, 25 May 2019 23:56:50 +0000 (11:56 +1200)]
Merge pull request #14138 from johncronan/drupal_login_url
dev/core#898: use user.login route for D8 login URL instead of user.page
eileen [Sat, 25 May 2019 23:47:41 +0000 (11:47 +1200)]
[REF] extract isLiveMode
I'm closing https://github.com/civicrm/civicrm-core/pull/13369 as it is stale, but
I figure it makes sense to pull out this extraction from it. I think the PR then
alters the button names taken into account but I'm not seeking to fix here, just
to do the extraction
Eileen McNaughton [Sat, 25 May 2019 23:41:10 +0000 (11:41 +1200)]
Merge pull request #14158 from demeritcowboy/deny-for-real
dev/core#913 - update autogenerated .htaccess for apache 2.4
eileen [Sat, 25 May 2019 23:38:21 +0000 (11:38 +1200)]
Further phpcs mandated fixes
I removed the poorly formatted comment as it seemed out of date anyway
eileen [Sat, 25 May 2019 23:32:10 +0000 (11:32 +1200)]
[NFC] phpdoc cleanup
Fixes style elements that stricter phpcs picks up
eileen [Sat, 25 May 2019 23:18:29 +0000 (11:18 +1200)]
[REF] extract updateFinancialAccountsOnContributionStatusChange
Seamus Lee [Sat, 25 May 2019 21:12:39 +0000 (07:12 +1000)]
Merge pull request #14328 from eileenmcnaughton/dbunit
[dbunit test] remove dbunit dependency
Matthew Wire [Sat, 25 May 2019 16:14:47 +0000 (17:14 +0100)]
Merge pull request #14292 from eileenmcnaughton/cachedtree
Reduce cache bypasses - do not bypass custom metadata cache in setGroupTree
Matthew Wire [Sat, 25 May 2019 16:11:46 +0000 (17:11 +0100)]
Merge pull request #14316 from eileenmcnaughton/membershipRenewal
Fix test / possible live error on submitting credit card renewals
Matthew Wire [Sat, 25 May 2019 16:09:17 +0000 (17:09 +0100)]
Merge pull request #14324 from eileenmcnaughton/dedupe_cleanup2
[REF] Extract function to get cached duplicate matches
Matthew Wire [Sat, 25 May 2019 16:07:59 +0000 (17:07 +0100)]
Merge pull request #14318 from eileenmcnaughton/reorg
[REF] minor code re-org
Matthew Wire [Sat, 25 May 2019 16:05:27 +0000 (17:05 +0100)]
Merge pull request #14323 from eileenmcnaughton/dao
[NFC] Docblock fixes
Matthew Wire [Sat, 25 May 2019 16:03:41 +0000 (17:03 +0100)]
Merge pull request #14329 from eileenmcnaughton/smtp
dev/core#879 SMTP help text is misleading - references the wrong admin screen
Matthew Wire [Sat, 25 May 2019 16:02:00 +0000 (17:02 +0100)]
Merge pull request #13997 from eileenmcnaughton/recur_entity
dev/core#830 Expose cancel_reason field by cleaning up the cancel template to use entity field template
eileen [Sat, 25 May 2019 08:32:54 +0000 (20:32 +1200)]
Disable full group by when selecting contacts
eileen [Sat, 25 May 2019 05:59:02 +0000 (17:59 +1200)]
[dbunit test] remove dbunit dependency
Seamus Lee [Sat, 25 May 2019 08:37:46 +0000 (18:37 +1000)]
Merge pull request #14321 from eileenmcnaughton/test_dbunit
dev/core#980 [dbunit] remove dependency on discontinued dbunit
eileen [Sat, 25 May 2019 06:34:10 +0000 (18:34 +1200)]
dev/core#879 SMTP help text is misleading - references the wrong admin screen
Eileen McNaughton [Sat, 25 May 2019 06:13:44 +0000 (18:13 +1200)]
Merge pull request #14087 from seamuslee001/npm_version_update
(NFC) Update node package versions to latest ones
Eileen McNaughton [Sat, 25 May 2019 06:05:49 +0000 (18:05 +1200)]
Merge pull request #14082 from pradpnayak/caseReport
dev/core/issues/743, Donot join relationship table when not required
eileen [Fri, 24 May 2019 21:27:18 +0000 (09:27 +1200)]
[dbunit] remove dependency on discontinued dbunit
Eileen McNaughton [Sat, 25 May 2019 05:16:01 +0000 (17:16 +1200)]
Merge pull request #14327 from seamuslee001/fix_warning_job_manager_test
[NFC] Fix issue with Job Manager Test giving out a warning
Seamus Lee [Sat, 25 May 2019 01:39:43 +0000 (11:39 +1000)]
[NFC] Fix issue with Job Manager Test giving out a warning
Seamus Lee [Fri, 24 May 2019 23:45:38 +0000 (09:45 +1000)]
Merge pull request #14326 from civicrm/5.14
5.14
Seamus Lee [Fri, 24 May 2019 23:44:35 +0000 (09:44 +1000)]
Merge pull request #14322 from AlainBenbassat/5.14
fixes issue #981: sort participants did not remember search criteria
eileen [Wed, 22 May 2019 04:52:46 +0000 (16:52 +1200)]
[REF] Extract function to get cached duplicate matches
eileen [Thu, 23 May 2019 01:01:59 +0000 (13:01 +1200)]
Docblock fixes
These are the drupal coder standard but with less rules commented out. Note the null vs NULL
is coming from there.
I think we can now merge https://github.com/civicrm/coder/pull/7 without undue pain on submitters.
Alain Benbassat [Fri, 24 May 2019 21:37:58 +0000 (23:37 +0200)]
fixes issue #981: sort participants did not remember search criteria
Seamus Lee [Fri, 24 May 2019 21:26:12 +0000 (07:26 +1000)]
Merge pull request #14310 from eileenmcnaughton/dedupe_custom_tests
Add unit test for merge handling on custom data.
Seamus Lee [Fri, 24 May 2019 21:24:50 +0000 (07:24 +1000)]
Merge pull request #14314 from eileenmcnaughton/coder
[NFC] Fix comment block for variable declarations
Seamus Lee [Fri, 24 May 2019 21:22:15 +0000 (07:22 +1000)]
Merge pull request #14319 from eileenmcnaughton/xml_dbunit
[dbunit] remove dependencies on discontinued dbunit test package
eileen [Fri, 24 May 2019 02:13:34 +0000 (14:13 +1200)]
[dbunit] remove dependencies on discontinued dbunit test package
Seamus Lee [Fri, 24 May 2019 02:03:37 +0000 (12:03 +1000)]
Merge pull request #14315 from eileenmcnaughton/dbunit_xml
[dbunit] remove dbunit dependency from MembershipRenewalTest
cmtool [Fri, 24 May 2019 02:01:26 +0000 (22:01 -0400)]
NFC - Changed release notes info about Jira to GitLab (#14265)
* Changed info about Jira to GitLab
I'd love some feedback on exactly which release these issues dropped Jira/started using GitLab, as I don't know that information.
* Re-add Jira
* Re-include reference 4.7.14
* Re-include Jira issues, but below GitLab as Jira is currently deprecated
* Remove info about date of Jira depreciation
* Remove info about date of Jira depreciation
* Remove info about date of Jira depreciation
* Remove extra empty line
* Switched order of GitLab and Jira
eileen [Fri, 24 May 2019 01:57:09 +0000 (13:57 +1200)]
[REF] minor code re-org
This simply moves the blocks that are wrapped in if ( == 'changedStatus') into
one block & puts them directly after the block which handles early returns for (some)
status changes
Eileen McNaughton [Fri, 24 May 2019 01:22:52 +0000 (13:22 +1200)]
Merge pull request #14249 from yashodha/959_dev
(dev/core#959) Expose contribution page in Contribution Summary report
eileen [Wed, 22 May 2019 06:36:46 +0000 (18:36 +1200)]
dev/core#982 add dedupe.getstatistics api
Per gitlab the intent is to add a bunch of api so get the logic out of the form into somewhere more accessible.
Following agreement on this I would change all calls to CRM_Dedupe_Merger::getMergeStats to call this api
and get rid of the call to CRM_Core_BAO_PrevNextCache::retrieve from getMergeStats since that retrieve
function really does differrent stuff & is being kinda pointlessly overloaded here.
eileen [Fri, 24 May 2019 00:28:00 +0000 (12:28 +1200)]
Fix test / possible live error on submitting credit card renewals
Seamus Lee [Fri, 24 May 2019 00:18:58 +0000 (10:18 +1000)]
Merge pull request #14269 from eileenmcnaughton/refund_up
[REF] Cleanup input & output on paymentActivityCreate & improve test
eileen [Fri, 24 May 2019 00:00:25 +0000 (12:00 +1200)]
[dbunit] remove dbunit dependency from MembershipRenewalTest
Eileen McNaughton [Thu, 23 May 2019 23:50:48 +0000 (11:50 +1200)]
Merge pull request #14272 from artfulrobot/artfulrobot-gitlab-issue-973
Fix legacy IPN endpoint for Drupal (gitlab issue 973)
eileen [Thu, 23 May 2019 23:28:10 +0000 (11:28 +1200)]
Fix comment block for variable declarations
Per https://github.com/civicrm/coder/pull/7
Seamus Lee [Thu, 23 May 2019 23:14:26 +0000 (09:14 +1000)]
Merge pull request #14279 from eileenmcnaughton/db_test2
dev/core#980 [test-dbunit] Cleanup profile test to not use discontinuted dbunit
Eileen McNaughton [Thu, 23 May 2019 23:12:16 +0000 (11:12 +1200)]
Merge pull request #14302 from mlutfy/drupal19
dev/drupal#19 Drupal8: fix bootstrap when used by the REST API
Eileen McNaughton [Thu, 23 May 2019 23:09:17 +0000 (11:09 +1200)]
Merge pull request #14313 from AlainBenbassat/issue-981
dev/core#981 Sorting participants ignored search values.
Eileen McNaughton [Thu, 23 May 2019 23:00:59 +0000 (11:00 +1200)]
Merge pull request #14309 from pradpnayak/FinancialItem
dev/financial#56 Fix inappropriate sales tax row addition
Eileen McNaughton [Thu, 23 May 2019 22:57:16 +0000 (10:57 +1200)]
Merge pull request #14312 from spalmstr/Joomla_11
dev/joomla#11 Fix php warning when viewing profiles
eileen [Wed, 22 May 2019 01:12:53 +0000 (13:12 +1200)]
Reduce cache bypasses
We have been running this patch in production for some months. When you load up a contribution edit page
(for example) the custom data metadata is loaded without hitting the cache. This means that
unnecessary queries are done. The only reason to bypass the cache would be that it is stale
or parameter dependent. However, the staleness is/ should be dealt with when editing custom
fields & if it is not then there will be other impacts. The entity id is NOT passed into the part of
the code that goes into the cached value
eileen [Thu, 23 May 2019 12:11:38 +0000 (00:11 +1200)]
Add unit test for merge handling on custom data.
This also moves the start & stop of the transaction to being further out so a hard fail
later doesn't leave a half-merged state
Seamus Lee [Thu, 23 May 2019 21:30:51 +0000 (07:30 +1000)]
Merge pull request #14307 from seamuslee001/dao_style
NFC Fix DAO Style issues
Alain Benbassat [Thu, 23 May 2019 20:55:53 +0000 (22:55 +0200)]
corrects test on empty formvalues in postProcess
AlainBenbassat [Thu, 23 May 2019 20:52:38 +0000 (22:52 +0200)]
Merge pull request #2 from civicrm/master
getting newest code
Seamus Lee [Thu, 23 May 2019 20:14:58 +0000 (06:14 +1000)]
Merge pull request #14308 from eileenmcnaughton/uffield
[NFC] reformat UFFieldTest
Eileen McNaughton [Thu, 23 May 2019 20:03:41 +0000 (08:03 +1200)]
Merge pull request #14311 from colemanw/public
Make apiRequst nextId accessible for api4 constructor
colemanw [Thu, 23 May 2019 19:36:41 +0000 (15:36 -0400)]
Merge pull request #14211 from colemanw/routeBinder
crmRouteBinder - Remove params from url if they equal their defaults
spalmstr [Thu, 23 May 2019 15:56:35 +0000 (16:56 +0100)]
Joomla_11 Patch CRM/Contact/BAO/Contact/Utils.php
Coleman Watts [Thu, 23 May 2019 12:52:22 +0000 (08:52 -0400)]
Make apiRequst nextId accessible for api4 constructor
Matthew Wire [Thu, 23 May 2019 09:44:15 +0000 (10:44 +0100)]
Merge pull request #14303 from eileenmcnaughton/extract_cache
[REF] extract buildGroupTree function