Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CATL-1613: Add options to Mail Account settings to improve inbound mail processing #42

Open
wants to merge 1,197 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
1197 commits
Select commit Hold shift + click to select a range
7d2c397
[REF] Remove wrangling on activityType param
eileenmcnaughton Sep 22, 2020
3042550
Merge pull request #18553 from seamuslee001/master
eileenmcnaughton Sep 22, 2020
a4edb11
Merge pull request #18554 from civicrm/5.30
seamuslee001 Sep 22, 2020
99d57de
Determine name of DAO when needed rather than passing a variable around
eileenmcnaughton Sep 17, 2020
a7d8600
Merge pull request #18557 from eileenmcnaughton/dep2
eileenmcnaughton Sep 22, 2020
12ffd86
Minor test fix
eileenmcnaughton Sep 22, 2020
0afd87e
Minor test data fix up - ensure domain contact's email is primary
eileenmcnaughton Sep 22, 2020
aaa8790
Merge pull request #18552 from eileenmcnaughton/ref
colemanw Sep 22, 2020
c3ea05e
[Ref] Move determination about location type to the getDAOForLocation…
eileenmcnaughton Sep 17, 2020
443b070
dev/core#2047 [REF] Move calculation of 'type' to copyDataToNewBlockDAO
eileenmcnaughton Sep 17, 2020
7fef2ca
Merge pull request #18560 from eileenmcnaughton/test
seamuslee001 Sep 22, 2020
5df3f10
Merge pull request #18430 from eileenmcnaughton/open
colemanw Sep 22, 2020
8beea90
Merge pull request #18561 from eileenmcnaughton/test_data
eileenmcnaughton Sep 22, 2020
3f7ae3f
Merge pull request #18533 from seamuslee001/dev_core_2030
eileenmcnaughton Sep 22, 2020
8cf1fca
Extend test debug
eileenmcnaughton Sep 22, 2020
cf9a434
Merge pull request #18504 from demeritcowboy/scrunched-cc
eileenmcnaughton Sep 23, 2020
713085d
Merge pull request #18535 from eileenmcnaughton/first
colemanw Sep 23, 2020
be21932
Merge pull request #18565 from eileenmcnaughton/cachekey
seamuslee001 Sep 23, 2020
5ef1209
Merge pull request #18558 from eileenmcnaughton/act_type
seamuslee001 Sep 23, 2020
5406ce3
Merge pull request #18515 from mattwire/membershipbaodeprecated
seamuslee001 Sep 23, 2020
ea929c6
Switch to non-deprecated/cached functions for membership pricesets
mattwire Sep 7, 2020
dc65872
Switch to passing payment_processor_id as input param to completeOrder
mattwire Sep 19, 2020
6777cd9
Merge pull request #18528 from mattwire/inputpaymentprocessorid
eileenmcnaughton Sep 23, 2020
24d5927
Test cleanup fix
eileenmcnaughton Sep 23, 2020
b577a1c
dev/financial#148 Duplicate validateData onto A.net
eileenmcnaughton Sep 23, 2020
961e8fc
Merge pull request #18550 from eileenmcnaughton/search
colemanw Sep 23, 2020
24c1b3d
[NFC] Minor cleanup - use strict comparison where possible
eileenmcnaughton Sep 23, 2020
87ebf68
dev/core#2044 Make contact_id optional on v4 api for Address, phone, …
eileenmcnaughton Sep 23, 2020
e3872d5
dev/core#1921 Remove handling fo Civi4.2 from paypalProIPN
eileenmcnaughton Sep 23, 2020
aca8079
Merge pull request #18575 from eileenmcnaughton/api42
eileenmcnaughton Sep 24, 2020
41c9d14
dev/core#2043 Remove pass by reference
eileenmcnaughton Sep 24, 2020
e23c62b
Add select2-bootstrap to greenwich theme
colemanw Sep 24, 2020
55d30ed
Merge pull request #18576 from eileenmcnaughton/iso
eileenmcnaughton Sep 24, 2020
8293f7c
dev/core#2057 Remove select query that never or almost never finds so…
eileenmcnaughton Sep 23, 2020
94c3c35
Unit test for https://github.com/civicrm/civicrm-core/pull/18568
eileenmcnaughton Sep 24, 2020
531b6c9
Simplify CRM_Core_BAO_Location::createLocBlock by moving eventLocatio…
eileenmcnaughton Sep 24, 2020
1769f58
Merge pull request #18580 from eileenmcnaughton/matt
seamuslee001 Sep 24, 2020
182d98f
Merge pull request #18568 from mattwire/membershipdeprecated
seamuslee001 Sep 24, 2020
2aba31d
ext/greenwich - Coerce `select2-bootstrap.css` to be handled as SCSS …
colemanw Sep 24, 2020
0cc2ab3
Merge pull request #18573 from eileenmcnaughton/nnfc
colemanw Sep 24, 2020
642ec55
composer.json - Update compile plugin
totten Sep 24, 2020
9c91d0f
composer.lock - Update compile plugin
totten Sep 24, 2020
62b166a
ext/greenwich - Improve portability. Consolidate tasks.
totten Sep 24, 2020
7ce7b1c
APIv4 Search: Improve GROUP_CONCAT with :label prefix
colemanw Sep 23, 2020
f99d41d
Search ext: Expose DISTINCT modifier
colemanw Sep 24, 2020
01e1cde
Merge pull request #18579 from colemanw/select2-bootstrap
colemanw Sep 24, 2020
ef27180
Merge pull request #18566 from eileenmcnaughton/act_contact
colemanw Sep 24, 2020
9a738fe
Merge pull request #18578 from eileenmcnaughton/api42
colemanw Sep 24, 2020
1c9e3b2
Merge pull request #18562 from eileenmcnaughton/locit
colemanw Sep 24, 2020
f8471e7
test for target contacts on Bulk Email for mailing in batches
demeritcowboy Sep 24, 2020
5e04a2d
Afform: code cleanup & remove unused menu item
colemanw Sep 24, 2020
864c6d0
Merge pull request #18512 from eileenmcnaughton/export_classes
colemanw Sep 24, 2020
0a4ea9f
Merge pull request #18538 from eileenmcnaughton/name
colemanw Sep 24, 2020
0d3f108
Merge pull request #18569 from eileenmcnaughton/synt
colemanw Sep 24, 2020
4905dac
Afform: add bootstrap3 bundle
colemanw Sep 24, 2020
0c2e6ab
Merge pull request #18572 from colemanw/concat
eileenmcnaughton Sep 24, 2020
828fc2c
CIVICRM-1567 Update the post-upgrade thank you message to include URL…
agileware-justin Sep 24, 2020
8ea41c7
Merge pull request #18584 from demeritcowboy/schedmail-targets
eileenmcnaughton Sep 24, 2020
95c42d8
Merge pull request #18397 from swastikpareek/issue-1987-fix-isFrontPa…
seamuslee001 Sep 24, 2020
7122f1d
Merge pull request #18583 from colemanw/afformGui
eileenmcnaughton Sep 24, 2020
7c98e76
dev/core#2029 More debug attempts
eileenmcnaughton Sep 24, 2020
64c8be5
Merge pull request #18510 from eileenmcnaughton/preprocess
colemanw Sep 25, 2020
717c290
dev/core#2046 Fix Phone:add to be a pseudonym for Phone.create
eileenmcnaughton Sep 24, 2020
c641ac4
[REF] Remove unused taskName variable
eileenmcnaughton Sep 25, 2020
97ff3c5
Merge pull request #18588 from eileenmcnaughton/phone
eileenmcnaughton Sep 25, 2020
aa06ad4
[REF] Fix Event location to create it's locations directly rather tha…
eileenmcnaughton Sep 24, 2020
2bd8b02
Fix 'sleeper-bug' in api.
eileenmcnaughton Sep 23, 2020
2b81060
Fix MailingJob::writeToDB to handle it's own activityTarget wrangling
eileenmcnaughton Sep 25, 2020
ed3bf90
Remove double exception handling in repeattransaction
mattwire Sep 25, 2020
19dbb9a
pass in "required" value when building preferred_language form element
adixon Sep 25, 2020
bccf917
Merge pull request #18595 from adixon/preferred-language-1883
eileenmcnaughton Sep 25, 2020
73b7c26
Merge pull request #18587 from eileenmcnaughton/prevnext
eileenmcnaughton Sep 25, 2020
2d09a0c
[REF] Consolidate retrieval of searchFormValues
eileenmcnaughton Sep 25, 2020
c73d08e
Don't throw a warning when public ext directory isn't found
MegaphoneJon Sep 25, 2020
56261ae
Merge pull request #18594 from mattwire/repeattransactiondoubleexception
eileenmcnaughton Sep 25, 2020
978e5e1
[REF] Include recently added core extensions into distmaker
seamuslee001 Sep 25, 2020
1b97d72
Merge pull request #18571 from eileenmcnaughton/aipn
colemanw Sep 25, 2020
3bec485
Fix bug inn primary handling where TRUE rather than 1 used
eileenmcnaughton Sep 25, 2020
563a5e4
Merge pull request #18597 from seamuslee001/core_exts_distmaker
eileenmcnaughton Sep 25, 2020
3b61281
Merge pull request #18591 from eileenmcnaughton/search
colemanw Sep 25, 2020
55bc843
[REF] IPN - move unshared chunk of code out of shared function
eileenmcnaughton Sep 25, 2020
8b1f38d
Merge pull request #18567 from eileenmcnaughton/apiv3activity
seamuslee001 Sep 25, 2020
0cc7956
Merge pull request #18447 from mlutfy/inheritLocaleRegression
eileenmcnaughton Sep 26, 2020
21c915a
Test cleanup fix
eileenmcnaughton Sep 26, 2020
0829131
Remove unused variable
eileenmcnaughton Sep 23, 2020
3d619e4
Minor code cleanup
eileenmcnaughton Sep 23, 2020
e0dcd05
dev/core#1393 - distmaker - Skip new file "vendor/bin/pscss"
totten Sep 26, 2020
8236176
Merge pull request #18601 from eileenmcnaughton/apiv3activity
eileenmcnaughton Sep 26, 2020
d9c113b
Merge pull request #18598 from eileenmcnaughton/prim
colemanw Sep 26, 2020
5a2231b
dev/core#2035 Invoice template - show Amount paid even when it is ful…
eileenmcnaughton Sep 26, 2020
b1ef004
Merge pull request #18586 from eileenmcnaughton/blok
colemanw Sep 26, 2020
9f8f650
dev/core#2046 Ensure location BAOs have create actions, deprecate add…
eileenmcnaughton Sep 26, 2020
f2ec3ed
Merge pull request #18605 from totten/master-pscss
eileenmcnaughton Sep 26, 2020
2291172
dev/core#2046 Rationalise add vs create on website BAO
eileenmcnaughton Sep 26, 2020
c3317f5
Add modified_date to list of activity tokens
mattwire Sep 26, 2020
ed2ee15
Add an 'Execute Now' button to the job log
mattwire Jan 17, 2020
483577b
Merge pull request #18604 from eileenmcnaughton/act_cont
mattwire Sep 26, 2020
1acaddb
dev/core#2057 Reduce queries when calling activity.create
eileenmcnaughton Sep 26, 2020
172dfeb
[REF] Follow up cleanup from Event Location
eileenmcnaughton Sep 26, 2020
d810096
Merge pull request #18593 from mattwire/joblog
seamuslee001 Sep 26, 2020
f52b324
[Ref] Extract getOrderParams
eileenmcnaughton Sep 27, 2020
97dda7c
Fix regression or back-office membership renewal by credit card
eileenmcnaughton Sep 27, 2020
36fa194
Merge pull request #18609 from eileenmcnaughton/act2
seamuslee001 Sep 27, 2020
28743d2
test activity contact variations
demeritcowboy Sep 27, 2020
2d227fa
Enotice fix
eileenmcnaughton Sep 27, 2020
094ff61
dev/membership#27 Update outdated membership statuses in preProcess r…
eileenmcnaughton Sep 28, 2020
95a8a35
Merge pull request #18615 from eileenmcnaughton/530
seamuslee001 Sep 28, 2020
e6a7e39
Merge pull request #18622 from civicrm/5.30
eileenmcnaughton Sep 28, 2020
618ed32
Merge pull request #18620 from eileenmcnaughton/notice
eileenmcnaughton Sep 28, 2020
2e863cd
Merge pull request #18617 from eileenmcnaughton/ord
mattwire Sep 28, 2020
68dea53
[REF] Remove some unused params, move one to where it is used
eileenmcnaughton Sep 27, 2020
a48bf29
Merge pull request #18614 from eileenmcnaughton/mem
mattwire Sep 28, 2020
194defa
Merge pull request #18536 from eileenmcnaughton/main
mattwire Sep 28, 2020
2596eeb
Merge pull request #18600 from eileenmcnaughton/aipn
mattwire Sep 28, 2020
c3a77e8
Merge pull request #18590 from eileenmcnaughton/taskname
mattwire Sep 28, 2020
8c1ed7f
Simplify call to loadRelationObjects in repeat/completetransaction
mattwire Sep 26, 2020
5653540
Merge pull request #18559 from agileware/CIVICRM-1567
seamuslee001 Sep 28, 2020
249b6cd
missing id
demeritcowboy Sep 28, 2020
7d198b2
dev/core#2061 PCP: call the hook_civicrm_links hook for PCP page user…
mlutfy Sep 23, 2020
1a39ead
Merge pull request #18602 from eileenmcnaughton/msg
seamuslee001 Sep 28, 2020
5e9334e
dev/core#2035 Add in upgrade step to fix the template copy on current…
seamuslee001 Sep 28, 2020
c261b6a
Merge pull request #18613 from mattwire/moveloadrelatedobjects
eileenmcnaughton Sep 28, 2020
9b344b9
[REF] Parse ids before sending to single function (minor simplification)
eileenmcnaughton Sep 28, 2020
33c5cac
Merge pull request #18628 from seamuslee001/dev_core_2035
seamuslee001 Sep 28, 2020
ee39845
Merge pull request #18627 from civicrm/5.30
eileenmcnaughton Sep 28, 2020
4fc8726
Merge pull request #18626 from demeritcowboy/why-no-id
eileenmcnaughton Sep 28, 2020
480fe2e
Merge pull request #18570 from mlutfy/pcpLinksHook
eileenmcnaughton Sep 28, 2020
8b866dd
Merge pull request #18619 from demeritcowboy/contact-test
seamuslee001 Sep 29, 2020
3b16266
Merge pull request #18630 from eileenmcnaughton/pps
seamuslee001 Sep 29, 2020
708fb7a
dev/core#2073 just tweak a memory leak
eileenmcnaughton Sep 29, 2020
d4d6659
dev/core#2073 Memory leak fix
eileenmcnaughton Sep 29, 2020
b596211
Merge pull request #18633 from eileenmcnaughton/leak2
seamuslee001 Sep 29, 2020
50bdbb5
dev/core#1838 Ensure that no fatal error is triggered if you try to a…
seamuslee001 Sep 22, 2020
6f4ad20
Merge pull request #18544 from magnolia61/participant_status_notifica…
eileenmcnaughton Sep 29, 2020
ee028d9
Merge pull request #18564 from seamuslee001/dev_core_1838
eileenmcnaughton Sep 29, 2020
9843970
Merge pull request #18596 from MegaphoneJon/core-2063
eileenmcnaughton Sep 29, 2020
939f157
test activity contacts as scalars
demeritcowboy Sep 29, 2020
114a069
handle missing details
demeritcowboy Sep 29, 2020
757f442
[Civi\Test] Fix test output noise
eileenmcnaughton Sep 30, 2020
853a0e3
Merge pull request #18637 from demeritcowboy/no-details
eileenmcnaughton Sep 30, 2020
af846d5
Merge pull request #18638 from eileenmcnaughton/test_perf
seamuslee001 Sep 30, 2020
3e8437f
dev/core#2073 Fix a real live leak
eileenmcnaughton Sep 30, 2020
260e7da
Merge pull request #18641 from eileenmcnaughton/will-the-real-slim-le…
seamuslee001 Sep 30, 2020
35fd9d2
[REF] Add in frontend fields for title and description of group Schem…
seamuslee001 Sep 25, 2020
50a7682
Merge pull request #18599 from seamuslee001/frontend_group_fields
seamuslee001 Sep 30, 2020
799f314
dev/core#334 Use the current in use collation and character sets when…
seamuslee001 Sep 30, 2020
a8a6881
Merge pull request #18632 from eileenmcnaughton/leak
seamuslee001 Sep 30, 2020
6f776cf
Merge pull request #18621 from eileenmcnaughton/prefix
seamuslee001 Sep 30, 2020
096110f
dev/core#2003 Use Brick/Money to ensure that we display all possible …
seamuslee001 Sep 9, 2020
4fed6a9
composer.json - Switch to composer-compile-lib. Add more helpers.
totten Sep 30, 2020
ee523fb
Merge pull request #18642 from seamuslee001/dev_core_339_custom_field
seamuslee001 Sep 30, 2020
8c2c0a2
Merge pull request #18607 from eileenmcnaughton/website
seamuslee001 Sep 30, 2020
5cbbd19
[REF] Add in css classes to make the save and preview button on the C…
seamuslee001 Sep 30, 2020
2ffb24e
Greenwich - Switch to composer-compile-lib
totten Sep 30, 2020
34801bd
fix missing mail setting help
demeritcowboy Sep 30, 2020
a8a2f26
dev/core#2073 Improve cleanup on syntaxconformance test
eileenmcnaughton Sep 30, 2020
89b4fe4
Merge pull request #18646 from totten/master-complib
seamuslee001 Oct 1, 2020
8f3d97b
Merge pull request #18416 from seamuslee001/dev_core_2003
eileenmcnaughton Oct 1, 2020
29ff32e
Merge pull request #18640 from eileenmcnaughton/syn
seamuslee001 Oct 1, 2020
69fb41d
Fix cache bypass
eileenmcnaughton Sep 30, 2020
d4761b7
Fix insufficiently distinct cache key
eileenmcnaughton Oct 1, 2020
7b7bbd7
Fix patently silly code
eileenmcnaughton Oct 1, 2020
cb47d05
[REF] Fix some more calls to getTokens to make it clear only the firs…
eileenmcnaughton Oct 1, 2020
66cbbfb
dev/core#2057 Remove extraneous activity contact queries on activity …
eileenmcnaughton Sep 28, 2020
87bc275
Merge pull request #18652 from eileenmcnaughton/silly
seamuslee001 Oct 1, 2020
58c72a1
Merge pull request #18655 from eileenmcnaughton/token2
eileenmcnaughton Oct 1, 2020
7585cf5
dev/core#1818 Upgrade AngularJS from 1.5.11 to 1.8
colemanw Sep 29, 2020
df00c64
Remove problematic tests
colemanw Sep 29, 2020
676a6ff
[REF] Remove reference to second param returned from CRM_Contact_BAO_…
eileenmcnaughton Oct 1, 2020
4d38572
dev/core#2079 do not return never-used, query-wasting variable
eileenmcnaughton Oct 1, 2020
4463f2f
Merge pull request #18608 from eileenmcnaughton/block
seamuslee001 Oct 1, 2020
e9c52a5
Merge pull request #18606 from eileenmcnaughton/create
seamuslee001 Oct 1, 2020
6e1ae77
Merge pull request #18656 from eileenmcnaughton/apiq
eileenmcnaughton Oct 1, 2020
e2c512f
Merge pull request #18643 from eileenmcnaughton/cache
seamuslee001 Oct 2, 2020
186f87a
Merge pull request #18625 from eileenmcnaughton/activi
seamuslee001 Oct 2, 2020
9c9e740
dev/core#1393 - distmaker - Skip new file "vendor/bin/cssmin"
totten Oct 2, 2020
5e559a2
dev/core#2046 Fix blockDelete to delete while ensuring is_primary is …
eileenmcnaughton Oct 2, 2020
ae7397a
dev/core#2046 Migrate BAO_Address::create towards standardisation
eileenmcnaughton Oct 1, 2020
b6b224f
Merge pull request #18659 from totten/master-cssmin
seamuslee001 Oct 2, 2020
729e12b
Merge pull request #18636 from demeritcowboy/test-scalar-target
seamuslee001 Oct 2, 2020
63bb878
Merge pull request #18635 from colemanw/angular-1.8
seamuslee001 Oct 2, 2020
924d1dc
(REF) Convert hidden function 'useRegion' to public 'fillDefaults'
totten Oct 2, 2020
8eb00bd
(DX) Resources - Add helper for creating new bundles
totten Oct 2, 2020
b7edabe
dev/core#1790 - Contact Card - Email Links
eileenmcnaughton Sep 28, 2020
96622c8
(NFC) Update docblock in CRM_Core_Resources_Common
totten Oct 2, 2020
484d8c1
Search ext: Ability to load saved searches by id
colemanw Sep 28, 2020
2175ca5
Search ext: fix missing titles in multivalue custom entities
colemanw Sep 29, 2020
73d7dbc
Search ext: Choose smart group contact column
colemanw Sep 29, 2020
02bd631
Merge pull request #18660 from totten/master-bundle-ext
eileenmcnaughton Oct 2, 2020
f8246b8
Merge pull request #18648 from demeritcowboy/missing-mail-help
eileenmcnaughton Oct 2, 2020
08642a5
Merge pull request #18666 from civicrm/5.30
eileenmcnaughton Oct 2, 2020
23e5652
Search ext: Extend api4 smart groups to work with HAVING
colemanw Sep 30, 2020
4f3a95d
Search ext: Fix column appearing in the aggregate list when it is use…
colemanw Oct 3, 2020
64c57b7
dev/core#2079 [REF] clean up call to apiQuery
eileenmcnaughton Oct 2, 2020
146058d
handle missing array member
demeritcowboy Oct 3, 2020
4367e96
Attributes for a form element should always be an array
agh1 Jun 20, 2020
9ca6980
Cleanup with ??
agh1 Jun 20, 2020
a2eb615
Select placeholders should always say what kind of thing they select
agh1 Sep 14, 2020
5ad66c4
StateProvince DAO title should be State/Province
agh1 Sep 14, 2020
359389e
Merge pull request #18669 from demeritcowboy/blank-target-contact
eileenmcnaughton Oct 3, 2020
aba124d
composer.json - Update composer-compile-lib
totten Oct 4, 2020
1696748
composer.lock - Update composer-compile-lib and composer-compile-plugin
totten Oct 4, 2020
fc927e0
Merge pull request #18647 from seamuslee001/widget_button_classes
colemanw Oct 4, 2020
79868cc
Updates for Angular 1.8 - fix premature access to component properties
colemanw Oct 3, 2020
f8a2dd3
Merge pull request #18670 from totten/master-compup
seamuslee001 Oct 4, 2020
0a6868c
Merge pull request #18644 from colemanw/savedSearch
seamuslee001 Oct 4, 2020
eafad19
[REF] Ensure that the crm-error class on the field is also remove whe…
seamuslee001 Oct 1, 2020
10e5997
avoid crash from recursion on exceptions
demeritcowboy Sep 26, 2020
4c85c7b
fix labels on new admin permissions
MegaphoneJon Oct 4, 2020
2900b9c
Merge pull request #17675 from agh1/aria-form-fixes
colemanw Oct 4, 2020
7aa584c
Merge pull request #18671 from MegaphoneJon/fix-perm-labels
yashodha Oct 5, 2020
88f473e
Search ext: rename to Search Kit, mark as beta
colemanw Oct 5, 2020
19c712d
Merge pull request #18649 from seamuslee001/error_class_remove
eileenmcnaughton Oct 5, 2020
f5a7693
gitattributes - When exporting for composer-style tarball, exclude gi…
totten Oct 5, 2020
ee76b0d
Merge pull request #18610 from demeritcowboy/error-recursion-recursion
seamuslee001 Oct 5, 2020
f9474ee
Merge pull request #18611 from mattwire/activitytokensmodifieddate
seamuslee001 Oct 5, 2020
8dda910
Merge pull request #18143 from mattwire/membertabbuttons
seamuslee001 Oct 5, 2020
2fe04f0
[REF] Fix adding in the accessKey based on the button array
seamuslee001 Oct 5, 2020
2f43fd4
dev/core#2087 move uf_match check above the primary check
eileenmcnaughton Oct 2, 2020
b3b1161
Merge pull request #18674 from seamuslee001/form_buttons_key
eileenmcnaughton Oct 6, 2020
1ec8741
Merge pull request #18675 from eileenmcnaughton/uf2
seamuslee001 Oct 6, 2020
e9411af
dev/core#2079 [REF] clean up call to apiQuery
eileenmcnaughton Oct 2, 2020
e066cc5
Merge pull request #18673 from totten/master-gitignore
seamuslee001 Oct 6, 2020
e2c6377
[REF] Remove XML_Util dependancy within ewaysingle extension
seamuslee001 Oct 6, 2020
7fa530b
Merge pull request #18676 from seamuslee001/ref_remove_xml_util
eileenmcnaughton Oct 6, 2020
362a820
Add supporting test
eileenmcnaughton Oct 5, 2020
14abd3e
Remove caching that messes with tests without any time saving
eileenmcnaughton Oct 6, 2020
a000168
Merge pull request #18657 from eileenmcnaughton/token_2
seamuslee001 Oct 6, 2020
6545bbe
Merge pull request #18665 from eileenmcnaughton/list2
seamuslee001 Oct 6, 2020
f5e61d5
change civicrm_price_set.min_amount to float
pradpnayak Oct 6, 2020
190240f
ltrim typos
demeritcowboy Oct 6, 2020
81e4b16
Merge pull request #18678 from demeritcowboy/class-typos
seamuslee001 Oct 6, 2020
518417f
[REF] Fix compatability with Drupal 9 installing of var_dumper
seamuslee001 Oct 6, 2020
36f50a4
Merge pull request #18677 from pradpnayak/float
eileenmcnaughton Oct 6, 2020
e7ac827
Merge pull request #18664 from eileenmcnaughton/list
seamuslee001 Oct 6, 2020
527f1b8
Merge pull request #18661 from eileenmcnaughton/blockdel
seamuslee001 Oct 6, 2020
2d42dc4
Merge pull request #18658 from eileenmcnaughton/address
seamuslee001 Oct 6, 2020
c235cc1
Merge pull request #18679 from seamuslee001/vardump_d9_compatability
seamuslee001 Oct 6, 2020
4f31fe0
dev/core#2039 Call del directly - rather than now-deprecated blockDelete
eileenmcnaughton Oct 7, 2020
9cf61bb
Merge pull request #18672 from colemanw/searchKit
eileenmcnaughton Oct 7, 2020
5f019b8
Merge pull request #18684 from eileenmcnaughton/block
seamuslee001 Oct 7, 2020
d916423
[REF] Fix error when creating new AB test mailing because domain_id i…
seamuslee001 Oct 7, 2020
9ae4694
Merge pull request #18623 from eileenmcnaughton/rene
seamuslee001 Oct 7, 2020
0597387
[NFC] Update Checksum on CustomField DAO
seamuslee001 Oct 7, 2020
b3bf163
Merge pull request #18685 from seamuslee001/ab_test_fix
seamuslee001 Oct 7, 2020
afc4245
Merge pull request #18689 from seamuslee001/nfc_dao_update
eileenmcnaughton Oct 7, 2020
600ad35
Merge in 5.30
seamuslee001 Oct 7, 2020
829489b
Merge pull request #18694 from seamuslee001/master
seamuslee001 Oct 7, 2020
993a642
CATL-1614: Add new field to the mail account form - Do not create new…
i-grou Aug 17, 2020
f945f0c
CATL-1613: Add new field to the mail account form - Skip emails which…
i-grou Aug 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[REF] Remove wrangling on activityType param
There is only 1 remaining place that calls this function & does not specifiy activityType. This fixes
that place to pass in activityType and stops attempting to calculate activityType
based on in-function guess work
eileenmcnaughton committed Sep 22, 2020
commit 7d2c39725d5633dc3c08d79571e05cb1814ec4a2
6 changes: 1 addition & 5 deletions CRM/Activity/BAO/Activity.php
Original file line number Diff line number Diff line change
@@ -1694,14 +1694,11 @@ public static function getContactActivity($contactId) {
*/
public static function addActivity(
$activity,
$activityType = 'Membership Signup',
$activityType,
$targetContactID = NULL,
$params = []
) {
$date = date('YmdHis');
if ($activity->__table === 'civicrm_participant' && $activityType !== 'Email') {
$activityType = 'Event Registration';
}
if ($activity->__table == 'civicrm_contribution') {
// create activity record only for Completed Contributions
$contributionCompletedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
@@ -1712,7 +1709,6 @@ public static function addActivity(
}
$params['status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', 'Scheduled');
}
$activityType = 'Contribution';

// retrieve existing activity based on source_record_id and activity_type
if (empty($params['id'])) {
2 changes: 1 addition & 1 deletion CRM/Contribute/BAO/Contribution.php
Original file line number Diff line number Diff line change
@@ -4493,7 +4493,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
$targetContactID = $contribution->contact_id;
$contribution->contact_id = $contributionContactID;
}
CRM_Activity_BAO_Activity::addActivity($contribution, NULL, $targetContactID);
CRM_Activity_BAO_Activity::addActivity($contribution, 'Contribution', $targetContactID);
}

if (self::isEmailReceipt($input, $contribution->contribution_page_id, $recurringContributionID)) {