civicrm-core.git
5 years agoWysiwyg support for i18n event fields
Samuel Vanhove [Thu, 30 May 2019 18:30:35 +0000 (14:30 -0400)]
Wysiwyg support for i18n event fields

5 years agoMerge pull request #14376 from eileenmcnaughton/location_form
Mathieu Lu [Thu, 30 May 2019 12:08:29 +0000 (08:08 -0400)]
Merge pull request #14376 from eileenmcnaughton/location_form

dev/core#994 remove Thousands Separator can not have more than 1 character rule

5 years agoMerge pull request #14383 from civicrm/5.14
Seamus Lee [Thu, 30 May 2019 05:48:19 +0000 (15:48 +1000)]
Merge pull request #14383 from civicrm/5.14

5.14

5 years agoMerge pull request #14382 from seamuslee001/5_13_5_release_notes
Seamus Lee [Thu, 30 May 2019 04:22:30 +0000 (14:22 +1000)]
Merge pull request #14382 from seamuslee001/5_13_5_release_notes

5.14 version of  5.13.5 Release notes

5 years agoUpdate 5.13.5.md
Tim Otten [Thu, 30 May 2019 03:45:42 +0000 (20:45 -0700)]
Update 5.13.5.md

5 years agoUpdate 5.13.5.md
Tim Otten [Thu, 30 May 2019 03:42:43 +0000 (20:42 -0700)]
Update 5.13.5.md

5 years agoAdd in 5.13.5 Release notes
Seamus Lee [Thu, 30 May 2019 02:35:53 +0000 (12:35 +1000)]
Add in 5.13.5 Release notes

5 years agoMerge pull request #14380 from civicrm/5.14
Eileen McNaughton [Thu, 30 May 2019 02:25:03 +0000 (14:25 +1200)]
Merge pull request #14380 from civicrm/5.14

5.14

5 years agoMerge pull request #14378 from seamuslee001/dev_core_969
Eileen McNaughton [Thu, 30 May 2019 02:12:54 +0000 (14:12 +1200)]
Merge pull request #14378 from seamuslee001/dev_core_969

Update bower.json to target fixed jquery branch for dev/core#969

5 years agoUpdate bower.json to target fixed jquery branch for dev/core#969
Seamus Lee [Thu, 30 May 2019 02:07:11 +0000 (12:07 +1000)]
Update bower.json to target fixed jquery branch for dev/core#969

5 years agoMerge pull request #14368 from seamuslee001/dev_core_996
Eileen McNaughton [Wed, 29 May 2019 23:30:15 +0000 (11:30 +1200)]
Merge pull request #14368 from seamuslee001/dev_core_996

dev/core996 Ensure that the oldest created_date is retained no matter…

5 years agodev/core#994 remove Thousands Separator can not have more than 1 character rule
eileen [Wed, 29 May 2019 22:27:38 +0000 (10:27 +1200)]
dev/core#994 remove Thousands Separator can not have more than 1 character rule

Per issue it seems unnecessarily opinionated to block longer strings & we not know of at least one case where it is inappropriate

5 years agoMerge pull request #14375 from davejenx/activity-summary-refactor
Eileen McNaughton [Wed, 29 May 2019 19:24:49 +0000 (07:24 +1200)]
Merge pull request #14375 from davejenx/activity-summary-refactor

[REF] Activity Summary report - move temp table generation etc from postProcess to buildQuery, remove postProcess, don't skip in unit tests

5 years agoRefactor CRM/Report/Form/ActivitySummary.php, removing postProcess(), moving temp...
Dave Jenkins [Wed, 29 May 2019 15:00:46 +0000 (16:00 +0100)]
Refactor CRM/Report/Form/ActivitySummary.php, removing postProcess(), moving temp table creation etc into buildQuery(). In tests/phpunit/api/v3/ReportTemplateTest.php, remove activitySummary from reportsToSkip, as tests pass after this refactoring; also rename testActivitySummary() to testActivityDetails(), as it actually tests report_id = Activity which is the activity details report.

5 years agoActivity Summary report - stop overloading from function on activity summary report
eileen [Tue, 28 May 2019 20:26:46 +0000 (08:26 +1200)]
Activity Summary report - stop overloading from function on activity summary report

5 years agodev/core996 Ensure that the oldest created_date is retained no matter the ids of...
Seamus Lee [Wed, 29 May 2019 01:37:14 +0000 (11:37 +1000)]
dev/core996 Ensure that the oldest created_date is retained no matter the ids of the contacts being merged

Reduce sleep to 5

5 years agoMerge pull request #14371 from seamuslee001/nfc_update_civicrm_generated_data
Eileen McNaughton [Wed, 29 May 2019 07:54:13 +0000 (19:54 +1200)]
Merge pull request #14371 from seamuslee001/nfc_update_civicrm_generated_data

[NFC] Update civicrm_generated data file following addition of contri…

5 years ago[NFC] Update civicrm_generated data file following addition of contribution_recur_sta...
Seamus Lee [Wed, 29 May 2019 06:20:31 +0000 (16:20 +1000)]
[NFC] Update civicrm_generated data file following addition of contribution_recur_status option group

5 years agoMerge pull request #14343 from eileenmcnaughton/recur_status
Eileen McNaughton [Wed, 29 May 2019 05:21:58 +0000 (17:21 +1200)]
Merge pull request #14343 from eileenmcnaughton/recur_status

dev/core#905 Separate contribution_recur status_id option group from contribution option group

5 years agoMerge pull request #14369 from civicrm/5.14
Seamus Lee [Wed, 29 May 2019 03:36:41 +0000 (13:36 +1000)]
Merge pull request #14369 from civicrm/5.14

5.14

5 years agoMerge pull request #14355 from seamuslee001/harden_extern_open
Seamus Lee [Wed, 29 May 2019 02:13:42 +0000 (12:13 +1000)]
Merge pull request #14355 from seamuslee001/harden_extern_open

Validate queue_id is a positive integer before passing to the BAO

5 years agoMerge pull request #14365 from eileenmcnaughton/dedupe_move
Seamus Lee [Wed, 29 May 2019 00:40:10 +0000 (10:40 +1000)]
Merge pull request #14365 from eileenmcnaughton/dedupe_move

[REF] move calculation of migrationInfo into the function that uses it

5 years agoValidate queue_id is a positive integer before passing to the BAO
Seamus Lee [Mon, 27 May 2019 06:27:25 +0000 (16:27 +1000)]
Validate queue_id is a positive integer before passing to the BAO

Switch to using retrieveValue as per Eileen

5 years ago[REF] move calculation of migrationInfo into the function that uses it
eileen [Tue, 28 May 2019 21:23:40 +0000 (09:23 +1200)]
[REF] move calculation of migrationInfo into the function that uses it

This doesn't make a lot of sense as a passed parameter & it's better to derive it closer to where it's used.

It's also kinda silly....

5 years agoMerge pull request #14354 from eileenmcnaughton/cont_search
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

5 years agoMerge pull request #14098 from eileenmcnaughton/event_income
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

5 years agoMerge pull request #14359 from seamuslee001/fix_cache_key_column
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…

5 years agoFix name of cache key column to be all lower case rather than camel case in civicrm_p...
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

5 years agoMerge pull request #14360 from colemanw/byRef
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

5 years agoRemove confusing pass params by ref
Coleman Watts [Mon, 27 May 2019 23:15:43 +0000 (19:15 -0400)]
Remove confusing pass params by ref

5 years agoFix inconsistent handling when searching contribution text fields
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

5 years agoMerge pull request #14298 from eileenmcnaughton/dedupe_stats
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

5 years agoMerge pull request #14358 from samuelsov/billingblockts
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'

5 years agodev/core#905 Separate contribution_recur status_id option group from contribution...
eileen [Sun, 26 May 2019 05:38:37 +0000 (17:38 +1200)]
dev/core#905 Separate contribution_recur status_id option group from contribution option group

As we did earlier for pledge status this separates out the option groups - on the basis we have different
statuses for the 2 things. In order to ensure we don't break anything existing the values
we give the new option group the exact same values as the old one>

However, I HAVE added one more value - Processing - which is intended for the period between when
a new contribution starts to be added and when it has been added. This would normally be a few seconds
but when there is an error it would be left in this state - warding off future attempts.

For new sites I have left off some statuses that I think would not be relevant - Refunded,
Partially Paid, Chargeback, Pending Refund

5 years agoMerge pull request #14357 from colemanw/api4Wrap
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

5 years agoMerge pull request #14352 from eileenmcnaughton/fin_status
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

5 years agoTranslation in billingblock.tpl - dropping 'Information'
Samuel Vanhove [Mon, 27 May 2019 18:17:59 +0000 (14:17 -0400)]
Translation in billingblock.tpl - dropping 'Information'

5 years agoSkip wrapping v4 api requests in a transaction
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.

5 years agoSkip adding default api wrappers to v4 actions
Coleman Watts [Fri, 24 May 2019 18:27:23 +0000 (14:27 -0400)]
Skip adding default api wrappers to v4 actions

5 years agoMerge pull request #14356 from civicrm/5.14
Seamus Lee [Mon, 27 May 2019 08:40:42 +0000 (18:40 +1000)]
Merge pull request #14356 from civicrm/5.14

5.14

5 years agoMerge pull request #14351 from seamuslee001/ics_file
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

5 years agoWhitelist .ics file 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

5 years agoMerge pull request #14280 from seamuslee001/dev_core_975
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

5 years agodev/core#975 Fix url for new activity in breadcrumbs in find activity search
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

5 years agoFix bug where contribution status is mishandled if label is changed
eileen [Sun, 26 May 2019 22:03:06 +0000 (10:03 +1200)]
Fix bug where contribution status is mishandled if label is changed

5 years agoMerge pull request #14350 from seamuslee001/test_dev_627
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

5 years agoMerge pull request #14345 from mattwire/case_extraline
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

5 years agoMerge pull request #13374 from cividesk/dev-627
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

5 years agodev/core#627 Extend a unit test to verify fix made by Sunil
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

5 years agoMerge pull request #14342 from eileenmcnaughton/deprecated
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

5 years agoMerge pull request #14335 from eileenmcnaughton/bao_contribution
Seamus Lee [Sun, 26 May 2019 21:09:05 +0000 (07:09 +1000)]
Merge pull request #14335 from eileenmcnaughton/bao_contribution

[NFC] phpdoc cleanup

5 years agoMerge pull request #14332 from civicrm/colemanw-patch-1
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

5 years agoMerge pull request #14334 from eileenmcnaughton/fin_status
Matthew Wire [Sun, 26 May 2019 14:32:31 +0000 (15:32 +0100)]
Merge pull request #14334 from eileenmcnaughton/fin_status

[REF] extract updateFinancialAccountsOnContributionStatusChange

5 years agoMerge pull request #14341 from eileenmcnaughton/deprecated2
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

5 years agoRemove duplicate line
Matthew Wire (MJW Consulting) [Sun, 26 May 2019 11:53:03 +0000 (12:53 +0100)]
Remove duplicate line

5 years agoMerge pull request #14336 from eileenmcnaughton/pdfletter
Matthew Wire [Sun, 26 May 2019 11:03:20 +0000 (12:03 +0100)]
Merge pull request #14336 from eileenmcnaughton/pdfletter

[REF] extract isLiveMode

5 years agoMerge pull request #14344 from seamuslee001/test_tidy_up
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

5 years ago[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

5 years agoMerge pull request #14331 from eileenmcnaughton/select
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

5 years agoMerge pull request #14340 from eileenmcnaughton/select2
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

5 years agoRemove input format function from deprecated utils to the only place that calls it
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

5 years agoRemove never-called function _civicrm_api3_deprecated_contact_check_custom_params
eileen [Sun, 26 May 2019 02:56:00 +0000 (14:56 +1200)]
Remove never-called function _civicrm_api3_deprecated_contact_check_custom_params

5 years agodev/core#968 Fix javascript error on public pages
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.

5 years agoUnit test for FGB error in #14331
eileen [Sun, 26 May 2019 01:56:16 +0000 (13:56 +1200)]
Unit test for FGB error in #14331

5 years agoMerge pull request #14338 from eileenmcnaughton/contact_search
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

5 years ago[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

5 years agoMerge pull request #14138 from johncronan/drupal_login_url
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

5 years ago[REF] extract isLiveMode
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

5 years agoMerge pull request #14158 from demeritcowboy/deny-for-real
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

5 years agoFurther phpcs mandated fixes
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

5 years ago[NFC] phpdoc cleanup
eileen [Sat, 25 May 2019 23:32:10 +0000 (11:32 +1200)]
[NFC] phpdoc cleanup

Fixes style elements that stricter phpcs picks up

5 years ago[REF] extract updateFinancialAccountsOnContributionStatusChange
eileen [Sat, 25 May 2019 23:18:29 +0000 (11:18 +1200)]
[REF] extract updateFinancialAccountsOnContributionStatusChange

5 years agoMerge pull request #14328 from eileenmcnaughton/dbunit
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

5 years agoMerge pull request #14292 from eileenmcnaughton/cachedtree
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

5 years agoMerge pull request #14316 from eileenmcnaughton/membershipRenewal
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

5 years agoMerge pull request #14324 from eileenmcnaughton/dedupe_cleanup2
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

5 years agoMerge pull request #14318 from eileenmcnaughton/reorg
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

5 years agoMerge pull request #14323 from eileenmcnaughton/dao
Matthew Wire [Sat, 25 May 2019 16:05:27 +0000 (17:05 +0100)]
Merge pull request #14323 from eileenmcnaughton/dao

[NFC] Docblock fixes

5 years agoMerge pull request #14329 from eileenmcnaughton/smtp
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

5 years agoMerge pull request #13997 from eileenmcnaughton/recur_entity
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

5 years agoDisable full group by when selecting contacts
eileen [Sat, 25 May 2019 08:32:54 +0000 (20:32 +1200)]
Disable full group by when selecting contacts

5 years ago[dbunit test] remove dbunit dependency
eileen [Sat, 25 May 2019 05:59:02 +0000 (17:59 +1200)]
[dbunit test] remove dbunit dependency

5 years agoMerge pull request #14321 from eileenmcnaughton/test_dbunit
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

5 years agodev/core#879 SMTP help text is misleading - references the wrong admin screen
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

5 years agoMerge pull request #14087 from seamuslee001/npm_version_update
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

5 years agoMerge pull request #14082 from pradpnayak/caseReport
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

5 years ago[dbunit] remove dependency on discontinued dbunit
eileen [Fri, 24 May 2019 21:27:18 +0000 (09:27 +1200)]
[dbunit] remove dependency on discontinued dbunit

5 years agoMerge pull request #14327 from seamuslee001/fix_warning_job_manager_test
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

5 years ago[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

5 years agoMerge pull request #14326 from civicrm/5.14
Seamus Lee [Fri, 24 May 2019 23:45:38 +0000 (09:45 +1000)]
Merge pull request #14326 from civicrm/5.14

5.14

5 years agoMerge pull request #14322 from AlainBenbassat/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

5 years ago[REF] Extract function to get cached duplicate matches
eileen [Wed, 22 May 2019 04:52:46 +0000 (16:52 +1200)]
[REF] Extract function to get cached duplicate matches

5 years agoDocblock fixes
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.

5 years agofixes issue #981: sort participants did not remember search criteria
Alain Benbassat [Fri, 24 May 2019 21:37:58 +0000 (23:37 +0200)]
fixes issue #981: sort participants did not remember search criteria

5 years agoMerge pull request #14310 from eileenmcnaughton/dedupe_custom_tests
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.

5 years agoMerge pull request #14314 from eileenmcnaughton/coder
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

5 years agoMerge pull request #14319 from eileenmcnaughton/xml_dbunit
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

5 years ago[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

5 years agoMerge pull request #14315 from eileenmcnaughton/dbunit_xml
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

5 years agoNFC - Changed release notes info about Jira to GitLab (#14265)
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