civicrm-core.git
4 years agoMerge pull request #14432 from civicrm/5.14
Eileen McNaughton [Wed, 5 Jun 2019 03:24:53 +0000 (15:24 +1200)]
Merge pull request #14432 from civicrm/5.14

5.14 to master

4 years agoMerge pull request #14430 from agileware/5.14--CIVICRM-1228
Eileen McNaughton [Wed, 5 Jun 2019 03:24:27 +0000 (15:24 +1200)]
Merge pull request #14430 from agileware/5.14--CIVICRM-1228

dev/core#1017: Always bootstrap CRM_Utils_System against 5.14

4 years agodev/core#1017: Always bootstrap CRM_Utils_System
Francis Whittle [Wed, 5 Jun 2019 01:15:45 +0000 (11:15 +1000)]
dev/core#1017: Always bootstrap CRM_Utils_System

4 years agoMerge pull request #14424 from seamuslee001/phpunit6_money_test
Eileen McNaughton [Tue, 4 Jun 2019 23:42:05 +0000 (11:42 +1200)]
Merge pull request #14424 from seamuslee001/phpunit6_money_test

Fix running of CRM_Utils_MoneyTest on PHPUnit6+

4 years agoMerge pull request #14419 from colemanw/settingsCheckbox
Eileen McNaughton [Tue, 4 Jun 2019 23:38:28 +0000 (11:38 +1200)]
Merge pull request #14419 from colemanw/settingsCheckbox

Improve formatting for settings checkboxes

4 years agoFix enable components form validation
Coleman Watts [Tue, 4 Jun 2019 22:18:24 +0000 (18:18 -0400)]
Fix enable components form validation

4 years agoImprove formatting for settings checkboxes
Coleman Watts [Mon, 3 Jun 2019 15:50:03 +0000 (11:50 -0400)]
Improve formatting for settings checkboxes

4 years agoFix running of CRM_Utils_MoneyTest on PHPUnit6+
Seamus Lee [Tue, 4 Jun 2019 21:48:12 +0000 (07:48 +1000)]
Fix running of CRM_Utils_MoneyTest on PHPUnit6+

4 years agoMerge pull request #14423 from totten/master-cache-test
Eileen McNaughton [Tue, 4 Jun 2019 19:23:39 +0000 (07:23 +1200)]
Merge pull request #14423 from totten/master-cache-test

Caches - Normalize dependency on php-cache integration-tests

4 years agoMerge pull request #14421 from seamuslee001/phpunit6_tap
Tim Otten [Tue, 4 Jun 2019 07:12:01 +0000 (00:12 -0700)]
Merge pull request #14421 from seamuslee001/phpunit6_tap

phpunit6 - Implement TAP printer

4 years agoCacheTestCase - Extend the canonical upstream class instead of a forked class from...
Tim Otten [Tue, 4 Jun 2019 06:36:34 +0000 (23:36 -0700)]
CacheTestCase - Extend the canonical upstream class instead of a forked class from 'packages'

4 years agocomposer.json - Get php-cache integration-tests via composer
Tim Otten [Tue, 4 Jun 2019 06:36:07 +0000 (23:36 -0700)]
composer.json - Get php-cache integration-tests via composer

4 years agotools/scripts/phpunit - Accept `--tap` on PHP 7.x / PHPUnit 6.x
Tim Otten [Mon, 3 Jun 2019 23:46:45 +0000 (16:46 -0700)]
tools/scripts/phpunit - Accept `--tap` on PHP 7.x / PHPUnit 6.x

The `--tap` option was removed in PHPUnit 6.x.  For backwared compatibility,
the preceding commit adds a printer with same/similar output format.  This
continues adding the backward comapt by respecting `--tap` as an alias
for `--printer Civi/Test/TAP`.

4 years agoMerge pull request #14422 from civicrm/5.14
Eileen McNaughton [Mon, 3 Jun 2019 22:53:32 +0000 (10:53 +1200)]
Merge pull request #14422 from civicrm/5.14

5.14 to master

4 years agoMerge pull request #14420 from colemanw/menuFix
Mathieu Lu [Mon, 3 Jun 2019 22:16:37 +0000 (18:16 -0400)]
Merge pull request #14420 from colemanw/menuFix

dev/core#1012 Fix selection of quicksearch options

4 years agoImplement Civi Native TAP class
Seamus Lee [Mon, 3 Jun 2019 22:03:11 +0000 (08:03 +1000)]
Implement Civi Native TAP class

4 years agoMerge pull request #14404 from seamuslee001/test_run_phpunit6
Eileen McNaughton [Mon, 3 Jun 2019 21:09:09 +0000 (09:09 +1200)]
Merge pull request #14404 from seamuslee001/test_run_phpunit6

Try running unit tests on phpunit6

4 years agodev/core#1012 Fix selection of quicksearch options
Coleman Watts [Mon, 3 Jun 2019 20:15:45 +0000 (16:15 -0400)]
dev/core#1012 Fix selection of quicksearch options

4 years agoMerge pull request #14395 from eileenmcnaughton/recur_status
Matthew Wire [Mon, 3 Jun 2019 14:40:15 +0000 (15:40 +0100)]
Merge pull request #14395 from eileenmcnaughton/recur_status

dev/core#905 Add contribution recur statuses 'Processing' and 'Failing'

4 years agoMerge pull request #14348 from mattwire/sql_engine_config
Monish Deb [Mon, 3 Jun 2019 13:28:14 +0000 (18:58 +0530)]
Merge pull request #14348 from mattwire/sql_engine_config

Allow updating ENGINE_CONFIG for System.updatelogtables

4 years agoMerge pull request #14389 from christianwach/lab-1005
Seamus Lee [Mon, 3 Jun 2019 11:23:22 +0000 (21:23 +1000)]
Merge pull request #14389 from christianwach/lab-1005

Force link in confirmation email to be front-end

4 years agoMerge pull request #14416 from JMAConsulting/core-785-1
Seamus Lee [Mon, 3 Jun 2019 10:39:09 +0000 (20:39 +1000)]
Merge pull request #14416 from JMAConsulting/core-785-1

dev/Core#785: Extend addField to support select2 widget

4 years agoMerge pull request #14417 from civicrm/5.14
Seamus Lee [Mon, 3 Jun 2019 10:38:55 +0000 (20:38 +1000)]
Merge pull request #14417 from civicrm/5.14

5.14

4 years agoMerge pull request #14414 from eileenmcnaughton/xeditable2
Seamus Lee [Mon, 3 Jun 2019 10:10:21 +0000 (20:10 +1000)]
Merge pull request #14414 from eileenmcnaughton/xeditable2

Add angular-xeditable to angular

4 years agoForce link in confirmation email to be front-end
Christian Wach [Mon, 3 Jun 2019 10:01:09 +0000 (11:01 +0100)]
Force link in confirmation email to be front-end

4 years agoMerge pull request #14409 from eileenmcnaughton/rel_cont
Seamus Lee [Mon, 3 Jun 2019 09:50:07 +0000 (19:50 +1000)]
Merge pull request #14409 from eileenmcnaughton/rel_cont

dev/core#1002 fix fatal on searching on related contacts.

4 years agoMerge pull request #14393 from eileenmcnaughton/setting_frm
Eileen McNaughton [Mon, 3 Jun 2019 08:35:28 +0000 (20:35 +1200)]
Merge pull request #14393 from eileenmcnaughton/setting_frm

dev/core#1004 Fix regression causing notices on components screen

4 years agoExtend addField to support select2 widget
Monish Deb [Mon, 3 Jun 2019 08:25:20 +0000 (13:55 +0530)]
Extend addField to support select2 widget

4 years agoAdd angular-xeditable to angular
eileen [Mon, 3 Jun 2019 07:30:54 +0000 (19:30 +1200)]
Add angular-xeditable to angular

From my digging xeditable seems like the main option for angular edit in place
https://vitalets.github.io/angular-xeditable/#overview

I think it makes sense to ship with core & sooner rather than later so we don't get
in muddles with different versions in extensions

My sample afform using this is here

https://github.com/totten/afform/issues/15

4 years agoMerge pull request #14413 from civicrm/5.14
Seamus Lee [Mon, 3 Jun 2019 07:25:37 +0000 (17:25 +1000)]
Merge pull request #14413 from civicrm/5.14

5.14

4 years agoMerge pull request #14412 from eileenmcnaughton/514_another
Seamus Lee [Mon, 3 Jun 2019 07:25:06 +0000 (17:25 +1000)]
Merge pull request #14412 from eileenmcnaughton/514_another

Fix test / possible live error on submitting credit card renewals

4 years agoFix test / possible live error on submitting credit card renewals
eileen [Fri, 24 May 2019 00:28:00 +0000 (12:28 +1200)]
Fix test / possible live error on submitting credit card renewals

4 years agodev/core#1002 fix fatal on searching on recurring contacts.
eileen [Mon, 3 Jun 2019 02:10:11 +0000 (14:10 +1200)]
dev/core#1002 fix fatal on searching on recurring contacts.

This is happening because the alphabet query is using the simpleFrom on the class rather than the returned from

4 years agoMerge pull request #14401 from eileenmcnaughton/cust_fields
Seamus Lee [Mon, 3 Jun 2019 04:10:53 +0000 (14:10 +1000)]
Merge pull request #14401 from eileenmcnaughton/cust_fields

dev/core#389 [preliminary cleanup+ test] Standardise metadat for custom field

4 years agoMerge pull request #14405 from seamuslee001/lab_core_985
Seamus Lee [Mon, 3 Jun 2019 02:51:07 +0000 (12:51 +1000)]
Merge pull request #14405 from seamuslee001/lab_core_985

dev/core#985 Fix trailing slash for urls on Windows

4 years agoMerge pull request #14399 from mattwire/entitypagetrait
Eileen McNaughton [Mon, 3 Jun 2019 00:53:29 +0000 (12:53 +1200)]
Merge pull request #14399 from mattwire/entitypagetrait

Add EntityPageTrait

4 years agoMerge pull request #14406 from eileenmcnaughton/ipn
Seamus Lee [Sun, 2 Jun 2019 23:27:36 +0000 (09:27 +1000)]
Merge pull request #14406 from eileenmcnaughton/ipn

dev/drupal#66 Fix legacy IPN endpoint for Drupal (gitlab issue 973)

4 years agoFix legacy IPN endpoint for Drupal (gitlab issue 973)
Rich Lott [Tue, 21 May 2019 10:23:26 +0000 (11:23 +0100)]
Fix legacy IPN endpoint for Drupal (gitlab issue 973)

4 years agoMerge pull request #14402 from eileenmcnaughton/phpcs
Seamus Lee [Sun, 2 Jun 2019 22:29:14 +0000 (08:29 +1000)]
Merge pull request #14402 from eileenmcnaughton/phpcs

[NFC] PHPCS fixes.

4 years agodev/core#905 Add contribution recur statuses 'Processing' and 'Failing'
eileen [Sat, 1 Jun 2019 07:22:21 +0000 (19:22 +1200)]
dev/core#905 Add contribution recur statuses 'Processing' and 'Failing'

Per dev/core#905 there are some statuses that are useful to record for recurrings that are in addition to those currently in core.
These are

- Processing - when a payment against a contribution recur is actively being processed. This would be used when processing
a referring contribution to alter the status prior to the attempt. Then when the attempt has completed
it would go back to 'In Progress' or whatever  but if it got stuck then it would say 'Processing' - indicating
not to 'just try again'

- Failing - when one or more payemnts against a recurring contribution has failed but the processor has not yet given up.

It would be up to processors to implement these - we are standardising the concepts at this stage - although
we might provide a generic cron that processors can 'opt into
 later

Update civicrm_generated and fix civicrm_data.tpl

4 years agoStandardise custom fields metadata
eileen [Fri, 31 May 2019 00:23:26 +0000 (12:23 +1200)]
Standardise custom fields metadata

4 years agodev/core#985 Fix trailing slash for urls on Windows
Seamus Lee [Sun, 2 Jun 2019 21:58:06 +0000 (07:58 +1000)]
dev/core#985 Fix trailing slash for urls on Windows

4 years agoMerge pull request #14337 from eileenmcnaughton/dedupe_cleanup
Seamus Lee [Sun, 2 Jun 2019 06:51:05 +0000 (16:51 +1000)]
Merge pull request #14337 from eileenmcnaughton/dedupe_cleanup

[REF] Stop passing cacheKey to refillCache

4 years agoTry running unit tests on phpunit6
Seamus Lee [Sun, 2 Jun 2019 03:33:17 +0000 (13:33 +1000)]
Try running unit tests on phpunit6

4 years agoMerge pull request #14387 from seamuslee001/phpunit6_test
Eileen McNaughton [Sun, 2 Jun 2019 03:30:53 +0000 (15:30 +1200)]
Merge pull request #14387 from seamuslee001/phpunit6_test

Update test files to use PHPUnit6 notiation for classes

4 years agodev/core#389 [preliminary cleanup] Standardise metadat for custom field use
eileen [Thu, 30 May 2019 22:45:06 +0000 (10:45 +1200)]
dev/core#389 [preliminary cleanup] Standardise metadat for custom field use

In digging into dev/core#389 I found a major complexity in fixing it was inconsistent metadata available at different
points in the code. This simply adds metadata to the 'inner-most place' & makes the BAO_CustomQuery object use that

I didn't remove the options loop because I wanted to leave that out of scope as I can't see how / if it is used

[test] add test for getImportableFields

4 years agoMerge pull request #14400 from mattwire/addmissingcreditcardeventregistrationlink
Eileen McNaughton [Sun, 2 Jun 2019 01:43:36 +0000 (13:43 +1200)]
Merge pull request #14400 from mattwire/addmissingcreditcardeventregistrationlink

Add missing 'submit credit card event registration' link to standalone event registration form

5 years agoPHPCS fixes.
eileen [Sat, 1 Jun 2019 23:48:20 +0000 (11:48 +1200)]
PHPCS fixes.

Improves compliance with drupal standard

5 years agodev/core#1004 Fix regression causing notices on components screen
eileen [Sat, 1 Jun 2019 04:52:49 +0000 (16:52 +1200)]
dev/core#1004 Fix regression causing notices on components screen

I've cleaned up the metadata & moved relevant functions to the right places. This DOES change from
advmultiselect to a normal UI - not sure if there is any reason not so, since adv multiselect is
deprecated

5 years agoUpdate test files to use PHPUnit6 notiation for classes
Seamus Lee [Thu, 30 May 2019 22:52:09 +0000 (08:52 +1000)]
Update test files to use PHPUnit6 notiation for classes

Update for phpunit5 compatability

Add in old catch to see if we get tests to pass

Fix Report Form Test case

Fix last remaining test issues

5 years agoMerge pull request #14347 from mattwire/casepopup_title
Eileen McNaughton [Sat, 1 Jun 2019 22:54:23 +0000 (10:54 +1200)]
Merge pull request #14347 from mattwire/casepopup_title

Set title properly on Move/Copy/File on Case popup

5 years agoMerge pull request #14398 from mattwire/recurstatuses
Eileen McNaughton [Sat, 1 Jun 2019 22:40:35 +0000 (10:40 +1200)]
Merge pull request #14398 from mattwire/recurstatuses

Set new inactive statuses as 'Chargeback' does not exist on new installs and that breaks Contributionrecur.create API

5 years agoStop passing cacheKey to refillCache
eileen [Sat, 1 Jun 2019 22:34:34 +0000 (10:34 +1200)]
Stop passing cacheKey to refillCache

    The function is only called from one place & there is no need to pass it in

5 years agoMerge pull request #14153 from eileenmcnaughton/api4
Eileen McNaughton [Sat, 1 Jun 2019 22:26:48 +0000 (10:26 +1200)]
Merge pull request #14153 from eileenmcnaughton/api4

Use data provider to test both api versions

5 years agoMerge pull request #14396 from colemanw/dao
Seamus Lee [Sat, 1 Jun 2019 21:47:31 +0000 (07:47 +1000)]
Merge pull request #14396 from colemanw/dao

Regenerate Event DAO for i18n

5 years agoMerge pull request #14370 from eileenmcnaughton/exception
Matthew Wire [Sat, 1 Jun 2019 19:09:27 +0000 (20:09 +0100)]
Merge pull request #14370 from eileenmcnaughton/exception

[REF] dev/core#998 make processDupes testable & add test

5 years agoAdd missing 'submit credit card event registration' link to standalone event registra...
Matthew Wire (MJW Consulting) [Sat, 1 Jun 2019 19:02:16 +0000 (20:02 +0100)]
Add missing 'submit credit card event registration' link to standalone event registration form

5 years agoAllow updating ENGINE_CONFIG for System.updatelogtables
Matthew Wire (MJW Consulting) [Sun, 26 May 2019 19:14:59 +0000 (20:14 +0100)]
Allow updating ENGINE_CONFIG for System.updatelogtables

5 years agoAdd EntityPageTrait
Matthew Wire (MJW Consulting) [Sat, 1 Jun 2019 18:41:02 +0000 (19:41 +0100)]
Add EntityPageTrait

5 years agoSet title properly on Move/Copy/File on Case popup
Matthew Wire (MJW Consulting) [Sun, 26 May 2019 19:12:35 +0000 (20:12 +0100)]
Set title properly on Move/Copy/File on Case popup

5 years agoMerge pull request #14330 from eileenmcnaughton/jcalendar
Matthew Wire [Sat, 1 Jun 2019 17:27:52 +0000 (18:27 +0100)]
Merge pull request #14330 from eileenmcnaughton/jcalendar

[code-quality] [jcalendar] remove jcalendar usage from participant_register_date on event search

5 years agoMerge pull request #14097 from eileenmcnaughton/mailin_test
Matthew Wire [Sat, 1 Jun 2019 17:24:37 +0000 (18:24 +0100)]
Merge pull request #14097 from eileenmcnaughton/mailin_test

Deprecate creating recipients from MailingJob.create.

5 years agoMerge pull request #14225 from eileenmcnaughton/import_test
Matthew Wire [Sat, 1 Jun 2019 17:22:59 +0000 (18:22 +0100)]
Merge pull request #14225 from eileenmcnaughton/import_test

dev/core#953 Add test for updating email via import & ensuring it is primary

5 years agoMerge pull request #14386 from eileenmcnaughton/custom_relative
Matthew Wire [Sat, 1 Jun 2019 17:21:18 +0000 (18:21 +0100)]
Merge pull request #14386 from eileenmcnaughton/custom_relative

dev/core#389 [preliminary cleanup] Standardise metadata for custom field use

5 years agoSet new inactive statuses as 'Chargeback' does not exist on new installs and that...
Matthew Wire (MJW Consulting) [Sat, 1 Jun 2019 17:09:07 +0000 (18:09 +0100)]
Set new inactive statuses as 'Chargeback' does not exist on new installs and that breaks Contributionrecur.create API

5 years agoRegenerate Event DAO for i18n
Coleman Watts [Sat, 1 Jun 2019 14:11:06 +0000 (10:11 -0400)]
Regenerate Event DAO for i18n

5 years agoMerge pull request #14353 from eileenmcnaughton/fin_accounts_pi
Monish Deb [Sat, 1 Jun 2019 07:59:16 +0000 (13:29 +0530)]
Merge pull request #14353 from eileenmcnaughton/fin_accounts_pi

[REF] Remove reference to 'changePaymentInstrument' from  updateFinancialAccounts as never passed in

5 years agoMerge pull request #14317 from eileenmcnaughton/refund
Monish Deb [Sat, 1 Jun 2019 07:23:39 +0000 (12:53 +0530)]
Merge pull request #14317 from eileenmcnaughton/refund

Switch to calling Payment.create api when processing a refund from AdditionalPayment form

5 years agoMerge pull request #14392 from totten/master-test-exts
Eileen McNaughton [Sat, 1 Jun 2019 04:02:02 +0000 (16:02 +1200)]
Merge pull request #14392 from totten/master-test-exts

CRM_Extension_System - Only allow `test.*` extensions during headless testing. Hide from regular users.

5 years agoMerge pull request #14384 from samuelsov/CRM-15375-next
colemanw [Sat, 1 Jun 2019 01:41:02 +0000 (21:41 -0400)]
Merge pull request #14384 from samuelsov/CRM-15375-next

Wysiwyg support for i18n event fields

5 years agoCRM_Extension_System - Only handle `test.*` extensions on headless test sites
Tim Otten [Sat, 1 Jun 2019 00:11:26 +0000 (17:11 -0700)]
CRM_Extension_System - Only handle `test.*` extensions on headless test sites

The headless test suite includes integration tests for correct handling of
the extension installation/removal process. This involves some
dummy extensions. Unfortunately, the dummy extensions are often picked up on
live deployments -- where they're a bit distracting/annoying.

Before
------

The `test.*` dummy extensions appear as available in all environments,
including headless tests and live sites.

After
-----

The `test.*` dummy extensions are only available in the headless test
environment.

5 years agoCRM_Extension_Container_Basic - Add mechanism for filtering
Tim Otten [Sat, 1 Jun 2019 00:03:50 +0000 (17:03 -0700)]
CRM_Extension_Container_Basic - Add mechanism for filtering

This function allows one to filter down the list of extensions which are visible.

A few notes:

* The result of the scanning/filtering is stored in cache.  On a typical
  page-load, the system uses this cache -- which happily means that
  filtering shouldn't result in any extra page-load time.

* The extension-system is generally boot-critical.  I could imagine some
  scope-creep around making making the filter mechanism hookable, but that's
  a separate+complicated issue.  Optimistically...  if `array $containers`
  somehow becomes hookable, then one could use the same mechanism to
  manipulate the filters.

5 years agoUse dataprovider to test api4 in api3 tests
Coleman Watts [Tue, 28 May 2019 15:01:29 +0000 (11:01 -0400)]
Use dataprovider to test api4 in api3 tests

5 years agoAdd compatibility layer for running api3 tests on v4
Coleman Watts [Mon, 27 May 2019 17:11:21 +0000 (13:11 -0400)]
Add compatibility layer for running api3 tests on v4

5 years agodev/core#389 [preliminary cleanup] Standardise metadat for custom field use
eileen [Thu, 30 May 2019 22:45:06 +0000 (10:45 +1200)]
dev/core#389 [preliminary cleanup] Standardise metadat for custom field use

In digging into dev/core#389 I found a major complexity in fixing it was inconsistent metadata available at different
points in the code. This simply adds metadata to the 'inner-most place' & makes the BAO_CustomQuery object use that

I didn't remove the options loop because I wanted to leave that out of scope as I can't see how / if it is used

5 years agoMerge pull request #14385 from seamuslee001/master
Seamus Lee [Thu, 30 May 2019 22:59:19 +0000 (08:59 +1000)]
Merge pull request #14385 from seamuslee001/master

[NFC] Update package-lock and civicrm_generated to fix langague issues

5 years agoAdd unit test to check generation of fields data
eileen [Thu, 30 May 2019 21:56:03 +0000 (09:56 +1200)]
Add unit test to check generation of fields data

5 years agoMerge pull request #14333 from eileenmcnaughton/phpunit
Seamus Lee [Thu, 30 May 2019 22:17:17 +0000 (08:17 +1000)]
Merge pull request #14333 from eileenmcnaughton/phpunit

dev/core#980 [phpunit test] update phpunit extends class to support later versions

5 years agoMerge pull request #14377 from eileenmcnaughton/fin_batch
Eileen McNaughton [Thu, 30 May 2019 22:13:22 +0000 (10:13 +1200)]
Merge pull request #14377 from eileenmcnaughton/fin_batch

dev/financial#59 Fix unreleased regression on batch form

5 years agoMerge pull request #14325 from eileenmcnaughton/merge_cust_field
Eileen McNaughton [Thu, 30 May 2019 21:31:27 +0000 (09:31 +1200)]
Merge pull request #14325 from eileenmcnaughton/merge_cust_field

dev/core#723 Fix fatal error when trying to merge contacts with a cus…

5 years ago[NFC] Update package-lock and civicrm_generated to fix langague issues
Seamus Lee [Thu, 30 May 2019 21:31:20 +0000 (07:31 +1000)]
[NFC] Update package-lock and civicrm_generated to fix langague issues

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/financial#59 Fix unreleased regression on batch form
eileen [Wed, 29 May 2019 23:05:54 +0000 (11:05 +1200)]
dev/financial#59 Fix unreleased regression on batch form

I think changing to use the search form as the parent makes sense here. Relying on the parent without including
it feels like a recipe for trouble

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 agodev/core#723 Fix fatal error when trying to merge contacts with a custom file field
eileen [Thu, 23 May 2019 22:22:07 +0000 (10:22 +1200)]
dev/core#723 Fix fatal error when trying to merge contacts with a custom file field

Technical comments here https://lab.civicrm.org/dev/core/issues/723#note_16231

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…