civicrm-core.git
4 years agoMerge pull request #16154 from colemanw/getFields
Eileen McNaughton [Mon, 30 Dec 2019 02:17:57 +0000 (15:17 +1300)]
Merge pull request #16154 from colemanw/getFields

Allow values to be passed to api4 GetFields

4 years agoMerge pull request #16161 from civicrm/5.21
Seamus Lee [Sun, 29 Dec 2019 06:45:08 +0000 (17:45 +1100)]
Merge pull request #16161 from civicrm/5.21

5.21

4 years agoMerge pull request #16160 from seamuslee001/5.21
Seamus Lee [Sun, 29 Dec 2019 06:43:43 +0000 (17:43 +1100)]
Merge pull request #16160 from seamuslee001/5.21

5.20.3 Release Notes

4 years agoUpdate 5.20.3.md
Tim Otten [Sun, 29 Dec 2019 04:30:22 +0000 (20:30 -0800)]
Update 5.20.3.md

4 years agoAdd release-notes/5.20.3.md
Tim Otten [Sun, 29 Dec 2019 03:30:23 +0000 (19:30 -0800)]
Add release-notes/5.20.3.md

4 years agoMerge pull request #16157 from seamuslee001/dev_drupal_99
Seamus Lee [Sat, 28 Dec 2019 23:58:50 +0000 (10:58 +1100)]
Merge pull request #16157 from seamuslee001/dev_drupal_99

dev/drupal#99 Fix E-notice on undefined property id of non object

4 years agoMerge pull request #16156 from civicrm/5.21
Seamus Lee [Sat, 28 Dec 2019 23:58:00 +0000 (10:58 +1100)]
Merge pull request #16156 from civicrm/5.21

5.21

4 years agoAllow values to be passed to api4 GetFields
Coleman Watts [Sat, 28 Dec 2019 14:31:40 +0000 (09:31 -0500)]
Allow values to be passed to api4 GetFields

So far this only filters custom fields by contact type,
but values is now being passed to allow more filtering.

4 years agodev/drupal#99 Fix E-notice on undefined property id of non object
Seamus Lee [Sat, 28 Dec 2019 21:49:25 +0000 (08:49 +1100)]
dev/drupal#99 Fix E-notice on undefined property id of non object

4 years agoMerge pull request #16155 from seamuslee001/5.21
Seamus Lee [Sat, 28 Dec 2019 21:38:03 +0000 (08:38 +1100)]
Merge pull request #16155 from seamuslee001/5.21

dev/core#183 Ensure that having a rule where each field is the same w…

4 years agodev/core#183 Ensure that having a rule where each field is the same weight with the...
Seamus Lee [Sat, 28 Dec 2019 20:22:34 +0000 (07:22 +1100)]
dev/core#183 Ensure that having a rule where each field is the same weight with the threshold being the total sum of the weights does not cause a fatal error when searching for dupes

4 years agoMerge pull request #16152 from colemanw/multi
Seamus Lee [Sat, 28 Dec 2019 03:10:21 +0000 (14:10 +1100)]
Merge pull request #16152 from colemanw/multi

Api4 - Fix auto serialize array input for CheckBox/MultiSelect fields

4 years agoMerge pull request #15135 from mattwire/case_links_refactor_report
colemanw [Fri, 27 Dec 2019 21:43:55 +0000 (16:43 -0500)]
Merge pull request #15135 from mattwire/case_links_refactor_report

 Add case activity action links to activity report

4 years agoMerge pull request #16079 from eileenmcnaughton/email
colemanw [Thu, 26 Dec 2019 18:45:49 +0000 (13:45 -0500)]
Merge pull request #16079 from eileenmcnaughton/email

Remove unnecessary, and possibly incorrect query from email update

4 years agoMerge pull request #16135 from eileenmcnaughton/pay_total
colemanw [Thu, 26 Dec 2019 18:41:18 +0000 (13:41 -0500)]
Merge pull request #16135 from eileenmcnaughton/pay_total

[REF] simplify recordAdjustedAmt function

4 years agoApi4 - Fix auto serialize array input for CheckBox/MultiSelect fields
Coleman Watts [Thu, 26 Dec 2019 15:54:33 +0000 (10:54 -0500)]
Api4 - Fix auto serialize array input for CheckBox/MultiSelect fields

4 years agoMerge pull request #16151 from eileenmcnaughton/seamus
colemanw [Thu, 26 Dec 2019 16:03:21 +0000 (11:03 -0500)]
Merge pull request #16151 from eileenmcnaughton/seamus

[REF] extract member form batch update & add test

4 years agoMerge pull request #16131 from eileenmcnaughton/acl
Yashodha Chaku [Thu, 26 Dec 2019 07:53:59 +0000 (13:23 +0530)]
Merge pull request #16131 from eileenmcnaughton/acl

[Ref] improve readability of acl code

4 years ago[REF] extract member form batch update & add test
eileen [Thu, 26 Dec 2019 04:02:27 +0000 (17:02 +1300)]
[REF] extract member form batch update & add test

4 years agoMerge pull request #16112 from seamuslee001/remove_zend_validator
Eileen McNaughton [Thu, 26 Dec 2019 03:02:31 +0000 (16:02 +1300)]
Merge pull request #16112 from seamuslee001/remove_zend_validator

Remove unneeded zendframwork/zend-validator and zendframwork/zend-stdlib packages as not required by …

4 years agoMerge pull request #16140 from eileenmcnaughton/part_name
Matthew Wire [Mon, 23 Dec 2019 13:11:44 +0000 (13:11 +0000)]
Merge pull request #16140 from eileenmcnaughton/part_name

dev/event#25 Fix regression on billing name overwrite

4 years agoMerge pull request #16136 from eileenmcnaughton/member_test
Seamus Lee [Mon, 23 Dec 2019 05:02:40 +0000 (16:02 +1100)]
Merge pull request #16136 from eileenmcnaughton/member_test

[REF] remove CRM_Core_Error check

4 years agoMerge pull request #16145 from eileenmcnaughton/index_api
Eileen McNaughton [Mon, 23 Dec 2019 04:41:10 +0000 (17:41 +1300)]
Merge pull request #16145 from eileenmcnaughton/index_api

Add api to check for missing indices

4 years agoMerge pull request #16144 from eileenmcnaughton/acl_index
Seamus Lee [Mon, 23 Dec 2019 00:55:03 +0000 (11:55 +1100)]
Merge pull request #16144 from eileenmcnaughton/acl_index

dev/core#1486 Add index to civicrm_acl_cache.modified_date

4 years agoMerge pull request #16143 from eileenmcnaughton/deadlock_err2
Eileen McNaughton [Mon, 23 Dec 2019 00:02:16 +0000 (13:02 +1300)]
Merge pull request #16143 from eileenmcnaughton/deadlock_err2

Fix misleading error message on deadlock

4 years agoAdd api to check for missing indices
eileen [Sun, 22 Dec 2019 23:08:18 +0000 (12:08 +1300)]
Add api to check for missing indices

4 years agoAdd index to civicrm_acl.modified_date
eileen [Sun, 22 Dec 2019 22:32:14 +0000 (11:32 +1300)]
Add index to civicrm_acl.modified_date

4 years agoFix misleading error message on deadlock
eileen [Sun, 22 Dec 2019 20:47:10 +0000 (09:47 +1300)]
Fix misleading error message on deadlock

We were seeing error messages like
API_Exception : financial_type_id is not valid : Donation
when a deadlock was hit. The error made not sense as 'Donation' DID exist and did not help us
to identify the issue as a deadlock. It's still helpful with a deadlock to know if
a real constraint violation is hit as per https://lab.civicrm.org/dev/core/issues/1481 sometimes
a disturbing amount of queries have been rolled back.

Let's fix to handle pseudoconstants here & give a useful message.
The previously converted params did not get to this point but we can re-do that work in this low
volume function rather than do a lot of re-thinking

4 years agoMerge pull request #16142 from eileenmcnaughton/deadlock_err
Eileen McNaughton [Sun, 22 Dec 2019 22:10:58 +0000 (11:10 +1300)]
Merge pull request #16142 from eileenmcnaughton/deadlock_err

[NFC] Declare exceptions, use single quotes where possible, use strict comparison

4 years agoMerge pull request #16141 from eileenmcnaughton/fatal
Eileen McNaughton [Sun, 22 Dec 2019 22:10:44 +0000 (11:10 +1300)]
Merge pull request #16141 from eileenmcnaughton/fatal

dev/core#560 Remove instances of fatal errors

4 years ago[NFC] Declare exceptions, use single quotes where possible, use strict comparison
eileen [Sun, 22 Dec 2019 20:28:35 +0000 (09:28 +1300)]
[NFC] Declare exceptions, use single quotes where possible, use strict comparison

General coding standards. If we know one side is a string we can switch comparison to strict

4 years agoMerge pull request #16132 from eileenmcnaughton/member
Seamus Lee [Sun, 22 Dec 2019 20:10:40 +0000 (07:10 +1100)]
Merge pull request #16132 from eileenmcnaughton/member

[REF] step towards wiping out  $ids array in membership bao functions

4 years agoRemove instances of fatal errors
eileen [Sun, 22 Dec 2019 20:07:52 +0000 (09:07 +1300)]
Remove instances of fatal errors

4 years agoMerge pull request #16134 from eileenmcnaughton/member_legacy
Seamus Lee [Sun, 22 Dec 2019 20:07:33 +0000 (07:07 +1100)]
Merge pull request #16134 from eileenmcnaughton/member_legacy

Remove legacy_redirect_path handling

4 years agoMerge pull request #16122 from demeritcowboy/always-true
Eileen McNaughton [Sun, 22 Dec 2019 20:02:37 +0000 (09:02 +1300)]
Merge pull request #16122 from demeritcowboy/always-true

[NFC] If statement is always true

4 years agoMerge pull request #16138 from eileenmcnaughton/static
Matthew Wire [Sun, 22 Dec 2019 11:48:18 +0000 (11:48 +0000)]
Merge pull request #16138 from eileenmcnaughton/static

Switch static var to using Civi::statics

4 years agoMerge pull request #16137 from eileenmcnaughton/less_dep
Matthew Wire [Sun, 22 Dec 2019 11:45:27 +0000 (11:45 +0000)]
Merge pull request #16137 from eileenmcnaughton/less_dep

[REF] Minor cleanup - declare exceptions, use single quotes, strict comparison

4 years agodev/event#25 Fix regression on billing name overwrite
eileen [Sun, 22 Dec 2019 08:53:11 +0000 (21:53 +1300)]
dev/event#25 Fix regression on billing name overwrite

https://lab.civicrm.org/dev/event/issues/25 was caused by https://github.com/civicrm/civicrm-core/commit/b1b7f4e35bbe566d9efccac1055d311245420974
where it started overwriting the name in that function.

In digging in the code I found that it seems that as long as we call this function before the processor all is
good so we should call right before the processor rather than broader contamination.

Also note ideally the settings bag would be used.

4 years agoSwitch static var to using Civi::statics
eileen [Sun, 22 Dec 2019 05:40:58 +0000 (18:40 +1300)]
Switch static var to using Civi::statics

This static variable is actually problematic. Moving it to statics will allow us to stop reseting it
in the test suite & to hone in on where it is actually broken rather than the test suite
is not flushing it

4 years ago[REF] Minor cleanup - declare exceptions, use single quotes, strict comparison
eileen [Sun, 22 Dec 2019 05:20:11 +0000 (18:20 +1300)]
[REF] Minor cleanup - declare exceptions, use single quotes, strict comparison

4 years ago[REF] remove CRM_Core_Error check
eileen [Sun, 22 Dec 2019 05:12:22 +0000 (18:12 +1300)]
[REF] remove CRM_Core_Error check

I'm convinced there is no reason why find should return a core_error & hence if it did we wouldn't want
to keep calm & carry on - smells a lot like copy & paste. Also makes code hard to understand

4 years ago[REF] step towards wiping out array in membership bao functions
eileen [Sat, 21 Dec 2019 20:50:23 +0000 (09:50 +1300)]
[REF] step towards wiping out  array in membership bao functions

4 years agoMerge pull request #16133 from eileenmcnaughton/member_test
Seamus Lee [Sun, 22 Dec 2019 03:23:36 +0000 (14:23 +1100)]
Merge pull request #16133 from eileenmcnaughton/member_test

[NFC] Test clean up.

4 years ago[REF] simplify recordAdjustedAmt function
eileen [Sun, 22 Dec 2019 02:20:43 +0000 (15:20 +1300)]
[REF] simplify recordAdjustedAmt function

Makes IF statement more readable & casts to float to explicity handle it

4 years ago[NFC] Test clean up.
eileen [Sat, 21 Dec 2019 22:35:44 +0000 (11:35 +1300)]
[NFC] Test clean up.

Good test - nightmare to read. This helps.

4 years agoRemove legacy_redirect_path handling
eileen [Sat, 21 Dec 2019 22:47:12 +0000 (11:47 +1300)]
Remove legacy_redirect_path handling

This has been hanging around for a long time & no-one has logged a JIRA (or pointed out that JIRA is now
defunct) so the initial analysis of it being unreachable makes sense

4 years agoMerge pull request #16130 from colemanw/ext
Eileen McNaughton [Sat, 21 Dec 2019 19:33:58 +0000 (08:33 +1300)]
Merge pull request #16130 from colemanw/ext

Fix output display in api4 explorer

4 years ago[Ref] improve readability of acl code
eileen [Sat, 21 Dec 2019 19:25:18 +0000 (08:25 +1300)]
[Ref] improve readability of acl code

Variables are used in this code for table names, making the queries hard to read.

Since there is quite a bit I've only tackled 2 patterns
1) using  where an alias within mysql would do
2) using  where an alias withing mysql would do

Ideally we want to switch to using CRM_Core_DAO::executeQuery & ditch the variables forr
table names altogether but since there is a lot I've stuck to one pattern for this change

4 years agoFix output display in api4 explorer
Coleman Watts [Fri, 20 Dec 2019 19:38:53 +0000 (14:38 -0500)]
Fix output display in api4 explorer

4 years agoMerge pull request #16125 from eileenmcnaughton/cont_sub
colemanw [Fri, 20 Dec 2019 12:10:15 +0000 (07:10 -0500)]
Merge pull request #16125 from eileenmcnaughton/cont_sub

dev/core#1482 Remove lines of code that appear to relate to legacy logic

4 years agoMerge pull request #16124 from eileenmcnaughton/acl_deadlock
Yashodha Chaku [Fri, 20 Dec 2019 09:21:26 +0000 (14:51 +0530)]
Merge pull request #16124 from eileenmcnaughton/acl_deadlock

Remove function marked as deprecated & unused by core nearly a year ago

4 years agoMerge pull request #16127 from eileenmcnaughton/mem_test
Eileen McNaughton [Fri, 20 Dec 2019 08:00:51 +0000 (21:00 +1300)]
Merge pull request #16127 from eileenmcnaughton/mem_test

Unit test for https://github.com/civicrm/civicrm-core/pull/16120

4 years agoUnit test for https://github.com/civicrm/civicrm-core/pull/16120
eileen [Fri, 20 Dec 2019 05:52:51 +0000 (18:52 +1300)]
Unit test for https://github.com/civicrm/civicrm-core/pull/16120

4 years agoMerge pull request #16126 from civicrm/5.21
Eileen McNaughton [Fri, 20 Dec 2019 05:51:56 +0000 (18:51 +1300)]
Merge pull request #16126 from civicrm/5.21

5.21 to master

4 years agoMerge pull request #16120 from seamuslee001/dev_core_1485
Eileen McNaughton [Fri, 20 Dec 2019 05:51:30 +0000 (18:51 +1300)]
Merge pull request #16120 from seamuslee001/dev_core_1485

dev/core#1485 Fix field name for join_date to be membership_join_date…

4 years agodev/core#1482 Remove lines of code that appear to relate to legacy logic
eileen [Thu, 19 Dec 2019 22:14:38 +0000 (11:14 +1300)]
dev/core#1482 Remove lines of code that appear to relate to legacy logic

As discussed in https://lab.civicrm.org/dev/core/issues/1482 the subscription history table appears to still be used for
recording group history but this business of creating a row with no attached group appears to be from a logic flow that
is long-superceded by change log & db logging

4 years agoMerge pull request #16123 from civicrm/5.21
Eileen McNaughton [Thu, 19 Dec 2019 20:28:47 +0000 (09:28 +1300)]
Merge pull request #16123 from civicrm/5.21

5.21 to master

4 years agoRemove function marked as deprecated & unused by core nearly a year ago
eileen [Thu, 19 Dec 2019 20:27:46 +0000 (09:27 +1300)]
Remove function marked as deprecated & unused by core nearly a year ago

4 years agodev/core#1485 Fix field name for join_date to be membership_join_date in line with...
Seamus Lee [Thu, 19 Dec 2019 03:32:07 +0000 (14:32 +1100)]
dev/core#1485 Fix field name for join_date to be membership_join_date in line with the DAO schema

Also include membership_join_date into the mapping as per Jamie's comments

4 years agoMerge pull request #16121 from mlutfy/core1490-rc
Eileen McNaughton [Thu, 19 Dec 2019 20:18:08 +0000 (09:18 +1300)]
Merge pull request #16121 from mlutfy/core1490-rc

dev/core#1490 Fix syntax error in Membership Receipt

4 years agoMerge pull request #16119 from eileenmcnaughton/acl_deadlock
Eileen McNaughton [Thu, 19 Dec 2019 20:16:10 +0000 (09:16 +1300)]
Merge pull request #16119 from eileenmcnaughton/acl_deadlock

[Ref] Remove php4 support from BAO_Acl class

4 years agoif statement is always true
demeritcowboy [Thu, 19 Dec 2019 17:12:28 +0000 (12:12 -0500)]
if statement is always true

4 years agodev/core#1490 Fix syntax error in Membership Receipt
Mathieu Lutfy [Thu, 19 Dec 2019 15:21:29 +0000 (10:21 -0500)]
dev/core#1490 Fix syntax error in Membership Receipt

4 years agoRemove php4 support from BAO_Acl class
eileen [Thu, 19 Dec 2019 02:06:22 +0000 (15:06 +1300)]
Remove php4 support from BAO_Acl class

Removes instances of php support involving & in the function signature. In each instance the function is only ever called once
(I think all are internal too) & the calling function doesn't do any weird stuff with references that might make it needed.
Also remove one instance of  unnecessarily passed by ref

4 years agoMerge pull request #15968 from eileenmcnaughton/bom
Seamus Lee [Tue, 17 Dec 2019 19:35:01 +0000 (06:35 +1100)]
Merge pull request #15968 from eileenmcnaughton/bom

dev/core#1424 Support MS Excel for diacritic characters when exporting to csv

4 years agoAlso remove zendframework/zend-stdlib
Seamus Lee [Tue, 17 Dec 2019 19:27:14 +0000 (06:27 +1100)]
Also remove zendframework/zend-stdlib

4 years agoMerge pull request #15972 from aydun/report#24
Yashodha Chaku [Tue, 17 Dec 2019 09:14:30 +0000 (14:44 +0530)]
Merge pull request #15972 from aydun/report#24

report#24 - Case Detail report - fix 'Active role?' when no relationships

4 years agoMerge pull request #16101 from jitendrapurohit/dev-1474
Yashodha Chaku [Tue, 17 Dec 2019 09:08:46 +0000 (14:38 +0530)]
Merge pull request #16101 from jitendrapurohit/dev-1474

dev/core#1474 - (On Hold) text missing from email column when custom …

4 years agoMerge pull request #16115 from eileenmcnaughton/deprecate
Seamus Lee [Tue, 17 Dec 2019 07:19:39 +0000 (18:19 +1100)]
Merge pull request #16115 from eileenmcnaughton/deprecate

Remove vestige of apiv2

4 years agoMerge pull request #16114 from eileenmcnaughton/pear
Seamus Lee [Tue, 17 Dec 2019 07:18:48 +0000 (18:18 +1100)]
Merge pull request #16114 from eileenmcnaughton/pear

[NFC] cleanup to declared exceptions, quotes, strict mode.

4 years agodev/core#1474 - (On Hold) text missing from email column when custom search profile...
Jitendra Purohit [Fri, 13 Dec 2019 12:46:33 +0000 (18:16 +0530)]
dev/core#1474 - (On Hold) text missing from email column when custom search profile is used in Advanced Search

Add test

4 years agoRemove vestige of apiv2
eileen [Tue, 17 Dec 2019 05:07:16 +0000 (18:07 +1300)]
Remove vestige of apiv2

4 years ago[NFC] cleanup to declared exceptions, quotes, strict mode.
eileen [Tue, 17 Dec 2019 05:03:33 +0000 (18:03 +1300)]
[NFC] cleanup to declared exceptions, quotes, strict mode.

4 years agoMerge pull request #16111 from eileenmcnaughton/pf
Seamus Lee [Mon, 16 Dec 2019 19:09:43 +0000 (06:09 +1100)]
Merge pull request #16111 from eileenmcnaughton/pf

dev/core#1472 fix price field money clean

4 years agoRemove unneded zendframwor/zend-validator package as not required by any other package
Seamus Lee [Sun, 15 Dec 2019 19:35:39 +0000 (06:35 +1100)]
Remove unneded zendframwor/zend-validator package as not required by any other package

4 years agoMerge pull request #16109 from seamuslee001/utils_grant_bin_fatal_exception
Eileen McNaughton [Sun, 15 Dec 2019 07:41:03 +0000 (20:41 +1300)]
Merge pull request #16109 from seamuslee001/utils_grant_bin_fatal_exception

[REF] Switch CRM_Utils_Error::fatal calls for CRM_Core_Exception in G…

4 years agoMerge pull request #16110 from seamuslee001/api4_country_state_entities
Seamus Lee [Sat, 14 Dec 2019 23:35:38 +0000 (10:35 +1100)]
Merge pull request #16110 from seamuslee001/api4_country_state_entities

Add in Country and StateProvince APIv4 Entities

4 years agoAdd in Country and StateProvince APIv4 Entities
Seamus Lee [Sat, 14 Dec 2019 22:03:56 +0000 (09:03 +1100)]
Add in Country and StateProvince APIv4 Entities

4 years ago[REF] Switch CRM_Utils_Error::fatal calls for CRM_Core_Exception in Grant. utils...
Seamus Lee [Sat, 14 Dec 2019 21:40:07 +0000 (08:40 +1100)]
[REF] Switch CRM_Utils_Error::fatal calls for CRM_Core_Exception in Grant. utils, bin/ and Civi/Angular/ folders

4 years agoMerge pull request #16108 from civicrm/5.21
Seamus Lee [Sat, 14 Dec 2019 04:48:06 +0000 (15:48 +1100)]
Merge pull request #16108 from civicrm/5.21

5.21

4 years agoMerge pull request #16107 from demeritcowboy/freezy-5.21
Seamus Lee [Sat, 14 Dec 2019 02:37:46 +0000 (13:37 +1100)]
Merge pull request #16107 from demeritcowboy/freezy-5.21

dev/core#1477 Fix fatal error when editing reserved option group settings

4 years agofix fatal error when editing reserved option group settings
demeritcowboy [Sat, 14 Dec 2019 00:52:28 +0000 (19:52 -0500)]
fix fatal error when editing reserved option group settings

4 years agofix price field money clean
eileen [Fri, 13 Dec 2019 19:50:22 +0000 (08:50 +1300)]
fix price field money clean

4 years agoMerge pull request #16103 from civicrm/5.21
Eileen McNaughton [Fri, 13 Dec 2019 19:36:41 +0000 (08:36 +1300)]
Merge pull request #16103 from civicrm/5.21

5.21 to master

4 years agoMerge pull request #16052 from eileenmcnaughton/desc
Eileen McNaughton [Fri, 13 Dec 2019 19:36:09 +0000 (08:36 +1300)]
Merge pull request #16052 from eileenmcnaughton/desc

Fix unreleased regression where processors using getPaymentDescription get a fatal

4 years agoMerge pull request #16096 from eileenmcnaughton/pf
Yashodha Chaku [Fri, 13 Dec 2019 12:16:49 +0000 (17:46 +0530)]
Merge pull request #16096 from eileenmcnaughton/pf

E notice fix on Price set form

4 years agoMerge pull request #16078 from colemanw/snippets
colemanw [Fri, 13 Dec 2019 02:40:23 +0000 (21:40 -0500)]
Merge pull request #16078 from colemanw/snippets

Allow Angular modules to provide dynamic HTML snippets

4 years agohook_angularModules - Accept 'partialsCallback' for dynamic partials
Tim Otten [Thu, 12 Dec 2019 23:33:07 +0000 (15:33 -0800)]
hook_angularModules - Accept 'partialsCallback' for dynamic partials

This is similar to the antecedent commit which used a field 'snippets' that
contained a list of HTML files and their content. However, this
uses a callback function instead of providing the full HTML content.

This makes it safer to work with the Angular metadata without needing to
load the content of all partials into memory.

4 years agoE notice fix on Price set form
eileen [Thu, 12 Dec 2019 21:46:37 +0000 (10:46 +1300)]
E notice fix on Price set form

4 years agoMerge pull request #16088 from eileenmcnaughton/paypal_clean
Seamus Lee [Thu, 12 Dec 2019 20:25:52 +0000 (07:25 +1100)]
Merge pull request #16088 from eileenmcnaughton/paypal_clean

Paypal class cleanup

4 years agoMerge pull request #16094 from pradpnayak/ActivityTypeName-Case
Matthew Wire [Thu, 12 Dec 2019 17:28:50 +0000 (17:28 +0000)]
Merge pull request #16094 from pradpnayak/ActivityTypeName-Case

dev/core/issues/1470, show labels instead name for activity type

4 years agodev/core/issues/1470, show labels instead name for activity type
Pradeep Nayak [Thu, 12 Dec 2019 10:43:26 +0000 (10:43 +0000)]
dev/core/issues/1470, show labels instead name for activity type

4 years agoMerge pull request #16093 from civicrm/5.21
Seamus Lee [Thu, 12 Dec 2019 04:28:54 +0000 (15:28 +1100)]
Merge pull request #16093 from civicrm/5.21

5.21

4 years agoMerge pull request #16092 from seamuslee001/5.21
Seamus Lee [Thu, 12 Dec 2019 04:28:03 +0000 (15:28 +1100)]
Merge pull request #16092 from seamuslee001/5.21

Fix Release note header

4 years agoFix Release note header
Seamus Lee [Thu, 12 Dec 2019 04:26:28 +0000 (15:26 +1100)]
Fix Release note header

4 years agoMerge pull request #16091 from civicrm/5.21
Seamus Lee [Thu, 12 Dec 2019 04:23:21 +0000 (15:23 +1100)]
Merge pull request #16091 from civicrm/5.21

5.21

4 years agoMerge pull request #16057 from eileenmcnaughton/act_perm521
Seamus Lee [Thu, 12 Dec 2019 03:35:57 +0000 (14:35 +1100)]
Merge pull request #16057 from eileenmcnaughton/act_perm521

dev/core#1444 Permit activities with campaigns on contact tab for con…

4 years agoMerge pull request #16090 from seamuslee001/5.21
Seamus Lee [Thu, 12 Dec 2019 02:01:12 +0000 (13:01 +1100)]
Merge pull request #16090 from seamuslee001/5.21

Add release-notes/5.20.2

4 years agoAdd release-notes/5.20.2
Tim Otten [Thu, 12 Dec 2019 01:46:35 +0000 (17:46 -0800)]
Add release-notes/5.20.2

4 years agoMerge pull request #16080 from eileenmcnaughton/org_up
Seamus Lee [Thu, 12 Dec 2019 01:42:32 +0000 (12:42 +1100)]
Merge pull request #16080 from eileenmcnaughton/org_up

Remove unnecessary query when updating org, if no name update.