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 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: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
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
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
eileen [Fri, 15 Mar 2019 20:36:34 +0000 (09:36 +1300)]
Attempt to fix test with 1 second delay
(note in 'real life' the events are not generally so close together
eileen [Fri, 15 Mar 2019 20:35:03 +0000 (09:35 +1300)]
Add more data when test fails
Eileen McNaughton [Fri, 15 Mar 2019 20:30:26 +0000 (09:30 +1300)]
Merge pull request #13830 from mattwire/whitespace_membershipblock
NFC Whitespace cleanup MembershipBlock.tpl
Matthew Wire (MJW Consulting) [Fri, 15 Mar 2019 11:02:55 +0000 (11:02 +0000)]
Whitespace on MembershipBlock.tpl
Eileen McNaughton [Fri, 15 Mar 2019 07:40:30 +0000 (20:40 +1300)]
Merge pull request #13779 from eileenmcnaughton/test_recur
Display test contributions when viewing contributions related to a test recurring contribution
Eileen McNaughton [Fri, 15 Mar 2019 07:40:09 +0000 (20:40 +1300)]
Merge pull request #13824 from colemanw/loadScriptCode
Make cacheCode optional in CRM.loadScript
eileen [Fri, 15 Mar 2019 02:29:12 +0000 (15:29 +1300)]
--amend
Change-Id: Icea6f894d7a9e4656beae3cdb4cb5e44842b59b2
eileen [Tue, 5 Mar 2019 21:42:16 +0000 (10:42 +1300)]
Activity tab performance fix - switch to faster getActivities & getActivitiesCount
The getActivitiesCount & getActivities functions are faster & call permission hooks
but we weren't able to switch to them until we resolved some performance issues
(done) and resolved acl inconsistencies (resolved in 5.12) -we can do this now.
From a performance POV the difference is tab-crashes vs tab resolves quickly
on contacts with > 10k activities
Eileen McNaughton [Fri, 15 Mar 2019 02:07:09 +0000 (15:07 +1300)]
Merge pull request #13829 from eileenmcnaughton/revert
[nfc] Attempt to improve false negatives on Logging test
eileen [Thu, 14 Mar 2019 23:53:42 +0000 (12:53 +1300)]
Attempt to improve false negatives on Logging test
It might be significant that the one I added sleep(1) to before wasn't a fail in this one...
https://test.civicrm.org/job/CiviCRM-Core-PR/25137/
eileen [Thu, 7 Mar 2019 05:45:09 +0000 (18:45 +1300)]
Display test contributions when viewing contributions related to a test recurring contribution
Eileen McNaughton [Thu, 14 Mar 2019 23:37:09 +0000 (12:37 +1300)]
Merge pull request #13828 from civicrm/5.12
5.12 to master
Eileen McNaughton [Thu, 14 Mar 2019 23:36:38 +0000 (12:36 +1300)]
Merge pull request #13796 from eileenmcnaughton/exceptions
dev/core#659 Catch payment processor exceptions, log, hide, do not return 500 error
Eileen McNaughton [Thu, 14 Mar 2019 23:29:47 +0000 (12:29 +1300)]
Merge pull request #13797 from eileenmcnaughton/matt_test
Further cleanup on getRelatedMemberships - just get them with the api
Tim Otten [Wed, 13 Mar 2019 19:00:29 +0000 (12:00 -0700)]
(NFC, infra/ops#878) AssetBuilderTest - Relax getUrl() assertion for WP compat
The test ensures that AssetBuilder produces plausible URLs when caching is disabled.
Generated URLs look different in the default `drupal-clean` and `wp-demo` configurations, e.g.
* D7 (drupal-clean): `http://dmaster.bknix:8001/civicrm/asset/builder?an=square.js&ap=...`
* WP (wp-demo): `http://wpmaster.bknix:8001/?page=CiviCRM&q=civicrm%2Fasset%2Fbuilder&an=square.js&ap=...
The assertion in `AssetBuilderTest` was coded in a way that fails on working URLs.
Before
------
The test fails on WP.
After
-----
The test passes on WP.
Mathieu Lutfy [Thu, 14 Mar 2019 16:47:31 +0000 (12:47 -0400)]
dev/core#801 Fix from email on PDF Letters, such as Thank You Letters.
eileen [Thu, 14 Mar 2019 22:49:42 +0000 (11:49 +1300)]
Fix error message handling while we are at it
Turns out that instead of translating we are passing the error message to a truly silly function
eileen [Thu, 14 Mar 2019 21:08:02 +0000 (10:08 +1300)]
Add unit test to date parsing on import
This is primarily as a demo of how to test this class.
Basically extract the parts that we want to check the formatting of into manageable
functions. I made the name on the second one pretty generic so slowly all formatting can
be moved into it, with testing.
This would include moving the various bits of work done in
_civicrm_api3_deprecated_formatted_param
into this function - that code really does just belong on this class as it
is not called from anywhere else.
It also does the checking, but not the formatting, for these date fields - sigh
I would have liked to have made the method protected but the mucking around that required
in the test classes didn't seem to justify it
eileen [Sat, 9 Mar 2019 01:41:47 +0000 (14:41 +1300)]
Catch payment processor exceptions, log, hide, do not return 500 error
Coleman Watts [Thu, 14 Mar 2019 22:23:18 +0000 (18:23 -0400)]
Make cacheCode optional in CRM.loadScript
Seamus Lee [Thu, 14 Mar 2019 21:41:14 +0000 (08:41 +1100)]
Merge pull request #13822 from seamuslee001/update_zeta_composer_lock
Update lockfile to take into account of civicrm/zetacomponents-mail#4…
colemanw [Thu, 14 Mar 2019 21:01:47 +0000 (17:01 -0400)]
Merge pull request #13816 from MegaphoneJon/core-798
core#798 - fix rendering of public-facing prefix/suffix select2
Seamus Lee [Thu, 14 Mar 2019 20:20:48 +0000 (07:20 +1100)]
Update lockfile to take into account of civicrm/zetacomponents-mail#4 being merged
Coleman Watts [Thu, 14 Mar 2019 16:38:35 +0000 (12:38 -0400)]
dev/core#790 - Exclue menubar on frontend pages
Monish Deb [Thu, 14 Mar 2019 05:02:01 +0000 (10:32 +0530)]
Merge pull request #13778 from eileenmcnaughton/paymetn_next
[REF] small cleanups on payment.create flow.
eileen [Sun, 10 Mar 2019 23:44:36 +0000 (12:44 +1300)]
Further cleanup on getRelatedMemberships - just get them with the api
Per work by Matt it makes sense to just retrieve as an api rather than
do weird object wrangling. This is intended to not change the logic about what is fetched
Eileen McNaughton [Thu, 14 Mar 2019 04:33:15 +0000 (17:33 +1300)]
Merge pull request #13799 from mfb/zetacomponents
Upgrade zetacomponents/base and zetacomponents/mail
Eileen McNaughton [Thu, 14 Mar 2019 04:28:16 +0000 (17:28 +1300)]
Merge pull request #13802 from mattwire/membership_address
Membership form address fields for payment processors
Eileen McNaughton [Wed, 13 Mar 2019 23:17:39 +0000 (12:17 +1300)]
Merge pull request #13703 from mfb/form-temp-tables
Use temp table methods; provide TempTable::getCreateSql() method for debugging
Eileen McNaughton [Wed, 13 Mar 2019 23:13:47 +0000 (12:13 +1300)]
Merge pull request #13818 from civicrm/5.12
5.12 to master
Eileen McNaughton [Wed, 13 Mar 2019 23:12:58 +0000 (12:12 +1300)]
Merge pull request #13810 from totten/master-wp-stdrr
(ops#878) phpunit.xml.dist - Prevent conflict in WordPress E2E with "stderr=true"