Eileen McNaughton [Sat, 23 Mar 2019 20:43:35 +0000 (09:43 +1300)]
Merge pull request #12639 from aniesshsethh/issue_314
dev/core#314 Event self-service Transfer picks up the deleted contact ID basically transferring to the wrong contact
Eileen McNaughton [Fri, 22 Mar 2019 12:37:21 +0000 (01:37 +1300)]
Merge pull request #13882 from civicrm/5.12
5.12 to master
Eileen McNaughton [Fri, 22 Mar 2019 12:37:00 +0000 (01:37 +1300)]
Merge pull request #13881 from jitendrapurohit/core-812-rc
dev/core#812 - Fix null display of contribution row on …
colemanw [Fri, 22 Mar 2019 11:08:12 +0000 (07:08 -0400)]
Merge pull request #13798 from eileenmcnaughton/contribution_validate
Improve ContributionPage.validate api
Jitendra Purohit [Fri, 22 Mar 2019 09:54:47 +0000 (15:24 +0530)]
dev/core#812 - RC equivalent for null display of contribution row on contact summary page
Eileen McNaughton [Fri, 22 Mar 2019 09:29:30 +0000 (22:29 +1300)]
Merge pull request #13872 from seamuslee001/composer_2_0_compatability
Fix up composer for composer 2.0 compatibility
Eileen McNaughton [Fri, 22 Mar 2019 09:29:01 +0000 (22:29 +1300)]
Merge pull request #13880 from eileenmcnaughton/temp_repeat
Use TempTable methods.
Seamus Lee [Fri, 22 Mar 2019 08:12:01 +0000 (19:12 +1100)]
Merge pull request #13878 from eileenmcnaughton/test_fix
[nfc] Reset entire session object between tests
Eileen McNaughton [Fri, 22 Mar 2019 02:35:22 +0000 (15:35 +1300)]
Merge pull request #13877 from eileenmcnaughton/import_count
Fix php 7.2 count notice
mark burdett [Thu, 14 Mar 2019 23:42:46 +0000 (16:42 -0700)]
Use TempTable methods.
Eileen McNaughton [Fri, 22 Mar 2019 00:21:25 +0000 (13:21 +1300)]
Merge pull request #13879 from civicrm/5.12
5.12 to master
Eileen McNaughton [Fri, 22 Mar 2019 00:18:26 +0000 (13:18 +1300)]
Merge pull request #13541 from compucorp/case-activity-assigmt-restriction
dev/core#641: Case Activity Assignment Restriction
Eileen McNaughton [Fri, 22 Mar 2019 00:18:11 +0000 (13:18 +1300)]
Merge pull request #13876 from colemanw/menuRestore
dev/core#814 Fix menu restore link
eileen [Fri, 22 Mar 2019 00:04:40 +0000 (13:04 +1300)]
Reset entire session object between tests>
#13553 has been struggling with bugs that seem to be leakage of the session object between
tests - this seems like a good place to flush it
eileen [Thu, 21 Mar 2019 23:54:20 +0000 (12:54 +1300)]
Fix php 7.2 count notice
Coleman Watts [Thu, 21 Mar 2019 16:32:56 +0000 (12:32 -0400)]
Fix menu restore link
Eileen McNaughton [Thu, 21 Mar 2019 23:00:18 +0000 (12:00 +1300)]
Merge pull request #13697 from greenpeace-cee/fix-event-search
CRM/Event - Fix participant note search parameter being ignored
Eileen McNaughton [Thu, 21 Mar 2019 19:08:20 +0000 (08:08 +1300)]
Merge pull request #13865 from eileenmcnaughton/dedupe_temp
Use tempTable class in creation of dedupe table.
Eileen McNaughton [Thu, 21 Mar 2019 18:58:25 +0000 (07:58 +1300)]
Merge pull request #13875 from colemanw/BAO_Participant
BAO_Participant - Use default status if not specified for create
colemanw [Thu, 21 Mar 2019 16:53:22 +0000 (12:53 -0400)]
Merge pull request #13874 from eileenmcnaughton/cleanup
Remove now-obsolete additionalFromClause parameter from prepareOrderBy
Coleman Watts [Thu, 21 Mar 2019 15:32:02 +0000 (11:32 -0400)]
BAO_Participant - Use default status if not specified for create
eileen [Thu, 21 Mar 2019 02:09:27 +0000 (15:09 +1300)]
Remove now-obsolete additionalFromClause parameter from prepareOrderBy
Eileen McNaughton [Thu, 21 Mar 2019 02:06:19 +0000 (15:06 +1300)]
Merge pull request #13772 from mattwire/alphabetquery_groupby
dev/core#748 Switch alphabetQuery to use new getSearchSQLParts() function
Seamus Lee [Thu, 21 Mar 2019 01:22:01 +0000 (12:22 +1100)]
Fix up composer for composer2.0 compatability
Eileen McNaughton [Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)]
Merge pull request #13234 from mattwire/checkduplicates_hook
Add hook findDuplicates
colemanw [Wed, 20 Mar 2019 23:18:43 +0000 (19:18 -0400)]
Merge pull request #13862 from eileenmcnaughton/ContactType
Reformat test files for array format
Matthew Wire (MJW Consulting) [Tue, 5 Mar 2019 23:54:43 +0000 (23:54 +0000)]
Switch alphabetQuery to use new getSearchSQLParts() function
Eileen McNaughton [Wed, 20 Mar 2019 21:44:34 +0000 (10:44 +1300)]
Merge pull request #13870 from seamuslee001/re_add_require_once
Try Reverting commit removing require once to see if it fixes the pro…
Seamus Lee [Wed, 20 Mar 2019 21:06:29 +0000 (08:06 +1100)]
Try Reverting commit removing require once to see if it fixes the problem for api4
Eileen McNaughton [Wed, 20 Mar 2019 19:45:40 +0000 (08:45 +1300)]
Merge pull request #13869 from mattwire/paymentprocessorid
Add ID / Test ID for payment processors to list - makes setup of IPNs much easier!
colemanw [Wed, 20 Mar 2019 19:19:10 +0000 (15:19 -0400)]
Merge pull request #13861 from eileenmcnaughton/die_die
As discussed, delete webtests
Matthew Wire (MJW Consulting) [Wed, 20 Mar 2019 12:54:52 +0000 (12:54 +0000)]
Add ID / Test ID for payment processors to list - makes setup of IPNs much easier!
Seamus Lee [Wed, 20 Mar 2019 08:26:17 +0000 (19:26 +1100)]
Merge pull request #13866 from eileenmcnaughton/perm_dedup
Update test to reflect recently merged PR lower permission to access dedupecheck
eileen [Wed, 20 Mar 2019 05:45:32 +0000 (18:45 +1300)]
Update test to reflect recently merged PR lower permission to access dedupecheck
eileen [Wed, 20 Mar 2019 03:43:08 +0000 (16:43 +1300)]
Use tempTable class in creation of dedupe table.
The is covered by unit tests ContactTest::testDuplicateTest and DedupeFinderTest::testUnsupervisedDupes
There are some others in this file but I focussed on keeping the scope to a single table replacement.
A couple of thoughts
1) I passed the indexes in as 'columns' - works, is tested so we'd know if anything broke it but it feels a bit ug
2) I think it makes sense to add a descontruct on the class to drop the temp tables
3) the longer syntax for referring to the table is a bit wordy - but harmless I guess & reformatting would
help
Eileen McNaughton [Wed, 20 Mar 2019 02:02:37 +0000 (15:02 +1300)]
Merge pull request #13398 from pradpnayak/DedupeBreak
dev/core/issues/570, Check Dedupe fails for limited permission user
Eileen McNaughton [Wed, 20 Mar 2019 01:50:54 +0000 (14:50 +1300)]
Merge pull request #13748 from eileenmcnaughton/search_sort
Fix bug whereby sorting by state province gives an error in search builder
eileen [Wed, 20 Mar 2019 00:47:03 +0000 (13:47 +1300)]
Reformat test files for array format
eileen [Wed, 20 Mar 2019 00:40:44 +0000 (13:40 +1300)]
As discussed, delete webtests
They were extremely hard to maintain when we were maintaining them, now they have been unmaitained so
long that they would take more work to get functional than starting from scratch.
They make grepping harder
Eileen McNaughton [Tue, 19 Mar 2019 23:20:42 +0000 (12:20 +1300)]
Merge pull request #13859 from colemanw/dev/core#811
dev/core#811 - Autocomplete only enabled options
eileen [Sat, 2 Mar 2019 06:41:32 +0000 (19:41 +1300)]
Fix bug whereby sorting by state province gives an error in search builder
Eileen McNaughton [Tue, 19 Mar 2019 20:14:09 +0000 (09:14 +1300)]
Merge pull request #13856 from eileenmcnaughton/test
Test fix
Eileen McNaughton [Tue, 19 Mar 2019 20:11:58 +0000 (09:11 +1300)]
Merge pull request #13860 from alifrumin/patch-2
Fixing formatting of contributors section
Alice Frumin [Tue, 19 Mar 2019 18:51:34 +0000 (14:51 -0400)]
Fixing formatting of contributors section
colemanw [Tue, 19 Mar 2019 18:17:09 +0000 (14:17 -0400)]
Merge pull request #13858 from mlutfy/dev795
dev/core#795 Fix PHP warning when updating a multiselect country field.
Coleman Watts [Tue, 19 Mar 2019 17:18:52 +0000 (13:18 -0400)]
dev/core#811 - Autocomplete only enabled options
Coleman Watts [Tue, 19 Mar 2019 16:50:23 +0000 (12:50 -0400)]
Add fieldset and help for activity assignee setting
Mathieu Lutfy [Tue, 19 Mar 2019 12:45:35 +0000 (08:45 -0400)]
dev/core#795 Fix PHP warning when updating a multiselect country field.
Eileen McNaughton [Tue, 19 Mar 2019 09:47:55 +0000 (22:47 +1300)]
Merge pull request #13843 from eileenmcnaughton/trait_online
Add FrontEndPaymentFormTrait to start to share functionality between Event and Contribution forms
eileen [Tue, 19 Mar 2019 03:55:52 +0000 (16:55 +1300)]
Reset REQUEST, GET & POST in main tearDown
I've been noticing tests failing on lines which indicate they were getting variables from these - e.g
CRM_Member_Form_MembershipTest::testSubmitUpdateMembershipFromPartiallyPaid
CiviCRM_API3_Exception: Expected one Contact but found 0
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/api/api.php:45
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/CRM/Contribute/Form/AbstractEditPayment.php:757
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/CRM/Contribute/Form/AbstractEditPayment.php:256
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/CRM/Member/Form.php:153
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/CRM/Member/Form/Membership.php:224
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/tests/phpunit/CRM/Member/Form/MembershipTest.php:832
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/tests/phpunit/CRM/Member/Form/MembershipTest.php:895
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:196
/home/jenkins/bknix-dfl/civicrm-buildkit/extern/phpunit5/phpunit5.phar:598
colemanw [Mon, 18 Mar 2019 23:43:10 +0000 (19:43 -0400)]
Merge pull request #13846 from eileenmcnaughton/reformat
[NFC] code formatting only
colemanw [Mon, 18 Mar 2019 23:41:44 +0000 (19:41 -0400)]
Merge pull request #13849 from eileenmcnaughton/reformat_2
[NFC] Code reformatting
colemanw [Mon, 18 Mar 2019 23:40:39 +0000 (19:40 -0400)]
Merge pull request #13768 from eileenmcnaughton/activity_yay
Activity tab performance fix - switch to faster getActivities & getActivitiesCount
Eileen McNaughton [Mon, 18 Mar 2019 22:35:15 +0000 (11:35 +1300)]
Merge pull request #13259 from agh1/disabled-expired-mem
Disabling or deleting Expired status breaks membership status update
Andrew Hunt [Mon, 18 Mar 2019 21:21:06 +0000 (17:21 -0400)]
CiviMember: test renaming `expired` doesn't trip up status update
Eileen McNaughton [Mon, 18 Mar 2019 19:59:20 +0000 (08:59 +1300)]
Merge pull request #13545 from pradpnayak/ContactSubType
"Contact Sub Type" dropdown disappears when fields validation occurs
Tunbola Ogunwande [Thu, 7 Feb 2019 14:34:16 +0000 (15:34 +0100)]
dev/core#641: Implementing Case Activity Assignment Restriction functionality
Andrew Hunt [Mon, 18 Mar 2019 16:03:38 +0000 (12:03 -0400)]
CiviMember: excluding Expired memberships by name, not label
Pradeep Nayak [Tue, 5 Feb 2019 20:49:28 +0000 (20:49 +0000)]
Display contact sub type always
Eileen McNaughton [Mon, 18 Mar 2019 06:14:53 +0000 (19:14 +1300)]
Merge pull request #13851 from eileenmcnaughton/opt
Code cleanup on membership block loop
Eileen McNaughton [Mon, 18 Mar 2019 04:59:28 +0000 (17:59 +1300)]
Merge pull request #13795 from kewljuice/issue_788
refs issue 788 fix Warning: A non-numeric value encountered in ...
Matthew Wire (MJW Consulting) [Mon, 18 Mar 2019 04:44:21 +0000 (17:44 +1300)]
Code cleanup on membership block loop
Eileen McNaughton [Mon, 18 Mar 2019 02:46:43 +0000 (15:46 +1300)]
Merge pull request #13742 from jitendrapurohit/core-771
dev/core#771 - Smart group with uf_group_id does not load contacts wi…
Eileen McNaughton [Mon, 18 Mar 2019 01:40:50 +0000 (14:40 +1300)]
Merge pull request #13508 from spalmstr/core-688
Core-688 - Contacts - New Email Fix Smarty/plugins/function.crmSettin…
Eileen McNaughton [Mon, 18 Mar 2019 01:10:30 +0000 (14:10 +1300)]
Merge pull request #13237 from MegaphoneJon/core-571
core#571 - check logged in OR checksum user permissions to edit recur…
Eileen McNaughton [Mon, 18 Mar 2019 00:54:49 +0000 (13:54 +1300)]
Merge pull request #13554 from kewljuice/patch-3
dev/core#706 Edit contribution : wrong decimal separator on total_amount for participant(s)
eileen [Mon, 18 Mar 2019 00:03:42 +0000 (13:03 +1300)]
[NFC] Code reformatting
IDE reformat to fix array() vs []
eileen [Sun, 17 Mar 2019 21:41:41 +0000 (10:41 +1300)]
[NFC] code formatting only
IDE reformatting to fix array formats
Eileen McNaughton [Sun, 17 Mar 2019 23:52:51 +0000 (12:52 +1300)]
Merge pull request #13848 from eileenmcnaughton/report_temp2
Use TempTable methods - contribution detail
Eileen McNaughton [Sun, 17 Mar 2019 23:50:21 +0000 (12:50 +1300)]
Merge pull request #13462 from greenpeace-cee/alter-indexes
dev/core#664 - CRM/Logging - Add indexes when updating log schema
Martin [Sun, 17 Mar 2019 23:47:49 +0000 (19:47 -0400)]
dev/core#789 - Bug fix for event reg error when skipping participants (#13800)
Eileen McNaughton [Sun, 17 Mar 2019 23:06:15 +0000 (12:06 +1300)]
Merge pull request #13847 from eileenmcnaughton/report_temp
Use TempTable methods - bookkeeping report
Eileen McNaughton [Sun, 17 Mar 2019 22:58:51 +0000 (11:58 +1300)]
Merge pull request #13603 from pradpnayak/AdvMailin
dev/core/issues/726, Fixed fatal error when searched using group type
mark burdett [Thu, 14 Mar 2019 23:42:46 +0000 (16:42 -0700)]
Use TempTable methods.
mark burdett [Sun, 17 Mar 2019 21:54:07 +0000 (10:54 +1300)]
Use TempTable methods - bookkeeping report
Eileen McNaughton [Sun, 17 Mar 2019 21:42:37 +0000 (10:42 +1300)]
Merge pull request #13845 from seamuslee001/purify_html_tests
Add in tests of purifying HTML output
Eileen McNaughton [Sun, 17 Mar 2019 20:29:57 +0000 (09:29 +1300)]
Merge pull request #13842 from seamuslee001/upgrade_log_package
Remove Log.php require_once statements
Seamus Lee [Sat, 16 Mar 2019 22:35:39 +0000 (09:35 +1100)]
Add in tests of purifying HTML output
Fix up test to work with earlier html purfier
Seamus Lee [Sat, 16 Mar 2019 21:36:22 +0000 (08:36 +1100)]
Ensure that all original Log Files are removed especially on Joomla
Seamus Lee [Sat, 16 Mar 2019 01:56:22 +0000 (12:56 +1100)]
Remove require_once statements
eileen [Sat, 16 Mar 2019 07:19:30 +0000 (20:19 +1300)]
Add FrontEndPaymentFormTrait to start to share functionality between Event and Contribution forms.
I've done one small function extraction in the process
Seamus Lee [Sat, 16 Mar 2019 06:53:43 +0000 (17:53 +1100)]
Merge pull request #13807 from eileenmcnaughton/merge_perm
Fix contact.merge api to pass check_permissions parameter through to the deeper layer
Seamus Lee [Sat, 16 Mar 2019 06:52:10 +0000 (17:52 +1100)]
Merge pull request #13839 from eileenmcnaughton/invoicing
Minor code cleanup
Seamus Lee [Sat, 16 Mar 2019 06:50:24 +0000 (17:50 +1100)]
Merge pull request #13838 from eileenmcnaughton/ids
Minor code cleanup - remove unnecessary ids declaration
Eileen McNaughton [Sat, 16 Mar 2019 06:39:30 +0000 (19:39 +1300)]
Merge pull request #13835 from seamuslee001/upgrade_log_package
Deploy PEAR Log package and upgrade to latest version in the process
Eileen McNaughton [Sat, 16 Mar 2019 03:10:06 +0000 (16:10 +1300)]
Merge pull request #13841 from seamuslee001/dismaker_amavisd
Remove amavisd now that it is removed from the packages repository
Seamus Lee [Sat, 16 Mar 2019 01:52:18 +0000 (12:52 +1100)]
Merge pull request #13836 from eileenmcnaughton/session
[NFC] remove unnecessary variable
Seamus Lee [Sat, 16 Mar 2019 01:29:48 +0000 (12:29 +1100)]
Remove amavisd now that it is removed from the packages repository
Seamus Lee [Fri, 15 Mar 2019 22:21:49 +0000 (09:21 +1100)]
Merge pull request #13832 from eileenmcnaughton/logging
Logging - attempt to fix tests
Seamus Lee [Fri, 15 Mar 2019 22:20:38 +0000 (09:20 +1100)]
Merge pull request #13823 from eileenmcnaughton/import_date_test
Import date test
eileen [Fri, 15 Mar 2019 22:19:45 +0000 (11:19 +1300)]
Minor code cleanup
Invoicing code has been poorly integrated into CiviCRM with much copy & paste,
no following of settings spec and an awful lot of outright hacking.
This is a small step towards moving invoice logic to a centralised place -
specifically in this case the unpacking of the non-standard settings that have been
used. Perhaps once using these functions we can standardise them!
Ideally I'd like to see all the invoicing assigns in a function on this
class, better yet once which mimics the pre or buildForm hook & even
better one day to grow up & be a real hook
eileen [Fri, 15 Mar 2019 21:31:50 +0000 (10:31 +1300)]
Minor code cleanup - remove unnecessary ids declaration
is not used is only used to set ['id'] so this can be simplified
eileen [Fri, 15 Mar 2019 21:11:45 +0000 (10:11 +1300)]
[NFC] remove unnecessary variable
Seamus Lee [Fri, 15 Mar 2019 21:09:55 +0000 (08:09 +1100)]
Deploy PEAR Log package and upgrade to latest version in the process
Eileen McNaughton [Fri, 15 Mar 2019 20:59:55 +0000 (09:59 +1300)]
Merge pull request #13793 from mattwire/case_links_refactor
REF Extract case action links into a separate function to facilitate refactoring
Eileen McNaughton [Fri, 15 Mar 2019 20:54:59 +0000 (09:54 +1300)]
Merge pull request #13834 from civicrm/5.12
5.12
Eileen McNaughton [Fri, 15 Mar 2019 20:53:40 +0000 (09:53 +1300)]
Merge pull request #13825 from mlutfy/dev801-5-12
dev/core#801 Fix from email on PDF Letters, such as Thank You Letters.
Eileen McNaughton [Fri, 15 Mar 2019 20:41:29 +0000 (09:41 +1300)]
Merge pull request #13833 from civicrm/5.12
5.12 to master
Eileen McNaughton [Fri, 15 Mar 2019 20:40:55 +0000 (09:40 +1300)]
Merge pull request #13820 from colemanw/dev/core#790
dev/core#790 - Exclue menubar on frontend pages
Eileen McNaughton [Fri, 15 Mar 2019 20:38:51 +0000 (09:38 +1300)]
Merge pull request #13826 from totten/5.12-assettest-geturl
(NFC, infra/ops#878) AssetBuilderTest - Relax getUrl() assertion for WP compat
projects / civicrm-core.git / log