civicrm-core.git
5 years agoDecommision getPartialPaymentTrxn function
eileen [Thu, 28 Feb 2019 02:33:19 +0000 (15:33 +1300)]
Decommision getPartialPaymentTrxn function

This function is only called from one place in the code & also from a test.

It is misleading as it implies a 'get' when it actually does an update
and it groups functionality in a way that doesn't make sense from the calling code pov

In this commit the function is removed and the lines are directly copied to the calling
function, as preparation for cleaning up the calling function

5 years agoMerge pull request #13686 from seamuslee001/phpword_upgrade
Eileen McNaughton [Wed, 27 Feb 2019 20:58:30 +0000 (09:58 +1300)]
Merge pull request #13686 from seamuslee001/phpword_upgrade

Upgrade PHPWord

5 years agoMerge pull request #13715 from eileenmcnaughton/order_fix
Monish Deb [Wed, 27 Feb 2019 09:15:46 +0000 (14:45 +0530)]
Merge pull request #13715 from eileenmcnaughton/order_fix

[minor cleanup] reduce params passed to searchQuery

5 years agoMerge pull request #13701 from colemanw/changeCaseTypeDate
Eileen McNaughton [Wed, 27 Feb 2019 08:04:55 +0000 (21:04 +1300)]
Merge pull request #13701 from colemanw/changeCaseTypeDate

Migrate date field to datepicker on ChangeCaseType form

5 years agoMerge pull request #13692 from eileenmcnaughton/extract_record
Monish Deb [Wed, 27 Feb 2019 07:36:29 +0000 (13:06 +0530)]
Merge pull request #13692 from eileenmcnaughton/extract_record

[REF] Extract recordPayment portion

5 years ago[minor cleanup] reduce params passed to searchQuery
eileen [Wed, 27 Feb 2019 03:48:40 +0000 (16:48 +1300)]
[minor cleanup] reduce params passed to searchQuery

Where we are retrieving the sql we can call the inner function rather than passing 'true'
in other cases we are passing default values through

5 years agoMerge pull request #13710 from civicrm/5.11
Eileen McNaughton [Tue, 26 Feb 2019 23:06:36 +0000 (12:06 +1300)]
Merge pull request #13710 from civicrm/5.11

Merge 5.11 to master

5 years agoMerge pull request #13696 from mattwire/entityform_13578_fix
Eileen McNaughton [Tue, 26 Feb 2019 20:55:36 +0000 (09:55 +1300)]
Merge pull request #13696 from mattwire/entityform_13578_fix

Move assign of currency for entityForm outside of foreach so order of fields don't matter

5 years agoMerge pull request #13705 from eileenmcnaughton/atest
colemanw [Tue, 26 Feb 2019 19:39:40 +0000 (14:39 -0500)]
Merge pull request #13705 from eileenmcnaughton/atest

[TEST FIX] Increase uniqueness in testSingleNowDates

5 years agoMerge pull request #13638 from eileenmcnaughton/squash_products
colemanw [Tue, 26 Feb 2019 18:41:24 +0000 (13:41 -0500)]
Merge pull request #13638 from eileenmcnaughton/squash_products

dev/core#735 Do not include product in search results if site has none

5 years agoMerge pull request #13645 from eileenmcnaughton/ft_acl_test
colemanw [Tue, 26 Feb 2019 18:34:41 +0000 (13:34 -0500)]
Merge pull request #13645 from eileenmcnaughton/ft_acl_test

Code cleanup - remove extraneous permissions clause

5 years agoMerge pull request #13709 from JMAConsulting/dev-core#757-rc
colemanw [Tue, 26 Feb 2019 17:44:48 +0000 (12:44 -0500)]
Merge pull request #13709 from JMAConsulting/dev-core#757-rc

Viewing Contact Note comments is broken in 5.10.4.

5 years agoMerge pull request #13680 from eileenmcnaughton/order_test
colemanw [Tue, 26 Feb 2019 17:35:42 +0000 (12:35 -0500)]
Merge pull request #13680 from eileenmcnaughton/order_test

Fix & test searchQuery order by to be less dependent on what is selected for search

5 years agoFix bug in test set up
eileen [Tue, 26 Feb 2019 16:28:08 +0000 (05:28 +1300)]
Fix bug in test set up

5 years agoExtract recordPayment portion
eileen [Mon, 25 Feb 2019 05:38:53 +0000 (18:38 +1300)]
Extract recordPayment portion

5 years agoViewing Contact Note comments is broken in 5.10.4.
Ken West [Tue, 26 Feb 2019 11:33:52 +0000 (22:33 +1100)]
Viewing Contact Note comments is broken in 5.10.4.
Update Javascript to use Note-NNNNN rather than cnote_NNNN as the ID of Note rows.
Completes change started in commit 57abcbbf5cf85b1266377e0ad9af4fb5865d5bc0.

5 years agoIncrease uniqueness in testSingleNowDates
eileen [Tue, 26 Feb 2019 06:43:11 +0000 (19:43 +1300)]
Increase uniqueness in testSingleNowDates

Reduce instances of
AuthorizeNet failed for unknown reason.E00012: You have submitted a duplicate of Subscription 5642898. A duplicate subscription will not be created

5 years agoMerge pull request #13702 from mattwire/contributionrecur_payprocid_pseudoconstant_schema
Seamus Lee [Tue, 26 Feb 2019 03:57:00 +0000 (14:57 +1100)]
Merge pull request #13702 from mattwire/contributionrecur_payprocid_pseudoconstant_schema

Add pseudoconstant for payment_processor_id to contributionrecur

5 years agoAdd pseudoconstant for payment_processor_id to contributionrecur
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 21:40:05 +0000 (21:40 +0000)]
Add pseudoconstant for payment_processor_id to contributionrecur

5 years agoMerge pull request #13666 from eileenmcnaughton/case_fix
Seamus Lee [Mon, 25 Feb 2019 20:35:58 +0000 (07:35 +1100)]
Merge pull request #13666 from eileenmcnaughton/case_fix

dev/core#739 Fix case detail report breaking when sorted by case type.

5 years agoMerge pull request #13658 from mfb/temp-force-utf8
Eileen McNaughton [Mon, 25 Feb 2019 20:23:23 +0000 (09:23 +1300)]
Merge pull request #13658 from mfb/temp-force-utf8

Phase out CIVICRM_TEMP_FORCE_UTF8

5 years agoMerge pull request #13643 from eileenmcnaughton/recur
Eileen McNaughton [Mon, 25 Feb 2019 20:20:49 +0000 (09:20 +1300)]
Merge pull request #13643 from eileenmcnaughton/recur

[REF] minor refactor around retrieving processor id for recur

5 years agoMerge pull request #13694 from eileenmcnaughton/extract_refund
Eileen McNaughton [Mon, 25 Feb 2019 20:02:23 +0000 (09:02 +1300)]
Merge pull request #13694 from eileenmcnaughton/extract_refund

Extract record refund function

5 years agoMigrate date field to datepicker on ChangeCaseType form
Coleman Watts [Mon, 25 Feb 2019 19:12:54 +0000 (14:12 -0500)]
Migrate date field to datepicker on ChangeCaseType form

5 years agoExtract record refund function
eileen [Mon, 25 Feb 2019 05:03:33 +0000 (18:03 +1300)]
Extract record refund function

5 years agoMove assign of currency for entityForm outside of foreach so order of fields don...
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 11:36:02 +0000 (11:36 +0000)]
Move assign of currency for entityForm outside of foreach so order of fields don't matter

5 years agoMerge pull request #13582 from colemanw/kam
Eileen McNaughton [Mon, 25 Feb 2019 10:50:50 +0000 (23:50 +1300)]
Merge pull request #13582 from colemanw/kam

Migrate KAM smartmenus to core

5 years agoUpgrade PHPWord
Seamus Lee [Sat, 23 Feb 2019 20:53:24 +0000 (07:53 +1100)]
Upgrade PHPWord

Patch phpword install to fix global handling of disable libxml entity loader

Fix phpoffice/common as well

5 years agoFix & test searchQuery order by to be less dependent on what is selected for search
eileen [Fri, 22 Feb 2019 20:49:12 +0000 (09:49 +1300)]
Fix & test searchQuery order by to be less dependent on what is selected for search

The pseudoconstant array is built when doing a select - if a field is in
order by but not select it will fail - as in the test.

This is a bit hard to hit outside the test for contribution but makes it more robust`
allowing us to address other bugs & performance issues.

5 years agoMerge pull request #13693 from civicrm/revert-13691-record_extract
Eileen McNaughton [Mon, 25 Feb 2019 05:55:35 +0000 (18:55 +1300)]
Merge pull request #13693 from civicrm/revert-13691-record_extract

Revert "[REF] Extract record refund function"

5 years agoRevert "[REF] Extract record refund function"
Eileen McNaughton [Mon, 25 Feb 2019 05:55:13 +0000 (18:55 +1300)]
Revert "[REF] Extract record refund function"

5 years agoMerge pull request #13691 from eileenmcnaughton/record_extract
Monish Deb [Mon, 25 Feb 2019 05:13:35 +0000 (10:43 +0530)]
Merge pull request #13691 from eileenmcnaughton/record_extract

[REF] Extract record refund function

5 years agoExtract record refund function
eileen [Mon, 25 Feb 2019 05:03:33 +0000 (18:03 +1300)]
Extract record refund function

5 years agoMerge pull request #13289 from mfb/pear-mail
Seamus Lee [Mon, 25 Feb 2019 03:06:44 +0000 (14:06 +1100)]
Merge pull request #13289 from mfb/pear-mail

Move pear/mail from packages to composer.json

5 years agoMerge pull request #13340 from mfb/street-number-max
Eileen McNaughton [Mon, 25 Feb 2019 02:51:52 +0000 (15:51 +1300)]
Merge pull request #13340 from mfb/street-number-max

Do not attempt to store out-of-range street number

5 years agodev/core#735 Do not include product in search results if site has none
eileen [Tue, 19 Feb 2019 04:23:21 +0000 (17:23 +1300)]
dev/core#735 Do not include product in search results if site has none

5 years agoMerge pull request #13668 from eileenmcnaughton/extract_order
colemanw [Mon, 25 Feb 2019 02:17:09 +0000 (21:17 -0500)]
Merge pull request #13668 from eileenmcnaughton/extract_order

[REF] Extract getSearchSQL from getSearchQuery.

5 years agoAdd test case for parsing out-of-range street number.
mark burdett [Sun, 24 Feb 2019 23:56:20 +0000 (15:56 -0800)]
Add test case for parsing out-of-range street number.

5 years agoMerge pull request #13688 from mfb/export-temp-table
Eileen McNaughton [Sun, 24 Feb 2019 23:54:18 +0000 (12:54 +1300)]
Merge pull request #13688 from mfb/export-temp-table

Use CRM_Utils_SQL_TempTable to drop and create table.

5 years agoDo not attempt to store out-of-range street number.
mark burdett [Sat, 22 Dec 2018 19:11:57 +0000 (11:11 -0800)]
Do not attempt to store out-of-range street number.

5 years agoMerge pull request #13276 from mfb/trash-change-log
Eileen McNaughton [Sun, 24 Feb 2019 23:30:15 +0000 (12:30 +1300)]
Merge pull request #13276 from mfb/trash-change-log

Record change log entry when contact is moved to or restored from trash

5 years agoMerge pull request #13346 from mfb/geocode-job-db-error
Eileen McNaughton [Sun, 24 Feb 2019 23:05:51 +0000 (12:05 +1300)]
Merge pull request #13346 from mfb/geocode-job-db-error

geocode job: Do not return more messages than can fit in the log data column

5 years agoDeprecate CIVICRM_TEMP_FORCE_UTF8.
mark burdett [Thu, 21 Feb 2019 21:56:23 +0000 (13:56 -0800)]
Deprecate CIVICRM_TEMP_FORCE_UTF8.

5 years agoMerge pull request #13578 from mattwire/entityform_view_towards
Eileen McNaughton [Sun, 24 Feb 2019 21:03:25 +0000 (10:03 +1300)]
Merge pull request #13578 from mattwire/entityform_view_towards

Towards supporting EntityForm for 'View Action'

5 years agoMerge pull request #13588 from jitendrapurohit/dev-631
Eileen McNaughton [Sun, 24 Feb 2019 20:29:31 +0000 (09:29 +1300)]
Merge pull request #13588 from jitendrapurohit/dev-631

dev/core#631 - Enable 'add new' by default on merge screen

5 years agoMerge pull request #13657 from MegaphoneJon/deprecateBasicContactFields
Eileen McNaughton [Sun, 24 Feb 2019 20:26:49 +0000 (09:26 +1300)]
Merge pull request #13657 from MegaphoneJon/deprecateBasicContactFields

reporting#9: parity between getContactFields and getBasicContactFields

5 years agoMerge pull request #13654 from seamuslee001/lab_core_742
Eileen McNaughton [Sun, 24 Feb 2019 20:14:41 +0000 (09:14 +1300)]
Merge pull request #13654 from seamuslee001/lab_core_742

dev/core#742 Fix XML parasing by swapping & for ,

5 years agoMerge pull request #13042 from jackrabbithanna/dev-core-475
Eileen McNaughton [Sun, 24 Feb 2019 20:09:39 +0000 (09:09 +1300)]
Merge pull request #13042 from jackrabbithanna/dev-core-475

only set custom field to null if it is really null, not string 'null'

5 years agoUse CRM_Utils_SQL_TempTable to drop and create table.
mark burdett [Sun, 24 Feb 2019 19:34:20 +0000 (11:34 -0800)]
Use CRM_Utils_SQL_TempTable to drop and create table.

5 years agoMerge pull request #12641 from mfb/reply-forwarding
Monish Deb [Sun, 24 Feb 2019 17:01:00 +0000 (22:31 +0530)]
Merge pull request #12641 from mfb/reply-forwarding

CiviMail: Fix reply forwarding for mailers with From: and Return-path: limitations

5 years agoMerge pull request #12337 from lcdservices/dev-core-190
Eileen McNaughton [Sun, 24 Feb 2019 06:57:45 +0000 (19:57 +1300)]
Merge pull request #12337 from lcdservices/dev-core-190

dev/core#190 / CRM-21643 ensure custom data multi record profile returns correct …

5 years agoMerge pull request #13441 from greenpeace-cee/fix-schema-parsing
Eileen McNaughton [Sun, 24 Feb 2019 05:20:17 +0000 (18:20 +1300)]
Merge pull request #13441 from greenpeace-cee/fix-schema-parsing

CRM/Logging - Fix various bugs in schema parsing

5 years agoMerge pull request #13682 from mfb/utf8mb4-check-exception
Eileen McNaughton [Sun, 24 Feb 2019 04:46:21 +0000 (17:46 +1300)]
Merge pull request #13682 from mfb/utf8mb4-check-exception

Force utf8mb4 query to throw exception as the check expects

5 years agoMerge pull request #13687 from eileenmcnaughton/activity_clean
Eileen McNaughton [Sun, 24 Feb 2019 04:42:24 +0000 (17:42 +1300)]
Merge pull request #13687 from eileenmcnaughton/activity_clean

Minor code cleanup

5 years agoMerge pull request #13634 from eileenmcnaughton/fin_type_speed
Seamus Lee [Sun, 24 Feb 2019 02:28:38 +0000 (13:28 +1100)]
Merge pull request #13634 from eileenmcnaughton/fin_type_speed

[NFC, test class] formatting, remove unused variables

5 years agoMinor code cleanup
Matthew Wire (MJW Consulting) [Sun, 24 Feb 2019 01:19:57 +0000 (14:19 +1300)]
Minor code cleanup

This is a reviewer's commit of https://github.com/civicrm/civicrm-core/pull/13672

I pulled out some lines I've checked & agree with to simplify that commit

5 years agoMerge pull request #13644 from mfb/temporary-tables
Eileen McNaughton [Sun, 24 Feb 2019 00:56:01 +0000 (13:56 +1300)]
Merge pull request #13644 from mfb/temporary-tables

Refactor CRM_Utils_SQL_TempTable::build()->createWithQuery($sql) interface to support MEMORY tabls

5 years agoCRM/Logging - Improve enum handling in schema diff
Patrick Figel [Fri, 25 Jan 2019 18:57:49 +0000 (19:57 +0100)]
CRM/Logging - Improve enum handling in schema diff

Instead of storing permitted enum values in the LENGTH array key
when extracting column information, this adds a separate ENUM_VALUES
key. When schema differences are calculated for enum columns, this
value triggers a change when new permitted values are added.

5 years agoCRM/Logging - Fix various bugs in schema parsing
Patrick Figel [Sun, 13 Jan 2019 18:11:41 +0000 (19:11 +0100)]
CRM/Logging - Fix various bugs in schema parsing

This fixes a couple of bugs in the schema parsing methods used by
Civi's extended logging feature:

- CRM_Logging_Schema::getIndexesForTable only queried for constraints,
  not returning any indexes.
- CRM_Logging_Schema::getIndexesForTable returned an array in the form
  [0 => ['constraint_name' => 'foo']] rather than the expected array
  of index names (i.e. ['foo']).
- CRM_Logging_Schema::columnSpecsOf contained an off-by-one error and
  a wrongly used substr parameter causing column lengths to include
  surrounding parenthesis. This would result in a "varchar(42)"
  column returning a length of "(42)" instead of "42".

5 years agoMerge pull request #13685 from seamuslee001/tests_746
Seamus Lee [Sat, 23 Feb 2019 07:23:37 +0000 (18:23 +1100)]
Merge pull request #13685 from seamuslee001/tests_746

dev/core#746 Add in unit tests to ensure that where clause is as is w…

5 years agoMerge pull request #13684 from civicrm/5.11
Seamus Lee [Sat, 23 Feb 2019 06:08:28 +0000 (17:08 +1100)]
Merge pull request #13684 from civicrm/5.11

5.11

5 years agodev/core#746 Add in unit tests to ensure that where clause is as is when multiple...
Seamus Lee [Sat, 23 Feb 2019 05:55:04 +0000 (16:55 +1100)]
dev/core#746 Add in unit tests to ensure that where clause is as is when multiple smart group where clauses are used in search builder

Add in a check of from clauses too

5 years agoMerge pull request #13683 from seamuslee001/5_11_5_10_4_Release_Notes
Seamus Lee [Sat, 23 Feb 2019 04:41:59 +0000 (15:41 +1100)]
Merge pull request #13683 from seamuslee001/5_11_5_10_4_Release_Notes

Add in 5.10.4 Release notes

5 years agoMerge pull request #13669 from eileenmcnaughton/payment_format
Monish Deb [Sat, 23 Feb 2019 03:51:53 +0000 (09:21 +0530)]
Merge pull request #13669 from eileenmcnaughton/payment_format

Payment notification formatting, move greeting into table

5 years agoAdd in 5.10.4 Release notes
Seamus Lee [Fri, 22 Feb 2019 23:02:29 +0000 (10:02 +1100)]
Add in 5.10.4 Release notes

5 years agoMerge pull request #13675 from greenpeace-cee/fix-logtable-exceptions
Eileen McNaughton [Sat, 23 Feb 2019 01:10:55 +0000 (14:10 +1300)]
Merge pull request #13675 from greenpeace-cee/fix-logtable-exceptions

CRM/Logging - Fix log table exceptions

5 years agoMerge pull request #13673 from eileenmcnaughton/511geocode
Eileen McNaughton [Sat, 23 Feb 2019 01:08:31 +0000 (14:08 +1300)]
Merge pull request #13673 from eileenmcnaughton/511geocode

Remove tests that no longer work due to dead service

5 years agoMerge pull request #13678 from MegaphoneJon/reporting-10-test
Seamus Lee [Fri, 22 Feb 2019 23:37:33 +0000 (10:37 +1100)]
Merge pull request #13678 from MegaphoneJon/reporting-10-test

test for reporting#10

5 years agoMerge pull request #13663 from seamuslee001/lab_core_747
Seamus Lee [Fri, 22 Feb 2019 23:18:25 +0000 (10:18 +1100)]
Merge pull request #13663 from seamuslee001/lab_core_747

Hotfix for dev/core#747 To fix generation of contact image urls

5 years agoForce utf8mb4 query to throw exception as the check expects.
mark burdett [Fri, 22 Feb 2019 23:05:07 +0000 (15:05 -0800)]
Force utf8mb4 query to throw exception as the check expects.

Fixes dev/core#749

5 years agotest for reporting#10
Jon Goldberg [Fri, 22 Feb 2019 21:53:38 +0000 (16:53 -0500)]
test for reporting#10

5 years agoExtract checking of filename into own function and add tests
Seamus Lee [Fri, 22 Feb 2019 21:00:43 +0000 (08:00 +1100)]
Extract checking of filename into own function and add tests

5 years agoExtract getSearchSQL from getSearchQuery.
eileen [Fri, 22 Feb 2019 09:54:11 +0000 (22:54 +1300)]
Extract getSearchSQL from getSearchQuery.

Change one instance to call it directly. Next I'll deprecate it & change all instances hit by the tests

5 years agoMerge pull request #13671 from MegaphoneJon/reporting-11
Eileen McNaughton [Fri, 22 Feb 2019 20:34:52 +0000 (09:34 +1300)]
Merge pull request #13671 from MegaphoneJon/reporting-11

reporting-11 - fix Soft Credit report with full group by

5 years agoMerge pull request #13676 from civicrm/5.11
Eileen McNaughton [Fri, 22 Feb 2019 20:23:48 +0000 (09:23 +1300)]
Merge pull request #13676 from civicrm/5.11

5.11 to master

5 years agoMerge pull request #13670 from MegaphoneJon/reporting-10-rc
Eileen McNaughton [Fri, 22 Feb 2019 20:23:28 +0000 (09:23 +1300)]
Merge pull request #13670 from MegaphoneJon/reporting-10-rc

reporting#10 - fix pagination on Contribution Detail report

5 years agoMerge pull request #13364 from mattwire/activitytype_pseudoconstant
Eileen McNaughton [Fri, 22 Feb 2019 20:01:20 +0000 (09:01 +1300)]
Merge pull request #13364 from mattwire/activitytype_pseudoconstant

REF Convert deprecated functions to buildOptions for case

5 years agoCRM/Logging - Fix log table exceptions
Patrick Figel [Fri, 22 Feb 2019 19:38:30 +0000 (20:38 +0100)]
CRM/Logging - Fix log table exceptions

This fixes a bug that caused columns that were excluded from being
considered "log-worthy" changes to be logged anyway. That happened
because columns were extracted with backticks but compared to strings
without backticks. To preserve compatibility with exceptions set by
alterLogTables which could contain backticks, the comparison is
performed against the column name with and without backticks.

5 years agoRemove tests that no longer work due to dead service
eileen [Sun, 17 Feb 2019 01:42:47 +0000 (14:42 +1300)]
Remove tests that no longer work due to dead service

5 years agoreporting-11 - fix Soft Credit report with full group by
Jon Goldberg [Fri, 22 Feb 2019 17:59:15 +0000 (12:59 -0500)]
reporting-11 - fix Soft Credit report with full group by

5 years agoreporting#10 - fix pagination on Contribution Detail report
Jon Goldberg [Fri, 22 Feb 2019 02:06:13 +0000 (21:06 -0500)]
reporting#10 - fix pagination on Contribution Detail report

5 years agoReplace deprecated activityType/activityStatus functions with buildOptions for cases
Matthew Wire (MJW Consulting) [Fri, 28 Dec 2018 12:59:36 +0000 (12:59 +0000)]
Replace deprecated activityType/activityStatus functions with buildOptions for cases

5 years agoMerge pull request #13649 from eileenmcnaughton/payment
Monish Deb [Fri, 22 Feb 2019 11:17:11 +0000 (16:47 +0530)]
Merge pull request #13649 from eileenmcnaughton/payment

Switch additional payment form to use Payment.sendconfirmation api

5 years agoPayment notification formatting, move greeting into table
eileen [Fri, 22 Feb 2019 10:37:30 +0000 (23:37 +1300)]
Payment notification formatting, move greeting into table

5 years agoCRM_Core_Page_File - Only delivers directly under the customFileUploadDir
Tim Otten [Fri, 22 Feb 2019 08:24:49 +0000 (00:24 -0800)]
CRM_Core_Page_File - Only delivers directly under the customFileUploadDir

5 years agoCRM_Core_Page_File - Fix warning when using filename mode
Tim Otten [Fri, 22 Feb 2019 08:22:03 +0000 (00:22 -0800)]
CRM_Core_Page_File - Fix warning when using filename mode

The idea here is that `id+eid+fcs` and `filename` are two separate modes.
In `filename` mode, you don't need warnings about the missing `fcs`.

5 years agoCRM_Core_Page_File - More consistent capitalization/prose
Tim Otten [Fri, 22 Feb 2019 06:45:45 +0000 (22:45 -0800)]
CRM_Core_Page_File - More consistent capitalization/prose

5 years agoMerge pull request #13662 from seamuslee001/hotfix_746
Seamus Lee [Fri, 22 Feb 2019 05:38:57 +0000 (16:38 +1100)]
Merge pull request #13662 from seamuslee001/hotfix_746

Deploy hotfix to fix dev/core#746 until tests can be written for fix

5 years agoFix case detail report breaking when sorted by case type.
eileen [Fri, 22 Feb 2019 04:22:51 +0000 (17:22 +1300)]
Fix case detail report breaking when sorted by case type.

I removed the hacks to cope with poor metadata declaration & fixed the declaration - this should stop
breaking now. Test added

5 years agoDeploy hotfix to fix dev/core#746 until tests can be written for fix
Seamus Lee [Fri, 22 Feb 2019 01:11:53 +0000 (12:11 +1100)]
Deploy hotfix to fix dev/core#746 until tests can be written for fix

Fix GroupContactCacheTest

5 years ago[NFC] code reformatting - use short array syntax
eileen [Fri, 22 Feb 2019 04:03:45 +0000 (17:03 +1300)]
[NFC] code reformatting - use short array syntax

5 years agoHotfix for dev/core#747 To fix generation of contact image urls
Seamus Lee [Fri, 22 Feb 2019 01:25:38 +0000 (12:25 +1100)]
Hotfix for dev/core#747 To fix generation of contact image urls

5 years agoMerge pull request #13661 from eileenmcnaughton/master
Eileen McNaughton [Fri, 22 Feb 2019 00:47:16 +0000 (13:47 +1300)]
Merge pull request #13661 from eileenmcnaughton/master

5.11 to master

5 years agoMerge branch '5.11' of https://github.com/civicrm/civicrm-core
eileen [Fri, 22 Feb 2019 00:46:16 +0000 (13:46 +1300)]
Merge branch '5.11' of https://github.com/civicrm/civicrm-core

5 years agoMerge pull request #13660 from seamuslee001/5.11
Eileen McNaughton [Fri, 22 Feb 2019 00:42:32 +0000 (13:42 +1300)]
Merge pull request #13660 from seamuslee001/5.11

5.11 - merge in security

5 years agoSwitch Additional Payment to call Payment.send_confirmation api, strip out text
eileen [Wed, 20 Feb 2019 13:13:44 +0000 (02:13 +1300)]
Switch Additional Payment to call Payment.send_confirmation api, strip out text

5 years agoSwitch to greeting for better, more consistent results in tpl, remove print statement
eileen [Wed, 20 Feb 2019 12:38:46 +0000 (01:38 +1300)]
Switch to greeting for better, more consistent results in tpl, remove print statement

5 years agoAdd test for receipt output (test written to pre-change output)
eileen [Wed, 20 Feb 2019 12:05:17 +0000 (01:05 +1300)]
Add test for receipt output (test written to pre-change output)

5 years agorelease-notes/5.10.3.md - Update "Feedback" to be... closer to reality wrt SA's
Tim Otten [Thu, 21 Feb 2019 06:38:50 +0000 (22:38 -0800)]
release-notes/5.10.3.md - Update "Feedback" to be... closer to reality wrt SA's

5 years agorelease-notes/5.10.3.md - TOC should match actual headings
Tim Otten [Thu, 21 Feb 2019 06:27:09 +0000 (22:27 -0800)]
release-notes/5.10.3.md - TOC should match actual headings