civicrm-core.git
5 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

5 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

5 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

5 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

5 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

5 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

5 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)

5 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)

5 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.

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

5 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

5 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

5 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

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

[test] add test for getImportableFields

5 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 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 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…

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 ago[REF] dev/core#998 make processDupes testable & add test
eileen [Wed, 29 May 2019 05:34:15 +0000 (17:34 +1200)]
[REF] dev/core#998 make processDupes testable & add test

I am pretty sure that there is an issue here with flipped contacts mis-comparing but this change
is just preliminary - improving testing & preparing to consolidate code so we always go via the api
and the same logic always applies

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 ago[jcalendar] remove jcalendar usage from participant_register_date on event search
eileen [Sat, 25 May 2019 08:00:30 +0000 (20:00 +1200)]
[jcalendar] remove jcalendar usage from participant_register_date on event search

This removes one more place where legacy jcalendar is used. There is actually still one left on the form (event date)
which I left out for now as it involves thinking about the fact event is a different entity & might warrant different
representation in the arrays

5 years agoConvert event search to use metadata
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

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 agoSkip api4 when generating api3 docs
Coleman Watts [Mon, 27 May 2019 16:49:42 +0000 (12:49 -0400)]
Skip api4 when generating api3 docs

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