civicrm-core.git
5 years agoMenubar - Use class instead of id for flexibility
Coleman Watts [Thu, 18 Jul 2019 12:41:48 +0000 (08:41 -0400)]
Menubar - Use class instead of id for flexibility

5 years agoMerge pull request #14918 from totten/5.16-prevnext
Monish Deb [Tue, 30 Jul 2019 08:05:19 +0000 (13:35 +0530)]
Merge pull request #14918 from totten/5.16-prevnext

Revert "[REF] use generic loadStandardSearchOptionsFromUrl". Fix search selections.

5 years agoRevert "[REF] use generic loadStandardSearchOptionsFromUrl". Fix search selections.
Tim Otten [Tue, 30 Jul 2019 06:14:04 +0000 (23:14 -0700)]
Revert "[REF] use generic loadStandardSearchOptionsFromUrl". Fix search selections.

Overview
-------------------

This reverts commit a5ca2ad8e16b145edf3a5604fab923d1e2386b37
and fixes a bug in management of the prev/next cache. The
bug is visible when following this procedure:

1. In browser, use "Quick search" to search for text "am"
2. In browser, select checkboxes next to two items
3. In MySQL CLI, run `select * from civicrm_prevnext_cache where is_selected =1;`
4. In browser, continue to next page. Observe that there are no more selection.
5. In MySQL CLI, re-run SQL query. Observe that the selections have disappeared.

Before
-------------------

Proceeding to another page of search results causes loss of selections

After
-------------------

Selections are preserved

5 years agoMerge pull request #14900 from eileenmcnaughton/regress
Seamus Lee [Mon, 29 Jul 2019 02:00:47 +0000 (12:00 +1000)]
Merge pull request #14900 from eileenmcnaughton/regress

Fix unreleased regression - fatal on financial account screen

5 years agoFix unreleased regression - fatal on financial account screen
eileen [Sun, 28 Jul 2019 22:22:36 +0000 (10:22 +1200)]
Fix unreleased regression - fatal on financial account screen

5 years agoMerge pull request #14876 from eileenmcnaughton/is_front
Tim Otten [Wed, 24 Jul 2019 22:44:15 +0000 (15:44 -0700)]
Merge pull request #14876 from eileenmcnaughton/is_front

dev/core#378 Determine front end pages in drupal

5 years agoDetermine front end pages in drupal
eileen [Wed, 24 Jul 2019 13:11:27 +0000 (01:11 +1200)]
Determine front end pages in drupal

Alternative to https://github.com/civicrm/civicrm-drupal/pull/546/files that I think narrows the scope
since it means we are not changing an existing property

5 years agoMerge pull request #14866 from alifrumin/5.16.0
Eileen McNaughton [Wed, 24 Jul 2019 00:02:59 +0000 (12:02 +1200)]
Merge pull request #14866 from alifrumin/5.16.0

Annotating and Sorting 5.16.0 release notes

5 years agoAnnotating and Sorting 5.16.0 release notes
Alice Frumin [Thu, 11 Jul 2019 14:57:48 +0000 (10:57 -0400)]
Annotating and Sorting 5.16.0 release notes

5 years agoMerge pull request #14722 from JKingsnorth/fix-public-url-link-in-browse
Eileen McNaughton [Sun, 14 Jul 2019 06:00:33 +0000 (18:00 +1200)]
Merge pull request #14722 from JKingsnorth/fix-public-url-link-in-browse

Fix public URL link with hashed URLs in mailing browse screen

5 years agoMerge pull request #14764 from elisseck/dev/report/15
Eileen McNaughton [Fri, 12 Jul 2019 01:48:44 +0000 (13:48 +1200)]
Merge pull request #14764 from elisseck/dev/report/15

dev/report/15 Add fix and tests for contact subtype report filter

5 years agoadd tests for contact subtype null and not null report filters
Eli Lisseck [Thu, 11 Jul 2019 23:41:33 +0000 (16:41 -0700)]
add tests for contact subtype null and not null report filters

5 years agoapply reporting#15 fix against master
Jon Goldberg [Mon, 8 Jul 2019 21:51:48 +0000 (17:51 -0400)]
apply reporting#15 fix against master

5 years agoMerge pull request #14789 from seamuslee001/fast_array_caches
Eileen McNaughton [Thu, 11 Jul 2019 23:09:27 +0000 (11:09 +1200)]
Merge pull request #14789 from seamuslee001/fast_array_caches

Ensure recently converted groups cache matches previous behabiour my …

5 years agoEnsure recently converted groups cache matches previous behabiour my setting withArra...
Seamus Lee [Wed, 10 Jul 2019 22:19:18 +0000 (08:19 +1000)]
Ensure recently converted groups cache matches previous behabiour my setting withArray as fast for it

Add in code comment as per Eileen

5 years agoMerge pull request #14783 from agh1/5.16.0-releasenotes
Eileen McNaughton [Wed, 10 Jul 2019 19:04:56 +0000 (07:04 +1200)]
Merge pull request #14783 from agh1/5.16.0-releasenotes

5.16.0 release notes first run

5 years ago5.16.0 release notes: include César Ramos
Andrew Hunt [Wed, 10 Jul 2019 16:26:04 +0000 (12:26 -0400)]
5.16.0 release notes: include César Ramos
per
https://github.com/civicrm/civicrm-core/pull/14518#issuecomment-501881835

5 years ago5.16.0 release notes: add boilerplate
Andrew Hunt [Wed, 10 Jul 2019 15:43:36 +0000 (11:43 -0400)]
5.16.0 release notes: add boilerplate

5 years ago5.16.0 release notes: raw from script
Andrew Hunt [Wed, 10 Jul 2019 15:48:47 +0000 (11:48 -0400)]
5.16.0 release notes: raw from script

5 years agoContributor key: fix invalid YAML
Andrew Hunt [Wed, 10 Jul 2019 15:34:49 +0000 (11:34 -0400)]
Contributor key: fix invalid YAML

5 years agoMerge pull request #14775 from eileenmcnaughton/bgm
Mathieu Lu [Wed, 10 Jul 2019 12:09:48 +0000 (08:09 -0400)]
Merge pull request #14775 from eileenmcnaughton/bgm

dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv

5 years agodev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv
Mathieu Lutfy [Wed, 10 Jul 2019 00:07:16 +0000 (20:07 -0400)]
dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv

5 years agoMerge pull request #14746 from eileenmcnaughton/order_report
Eileen McNaughton [Sun, 7 Jul 2019 15:35:10 +0000 (03:35 +1200)]
Merge pull request #14746 from eileenmcnaughton/order_report

dev/core#1081 fix for error on contribution detail when using custom data order by without select

5 years agodev/core#1081 fix for error on contribution detail when using custom data order by...
eileen [Sun, 7 Jul 2019 06:25:19 +0000 (18:25 +1200)]
dev/core#1081 fix for error on contribution detail when using custom data order by without select

5 years agoMerge pull request #14732 from eileenmcnaughton/backoffice
Eileen McNaughton [Thu, 4 Jul 2019 23:45:44 +0000 (11:45 +1200)]
Merge pull request #14732 from eileenmcnaughton/backoffice

dev/report#16 Unreleased regression - fee levels incorrectly show sol…

5 years agoMerge pull request #14733 from eileenmcnaughton/payment_reg
Eileen McNaughton [Thu, 4 Jul 2019 23:44:27 +0000 (11:44 +1200)]
Merge pull request #14733 from eileenmcnaughton/payment_reg

Fix refund payment not recording from additional payment form

5 years agoFix refund payment not recording from additional payment form
eileen [Thu, 4 Jul 2019 08:41:56 +0000 (20:41 +1200)]
Fix refund payment not recording from additional payment form

5 years agoRevert participant portion of https://github.com/civicrm/civicrm-core/pull/14244
eileen [Thu, 4 Jul 2019 08:30:23 +0000 (20:30 +1200)]
Revert participant portion of https://github.com/civicrm/civicrm-core/pull/14244

5 years agoFix public URL link with hashed URLs in mailing browse screen
JKingsnorth [Wed, 3 Jul 2019 16:10:06 +0000 (17:10 +0100)]
Fix public URL link with hashed URLs in mailing browse screen

5 years agoSet version to 5.16.beta1
CiviCRM [Thu, 4 Jul 2019 07:19:06 +0000 (07:19 +0000)]
Set version to 5.16.beta1

5 years agoMerge remote-tracking branch 'origin/5.15'
Tim Otten [Thu, 4 Jul 2019 07:18:18 +0000 (00:18 -0700)]
Merge remote-tracking branch 'origin/5.15'

5 years agodev/report#16 Unreleased regression - fee levels incorrectly show sold out
eileen [Thu, 4 Jul 2019 07:11:14 +0000 (19:11 +1200)]
dev/report#16 Unreleased regression - fee levels incorrectly show sold out

5 years agoMerge pull request #14730 from alifrumin/5.15.0-releasenotes
Tim Otten [Thu, 4 Jul 2019 06:07:41 +0000 (23:07 -0700)]
Merge pull request #14730 from alifrumin/5.15.0-releasenotes

5.15.0 releasenotes

5 years agoSet version to 5.15.0
Tim Otten [Thu, 4 Jul 2019 06:07:19 +0000 (23:07 -0700)]
Set version to 5.15.0

5 years agoUpdate 5.15.0.md
Tim Otten [Thu, 4 Jul 2019 04:35:46 +0000 (21:35 -0700)]
Update 5.15.0.md

5 years agocleanup
Alice Frumin [Mon, 17 Jun 2019 18:29:43 +0000 (14:29 -0400)]
cleanup

5 years agofinished annotating
Alice Frumin [Mon, 17 Jun 2019 17:54:06 +0000 (13:54 -0400)]
finished annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 19:54:48 +0000 (15:54 -0400)]
annotating

5 years agofinishing changes with git lab issues
Alice Frumin [Tue, 11 Jun 2019 18:54:29 +0000 (14:54 -0400)]
finishing changes with git lab issues

5 years agolinking and annotating
Alice Frumin [Tue, 11 Jun 2019 18:09:33 +0000 (14:09 -0400)]
linking and annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 16:05:48 +0000 (12:05 -0400)]
annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 15:45:06 +0000 (11:45 -0400)]
annotating

5 years agocontributors
Alice Frumin [Mon, 10 Jun 2019 19:27:29 +0000 (15:27 -0400)]
contributors

5 years agoorganizing by git lab issue and condensing as well as pulling out obvious misc
Alice Frumin [Mon, 10 Jun 2019 19:01:46 +0000 (15:01 -0400)]
organizing by git lab issue and condensing as well as pulling out obvious misc

5 years ago5.15.0 release notes: added boilerplate
Andrew Hunt [Mon, 10 Jun 2019 16:19:23 +0000 (12:19 -0400)]
5.15.0 release notes: added boilerplate

5 years ago5.15.0 release notes: raw from script
Andrew Hunt [Mon, 10 Jun 2019 16:15:51 +0000 (12:15 -0400)]
5.15.0 release notes: raw from script

5 years agoMerge pull request #14723 from seamuslee001/ref_date_to_local_extract
Eileen McNaughton [Wed, 3 Jul 2019 21:32:20 +0000 (09:32 +1200)]
Merge pull request #14723 from seamuslee001/ref_date_to_local_extract

Extract code converting a date object to local timezone object to own…

5 years agoExtract code converting a date object to local timezone object to own function
Seamus Lee [Wed, 3 Jul 2019 18:58:18 +0000 (04:58 +1000)]
Extract code converting a date object to local timezone object to own function

5 years agoMerge pull request #14717 from totten/master-rm-ser
Eileen McNaughton [Wed, 3 Jul 2019 11:55:37 +0000 (23:55 +1200)]
Merge pull request #14717 from totten/master-rm-ser

(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver

5 years ago(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver
Tim Otten [Wed, 3 Jul 2019 04:05:30 +0000 (21:05 -0700)]
(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver

The class `CRM_Utils_Cache_SerializeCache` provides a cache-driver for
storing cache records in the filesystem (under `CIVICRM_TEMPLATE_COMPILEDIR`,
using PHP `serialize()` format). Why remove it?

1.  As we work through cleanup in file management (e.g.  #12843,
   dev/cloud-native#3), having an unnecessary reference to
   CIVICRM_TEMPLATE_COMPILEDIR makes it harder to reason about the system.

2. The class is not used. I'm pretty sure it was added speculatively
   (i.e.  with an aim to try using it some day), but that never came to
   pass.  Grepping `universe`, I cannot find any usages or references to
   `SerializeCache`.

3. The implementation is incomplete -- parameters like `get(..., $default)`
   and `set(..., $ttl)` will generate exceptions if used.

5 years agoMerge pull request #14714 from civicrm/5.15
Eileen McNaughton [Wed, 3 Jul 2019 01:22:48 +0000 (13:22 +1200)]
Merge pull request #14714 from civicrm/5.15

5.15 to master

5 years agoMerge branch 'master' into 5.15
Eileen McNaughton [Wed, 3 Jul 2019 01:22:37 +0000 (13:22 +1200)]
Merge branch 'master' into 5.15

5 years agoMerge pull request #14690 from eileenmcnaughton/profile_copy
Eileen McNaughton [Wed, 3 Jul 2019 00:59:48 +0000 (12:59 +1200)]
Merge pull request #14690 from eileenmcnaughton/profile_copy

dev/core#1088 Fix fatal error when copying profile with civirules enabled

5 years agoMerge pull request #14713 from pradpnayak/REF-1
Eileen McNaughton [Tue, 2 Jul 2019 22:32:20 +0000 (10:32 +1200)]
Merge pull request #14713 from pradpnayak/REF-1

Grab contribution status id from database

5 years agoMerge pull request #14608 from eileenmcnaughton/csv_test
Seamus Lee [Tue, 2 Jul 2019 20:37:02 +0000 (16:37 -0400)]
Merge pull request #14608 from eileenmcnaughton/csv_test

 [test] convert export test to handle exception rather than early return

5 years agoGrab contribution status id from database
Pradeep Nayak [Tue, 2 Jul 2019 20:36:36 +0000 (21:36 +0100)]
Grab contribution status id from database

5 years agoMerge pull request #14707 from demeritcowboy/why-is-php-case-insensitive-for-classnames-2
Eileen McNaughton [Tue, 2 Jul 2019 19:32:56 +0000 (07:32 +1200)]
Merge pull request #14707 from demeritcowboy/why-is-php-case-insensitive-for-classnames-2

dev/joomla#13 - followup 2 - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14708 from demeritcowboy/why-is-php-case-insensitive-for-classnames-3
Eileen McNaughton [Tue, 2 Jul 2019 19:32:16 +0000 (07:32 +1200)]
Merge pull request #14708 from demeritcowboy/why-is-php-case-insensitive-for-classnames-3

dev/joomla#13 - followup 3 - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14709 from demeritcowboy/why-is-php-case-insensitive-for-classnames-4
Eileen McNaughton [Tue, 2 Jul 2019 19:31:43 +0000 (07:31 +1200)]
Merge pull request #14709 from demeritcowboy/why-is-php-case-insensitive-for-classnames-4

dev/joomla#13 - followup 4 - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14710 from demeritcowboy/why-is-php-case-insensitive-for-classnames-5
Seamus Lee [Tue, 2 Jul 2019 15:32:22 +0000 (11:32 -0400)]
Merge pull request #14710 from demeritcowboy/why-is-php-case-insensitive-for-classnames-5

dev/joomla#13 - followup 5 - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14704 from pradpnayak/REF-1
Seamus Lee [Tue, 2 Jul 2019 15:29:54 +0000 (11:29 -0400)]
Merge pull request #14704 from pradpnayak/REF-1

Grab contribution status id from database

5 years agoMerge pull request #14685 from eileenmcnaughton/mark_conflict
Seamus Lee [Tue, 2 Jul 2019 15:29:28 +0000 (11:29 -0400)]
Merge pull request #14685 from eileenmcnaughton/mark_conflict

Consolidate handling of conflicts between the batch job and get_conflicts api

5 years agofix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:31:47 +0000 (10:31 -0400)]
fix wrong spelling of classname

5 years agofix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:25:29 +0000 (10:25 -0400)]
fix wrong spelling of classname

5 years agofix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:19:54 +0000 (10:19 -0400)]
fix wrong spelling of classname

5 years agofix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:09:21 +0000 (10:09 -0400)]
fix wrong spelling of classname

5 years agoMerge pull request #14693 from eileenmcnaughton/cust_field_sql
Monish Deb [Tue, 2 Jul 2019 09:13:03 +0000 (14:43 +0530)]
Merge pull request #14693 from eileenmcnaughton/cust_field_sql

[REF] remove instances of pass-by-reference where no change takes place

5 years agoMerge pull request #14503 from pradpnayak/ReportFix
Monish Deb [Tue, 2 Jul 2019 08:49:30 +0000 (14:19 +0530)]
Merge pull request #14503 from pradpnayak/ReportFix

$this->_selectedTables is not populated incase of boleen filters

5 years agoGrab contribution status id from database
Pradeep Nayak [Tue, 2 Jul 2019 08:43:48 +0000 (09:43 +0100)]
Grab contribution status id from database

5 years agoMerge pull request #14702 from demeritcowboy/why-is-php-case-insensitive-for-classnames
Eileen McNaughton [Tue, 2 Jul 2019 07:50:50 +0000 (19:50 +1200)]
Merge pull request #14702 from demeritcowboy/why-is-php-case-insensitive-for-classnames

dev/joomla#13 - followup - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14689 from eileenmcnaughton/cust_field_create
Monish Deb [Tue, 2 Jul 2019 06:12:40 +0000 (11:42 +0530)]
Merge pull request #14689 from eileenmcnaughton/cust_field_create

[REF] extract prepareCreate from CustomField.create

5 years agoWIP
DemeritCowboy [Tue, 2 Jul 2019 06:05:45 +0000 (02:05 -0400)]
WIP

5 years agoMerge pull request #14699 from eileenmcnaughton/activity_search
Monish Deb [Tue, 2 Jul 2019 05:47:31 +0000 (11:17 +0530)]
Merge pull request #14699 from eileenmcnaughton/activity_search

[NFC][test] reformat activity search test

5 years agoMerge pull request #14700 from eileenmcnaughton/search
Monish Deb [Tue, 2 Jul 2019 05:46:41 +0000 (11:16 +0530)]
Merge pull request #14700 from eileenmcnaughton/search

[NFC][test] code formatting only

5 years ago[NFC][test] code formatting only SearchTest, SelectorTest
eileen [Tue, 2 Jul 2019 03:12:36 +0000 (15:12 +1200)]
[NFC][test] code formatting only SearchTest, SelectorTest

5 years ago[NFC][test] reformat activity search test
eileen [Tue, 2 Jul 2019 02:41:02 +0000 (14:41 +1200)]
[NFC][test] reformat activity search test

5 years agoMerge pull request #14695 from eileenmcnaughton/revert
Eileen McNaughton [Tue, 2 Jul 2019 02:35:05 +0000 (14:35 +1200)]
Merge pull request #14695 from eileenmcnaughton/revert

Remove failing assertion

5 years agoMerge pull request #14698 from civicrm/5.15
Eileen McNaughton [Tue, 2 Jul 2019 01:45:51 +0000 (13:45 +1200)]
Merge pull request #14698 from civicrm/5.15

5.15 to master

5 years agoMerge pull request #14692 from agh1/pseudoconstant-caps-5.15
Eileen McNaughton [Tue, 2 Jul 2019 01:45:27 +0000 (13:45 +1200)]
Merge pull request #14692 from agh1/pseudoconstant-caps-5.15

dev/joomla#13 lower-case C on CRM_Core_PseudoConstant breaks 5.14 upgrade on Joomla w/ CiviCase

5 years agoRemove failing assertion
eileen [Tue, 2 Jul 2019 00:25:45 +0000 (12:25 +1200)]
Remove failing assertion

This was a 'never worked' as the original call was doing no check. I changed it to do a check but
got confused & didn't realise thee check was actually failing when I merged. This check was never successful
we should remove it

5 years ago[REF] remove instances of pass-by-reference where no change takes place
eileen [Mon, 1 Jul 2019 23:01:08 +0000 (11:01 +1200)]
[REF] remove instances of pass-by-reference where no change takes place

I did a grep on these and the passed params are not altered - down with php4

5 years agoConsolidate handling of conflicts between the batch job and get_conflicts api
eileen [Mon, 1 Jul 2019 02:56:08 +0000 (14:56 +1200)]
Consolidate handling of conflicts between the batch job and get_conflicts api

This ensures that conflicts are stored during batch_merge to the prev_next cache with the same format as when the api
calls get_conflicts. The code doing this wrangling is moved from the api to the BAO layer.

We add a test to ensure the output is the same & use the previously added test to check the string is the same too.

Test cover here is pretty good

5 years ago[REF] move formatting of conflict into markConflict function
eileen [Mon, 1 Jul 2019 01:01:19 +0000 (13:01 +1200)]
[REF] move formatting of conflict into markConflict function

The goal here is to make this information more usable to an api caller. Currently the 'conflict' key holds text formatted
for a specific form. I was going to change this to hold an array of data that an api could use. However, the
Contact.get_merge_conflicts already has a specific api-friendly format that is keyed by 'mode'
at the top level so my revised plan is to return api-friendly data as well (without messign with the
existing form's data).

This change simply moves the decisions about what data to store & how down to the function whose responsibility
it is (markConflict) and adds a test to ensure that no change results

[REF] move formatting of conflict into markConflict function

The goal here is to make this information more usable to an api caller. Currently the 'conflict' key holds text formatted
for a specific form. I was going to change this to hold an array of data that an api could use. However, the
Contact.get_merge_conflicts already has a specific api-friendly format that is keyed by 'mode'
at the top level so my revised plan is to return api-friendly data as well (without messign with the
existing form's data).

This change simply moves the decisions about what data to store & how down to the function whose responsibility
it is (markConflict) and adds a test to ensure that no change results

5 years agoAdd test ensuring conflicts key existing behaviour is retained
eileen [Mon, 1 Jul 2019 00:40:54 +0000 (12:40 +1200)]
Add test ensuring conflicts key existing behaviour is retained

5 years agoUse correct caps for CRM_Core_PseudoConstant everywhere
Andrew Hunt [Mon, 1 Jul 2019 21:53:29 +0000 (17:53 -0400)]
Use correct caps for CRM_Core_PseudoConstant everywhere

5 years agoMerge pull request #14688 from eileenmcnaughton/revert
Eileen McNaughton [Mon, 1 Jul 2019 21:55:15 +0000 (09:55 +1200)]
Merge pull request #14688 from eileenmcnaughton/revert

 Fix erroneous variable passed to callAPISuccessGetValue

5 years agodev/joomla#13 CiviCase: use correct caps for CRM_Core_PseudoConstant
Andrew Hunt [Mon, 1 Jul 2019 21:26:44 +0000 (17:26 -0400)]
dev/joomla#13 CiviCase: use correct caps for CRM_Core_PseudoConstant

5 years agodev/core#1088 Fix fatal error when copying profile with civirules enabled
eileen [Mon, 1 Jul 2019 11:53:10 +0000 (23:53 +1200)]
dev/core#1088 Fix fatal error when copying profile with civirules enabled

Fixes a bug where the DAO name was not passed to the hook when copying a profile.

5 years ago[REF] extract prepareCreate from CustomField.create
eileen [Mon, 1 Jul 2019 11:38:00 +0000 (23:38 +1200)]
[REF] extract prepareCreate from CustomField.create

Straight forward extraction - cleaning up code with a view to offering a more efficient wrapping function

5 years agoFix erroneous variabl passed to callAPISuccessGetValue
eileen [Mon, 1 Jul 2019 11:17:16 +0000 (23:17 +1200)]
Fix erroneous variabl passed to callAPISuccessGetValue

5 years agoMerge pull request #14671 from eileenmcnaughton/cust_field
colemanw [Mon, 1 Jul 2019 11:16:29 +0000 (07:16 -0400)]
Merge pull request #14671 from eileenmcnaughton/cust_field

[REF] transform the setting of defaults in CustomField::create to be like (some) other entities

5 years agoMerge pull request #14687 from eileenmcnaughton/matt
Eileen McNaughton [Mon, 1 Jul 2019 08:58:45 +0000 (20:58 +1200)]
Merge pull request #14687 from eileenmcnaughton/matt

Deprecate some deprecated address functions: defaultCurrencySymbol

5 years agoMerge pull request #14244 from greenpeace-cee/fix-contribution-overwrite
Eileen McNaughton [Mon, 1 Jul 2019 06:37:21 +0000 (18:37 +1200)]
Merge pull request #14244 from greenpeace-cee/fix-contribution-overwrite

dev/financial#50 - Fix contributions and participants getting overwritten

5 years agoMerge pull request #14587 from samuelsov/lab1058
Eileen McNaughton [Mon, 1 Jul 2019 06:34:29 +0000 (18:34 +1200)]
Merge pull request #14587 from samuelsov/lab1058

Fixing the display of checkboxes in event confirm / thank you (dev/core#1058)

5 years agoMerge pull request #14686 from eileenmcnaughton/search_cancel
Eileen McNaughton [Mon, 1 Jul 2019 06:17:38 +0000 (18:17 +1200)]
Merge pull request #14686 from eileenmcnaughton/search_cancel

Fix failing test by changing expected date format

5 years agoDeprecate some deprecated address functions: defaultCurrencySymbol
Matthew Wire (MJW Consulting) [Tue, 18 Jun 2019 09:54:24 +0000 (10:54 +0100)]
Deprecate some deprecated address functions: defaultCurrencySymbol

5 years agoMerge pull request #14654 from JMAConsulting/dev-1079
Eileen McNaughton [Mon, 1 Jul 2019 05:10:14 +0000 (17:10 +1200)]
Merge pull request #14654 from JMAConsulting/dev-1079

dev-core#1079: Improper character encoding breaks xml processor

5 years agoMerge pull request #14682 from demeritcowboy/div-div-div-div-div
Eileen McNaughton [Mon, 1 Jul 2019 04:38:39 +0000 (16:38 +1200)]
Merge pull request #14682 from demeritcowboy/div-div-div-div-div

dev/core#1086 - Mismatched div and /div tags in caseTypeDetails.html

5 years agoFix failing test by changing expected date format
eileen [Mon, 1 Jul 2019 04:28:19 +0000 (16:28 +1200)]
Fix failing test by changing expected date format

We have been seeing failures on testCancelledFilter on day one of the month - the reason seems to be
that we are expecting, but not receiving, a date format with a leading zero in the qill. This would
pass for much of the month but fail during the single digit days. This doesn't seem like a regreession to
me - just a test-error surfaced by changes in https://github.com/eileenmcnaughton/civicrm-core/commit/6e7cc0f578e814459b1e1b80c7a922684da46140#diff-984fd916f4708bb4b370841ae0ab69e5R465

5 years agoMerge pull request #14683 from eileenmcnaughton/unserial2
Eileen McNaughton [Mon, 1 Jul 2019 02:09:40 +0000 (14:09 +1200)]
Merge pull request #14683 from eileenmcnaughton/unserial2

Block classes in unserialize field for IDE cheer