Eileen McNaughton [Thu, 4 Apr 2019 00:09:57 +0000 (13:09 +1300)]
Merge pull request #12998 from agileware/CIVICRM-990
Quote fee levels for regular expression in Participant search.
Seamus Lee [Wed, 3 Apr 2019 23:43:58 +0000 (10:43 +1100)]
Merge pull request #13947 from eileenmcnaughton/no_test
[unreleased regression] Add error handling for when no test procesor row exists.
Eileen McNaughton [Wed, 3 Apr 2019 23:17:19 +0000 (12:17 +1300)]
Merge pull request #13949 from eileenmcnaughton/sleep
Test fix
Seamus Lee [Wed, 3 Apr 2019 22:29:23 +0000 (09:29 +1100)]
Merge pull request #13948 from civicrm/5.12
5.12
eileen [Wed, 3 Apr 2019 22:20:51 +0000 (11:20 +1300)]
Test fix
Tim Otten [Wed, 3 Apr 2019 22:12:27 +0000 (15:12 -0700)]
Merge pull request #13853 from agh1/5.12.0-releasenotes
5.12.0 release notes
eileen [Wed, 3 Apr 2019 22:11:25 +0000 (11:11 +1300)]
Add error handling for when no test procesor row exists.
This is not really a valid config but for sites that have processors without test rows recent changes
will make that problematic. We can be nice
Tim Otten [Wed, 3 Apr 2019 21:53:26 +0000 (14:53 -0700)]
Update 5.12.0.md
Andrew Hunt [Wed, 3 Apr 2019 21:42:56 +0000 (17:42 -0400)]
5.12.0 release notes: final edits
Andrew Hunt [Wed, 3 Apr 2019 19:59:02 +0000 (15:59 -0400)]
5.12.0 release notes: late changes
Alice Frumin [Tue, 19 Mar 2019 18:45:13 +0000 (14:45 -0400)]
5.12.0 release notes: bulk of work
Alice Frumin [Tue, 19 Mar 2019 18:15:34 +0000 (14:15 -0400)]
5.12.0 release notes: contributors
Alice Frumin [Tue, 19 Mar 2019 17:57:20 +0000 (13:57 -0400)]
5.12.0 release notes: reorganizing
Eileen McNaughton [Wed, 3 Apr 2019 18:56:31 +0000 (07:56 +1300)]
Merge pull request #13923 from seamuslee001/update_phpword_patches
Update PHPWord Patches to match the latest versions of their code
Eileen McNaughton [Wed, 3 Apr 2019 18:44:14 +0000 (07:44 +1300)]
Merge pull request #13945 from pradpnayak/subtypeDefaul
dev/core/issues/823, fixed code to set contact type correctly
Pradeep Nayak [Wed, 3 Apr 2019 16:41:16 +0000 (17:41 +0100)]
dev/core/issues/823, fixed code to set contact type correctly
Seamus Lee [Wed, 3 Apr 2019 01:58:27 +0000 (12:58 +1100)]
Merge pull request #13938 from jackrabbithanna/core-725
Core/725 - Get state_province_id given non numeric country_id or country parameter
Eileen McNaughton [Wed, 3 Apr 2019 00:10:40 +0000 (13:10 +1300)]
Merge pull request #13943 from mlutfy/setMessageError
Fix status type (error, not fail) for CRM_Core_Session::setStatus
Mark Hanna [Tue, 2 Apr 2019 15:19:47 +0000 (10:19 -0500)]
get state_province_id given non numeric country_id or country parameter for APIv3 Address
Eileen McNaughton [Tue, 2 Apr 2019 22:58:29 +0000 (11:58 +1300)]
Merge pull request #13927 from mlutfy/cart-php72
Event Cart: Fix PHP 7.2 fatal error (pass by ref)
Mathieu Lutfy [Tue, 2 Apr 2019 20:59:04 +0000 (16:59 -0400)]
Fix status type (error, not fail) for CRM_Core_Session::setStatus
Mathieu Lutfy [Mon, 1 Apr 2019 14:39:57 +0000 (10:39 -0400)]
Event Cart: Fix PHP 7.2 fatal error (pass by ref).
Eileen McNaughton [Tue, 2 Apr 2019 20:37:03 +0000 (09:37 +1300)]
Merge pull request #13942 from civicrm/5.12
5.12 to master
Eileen McNaughton [Tue, 2 Apr 2019 20:36:36 +0000 (09:36 +1300)]
Merge pull request #13939 from eileenmcnaughton/website
dev/core/issues/842, Fixed code to update website rather delete
Eileen McNaughton [Tue, 2 Apr 2019 19:29:31 +0000 (08:29 +1300)]
Merge pull request #13051 from mlutfy/customvalue-checkbox-display
dev/core#499 Fix CustomField Checkbox display when values are non-sorted
Pradeep Nayak [Mon, 1 Apr 2019 20:40:19 +0000 (21:40 +0100)]
dev/core/issues/842, Fixed code to update website rather delete
Eileen McNaughton [Tue, 2 Apr 2019 19:20:13 +0000 (08:20 +1300)]
Merge pull request #13936 from yashodha/dev-835
(dev/core#835) Expose Registered by Participant Name field to partici…
colemanw [Tue, 2 Apr 2019 14:25:48 +0000 (10:25 -0400)]
Merge pull request #13931 from eileenmcnaughton/recur_cancel_reason
Add shared parent for ContributionRecur forms
yashodha [Tue, 2 Apr 2019 08:28:34 +0000 (13:58 +0530)]
minor fix
yashodha [Tue, 2 Apr 2019 08:23:58 +0000 (13:53 +0530)]
(dev/core#835) Expose Registered by Participant Name field to participant report
Mathieu Lutfy [Thu, 1 Nov 2018 18:40:47 +0000 (14:40 -0400)]
dev/core#499 Fix CustomField Checkbox display when values are non-sorted.
Seamus Lee [Tue, 2 Apr 2019 01:06:46 +0000 (12:06 +1100)]
Merge pull request #13933 from seamuslee001/master
(NFC) Fix mode on files
eileen [Mon, 1 Apr 2019 23:24:56 +0000 (12:24 +1300)]
Add shared parent for ContributionRecur forms
Eileen McNaughton [Mon, 1 Apr 2019 23:20:53 +0000 (12:20 +1300)]
Merge pull request #13930 from eileenmcnaughton/recur_cancel_reason
dev/core#830 Recur cancel reason
eileen [Mon, 1 Apr 2019 21:39:21 +0000 (10:39 +1300)]
Add cancel_reason field
Eileen McNaughton [Mon, 1 Apr 2019 21:26:31 +0000 (10:26 +1300)]
Merge pull request #12583 from omarabuhussein/dev/core#288
dev/core#288 : Use the correct membership date for the notification that appear after completing the membership payment in case pre hook is used
Eileen McNaughton [Mon, 1 Apr 2019 20:36:10 +0000 (09:36 +1300)]
Merge pull request #13926 from pradpnayak/NoticeErrorProfile
dev/core/issues/840, fixed notice error
Seamus Lee [Mon, 1 Apr 2019 20:27:43 +0000 (07:27 +1100)]
Merge pull request #13854 from eileenmcnaughton/lock
CRM-18011 improve lock handling for mysql 5.7.5+
Alok Patel [Mon, 1 Apr 2019 12:20:18 +0000 (17:50 +0530)]
CIVICRM-990: Unit test to make sure regular expression in Participant search works.
Pradeep Nayak [Mon, 1 Apr 2019 11:33:58 +0000 (12:33 +0100)]
dev/core/issues/840, fixed notice error
Eileen McNaughton [Mon, 1 Apr 2019 06:06:06 +0000 (19:06 +1300)]
Merge pull request #13924 from eileenmcnaughton/payment_test
Payment test cleanup
Eileen McNaughton [Mon, 1 Apr 2019 06:05:37 +0000 (19:05 +1300)]
Merge pull request #13919 from seamuslee001/premium_fullfilled_date_conversion
Convert the Fullfilled Date field in preimum section on backoffice co…
eileen [Mon, 1 Apr 2019 04:31:21 +0000 (17:31 +1300)]
Simply test, checkPaymentResult adds no value
calling the checkPaymentResult function is actually decreasing readability here as the
simple array comparison is being made to look complex
Seamus Lee [Fri, 29 Mar 2019 21:13:34 +0000 (08:13 +1100)]
Convert the Fullfilled Date field in preimum section on backoffice contribution from from jcalendar to datepicker
Fix up defaults
Seamus Lee [Mon, 1 Apr 2019 01:55:39 +0000 (12:55 +1100)]
Fix mode on files
Eileen McNaughton [Mon, 1 Apr 2019 01:24:03 +0000 (14:24 +1300)]
Merge pull request #13918 from seamuslee001/trxn_date_conversion
Convert trxn_date field in the Update Pending Status task option from…
Seamus Lee [Sun, 31 Mar 2019 21:27:01 +0000 (08:27 +1100)]
Update PHPWord Patches to match the latest versions of their code
Eileen McNaughton [Sun, 31 Mar 2019 20:26:54 +0000 (09:26 +1300)]
Merge pull request #13921 from pradpnayak/noticeErrorFix
dev/core/issues/837, Fixed notice error on Contribution Agrreagate custom search.
Eileen McNaughton [Sun, 31 Mar 2019 20:25:34 +0000 (09:25 +1300)]
Merge pull request #13922 from colemanw/factory
[NFC] Cleanup DAO factory classes for code standards
Eileen McNaughton [Sun, 31 Mar 2019 19:14:55 +0000 (08:14 +1300)]
Merge pull request #13920 from seamuslee001/lab_core_836
dev/core#836 Do not track CSS urls when added as link urls
Eileen McNaughton [Sun, 31 Mar 2019 19:13:16 +0000 (08:13 +1300)]
Merge pull request #13867 from jitendrapurohit/paypalpro
Possible paypal fix to avoid sending 500 errors from ipn triggerred b…
Jitendra Purohit [Sun, 31 Mar 2019 16:01:45 +0000 (21:31 +0530)]
Fix unit test
Coleman Watts [Sun, 31 Mar 2019 13:29:28 +0000 (09:29 -0400)]
[NFC] Cleanup DAO factory classes for code standards
Pradeep Nayak [Sat, 30 Mar 2019 19:14:36 +0000 (19:14 +0000)]
dev/core/issues/837, Fixed notice error on Contribution Agrreagate custom search.
Seamus Lee [Sat, 30 Mar 2019 04:17:27 +0000 (15:17 +1100)]
dev/core#836 Do not track CSS urls when added as link urls
Seamus Lee [Sat, 30 Mar 2019 02:42:30 +0000 (13:42 +1100)]
Fix label of trxn_date field and also fix post processing of trxn_date
Eileen McNaughton [Fri, 29 Mar 2019 22:14:34 +0000 (11:14 +1300)]
Merge pull request #13917 from seamuslee001/photo_fatal_to_execption
Covert the CRM_Core_Error::fatal calls to exceptions when trying to a…
Seamus Lee [Fri, 29 Mar 2019 20:56:00 +0000 (07:56 +1100)]
Convert trxn_date field in the Update Pending Status task option from find contributions to datepicker from jcalendar
Seamus Lee [Fri, 29 Mar 2019 20:48:06 +0000 (07:48 +1100)]
Covert the CRM_Core_Error::fatal calls to exceptions when trying to access Contact Photos
Matthew Wire [Fri, 29 Mar 2019 20:22:53 +0000 (20:22 +0000)]
Merge pull request #13852 from pradpnayak/RecurringMemIssue
dev/core/issues/806, Fixed DB error already exist when recording recurring payment having tax
colemanw [Fri, 29 Mar 2019 18:35:47 +0000 (14:35 -0400)]
Merge pull request #13895 from eileenmcnaughton/format
Fix mis-formatting of Email greeting id, Address greeting id etc
Seamus Lee [Fri, 29 Mar 2019 09:29:25 +0000 (20:29 +1100)]
Merge pull request #13910 from seamuslee001/note_no_contact_id
Do not cause a fatal error if no contact_id field for a note is fille…
Seamus Lee [Fri, 29 Mar 2019 09:19:36 +0000 (20:19 +1100)]
Merge pull request #13912 from colemanw/shortAng
NFC - Short array syntax - auto-convert ang dir
Eileen McNaughton [Fri, 29 Mar 2019 07:37:39 +0000 (20:37 +1300)]
Merge pull request #13911 from colemanw/shortCivi
NFC - Short array syntax - auto-convert Civi dir
Coleman Watts [Fri, 29 Mar 2019 01:14:10 +0000 (21:14 -0400)]
NFC - Short array syntax - auto-convert ang dir
Coleman Watts [Fri, 29 Mar 2019 01:10:29 +0000 (21:10 -0400)]
NFC - Short array syntax - auto-convert Civi dir
Seamus Lee [Fri, 29 Mar 2019 01:04:55 +0000 (12:04 +1100)]
Merge pull request #13909 from colemanw/apiShortSyntax
[NFC] Short array syntax - auto-convert api dir
eileen [Mon, 26 Feb 2018 02:38:29 +0000 (15:38 +1300)]
CRM-18011 improve lock handling for mysql 5.7.5+
5.7.5+ supports multiple mysql threads in a process. We can be non-hacky once that is in play
Coleman Watts [Thu, 28 Mar 2019 23:47:17 +0000 (19:47 -0400)]
Short array syntax - auto-convert api dir
Seamus Lee [Thu, 28 Mar 2019 23:43:23 +0000 (10:43 +1100)]
Do not cause a fatal error if no contact_id field for a note is filled in when viewing contact notes
Eileen McNaughton [Thu, 28 Mar 2019 23:03:22 +0000 (12:03 +1300)]
Merge pull request #13908 from eileenmcnaughton/report_filter
Add unit test for https://github.com/civicrm/civicrm-core/pull/13158
Eileen McNaughton [Thu, 28 Mar 2019 22:49:30 +0000 (11:49 +1300)]
Merge pull request #13698 from mattwire/contributionrecur_payprocid_pseudoconstant
Add pseudoconstant support for payment_processor_id on ContributionRecur
Eileen McNaughton [Thu, 28 Mar 2019 22:41:55 +0000 (11:41 +1300)]
Merge pull request #13840 from seamuslee001/htmlpurifier_composer
Upgrade htmlpurifier to 4.10 to support PHP7.2 and install via composer
Eileen McNaughton [Thu, 28 Mar 2019 22:07:59 +0000 (11:07 +1300)]
Merge pull request #12457 from omarabuhussein/dev/core#253
dev/core#253: Cancelling or An Error during event registration payment should cancel all additional participates
eileen [Thu, 28 Mar 2019 21:39:26 +0000 (10:39 +1300)]
Add unit test for https://github.com/civicrm/civicrm-core/pull/13158
Eileen McNaughton [Thu, 28 Mar 2019 21:38:17 +0000 (10:38 +1300)]
Merge pull request #13158 from elisseck/dev/core/544
dev/core/544 Add report support for filter on multiple contact subtypes
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 14:41:26 +0000 (14:41 +0000)]
Add pseudoconstant support for payment_processor_id on CRM_Contribute_BAO_ContributionRecur
Eileen McNaughton [Thu, 28 Mar 2019 20:24:27 +0000 (09:24 +1300)]
Merge pull request #13873 from eileenmcnaughton/mutliple_activity_types
Mutliple activity type filters on activity tab on contact records
Eileen McNaughton [Thu, 28 Mar 2019 20:22:00 +0000 (09:22 +1300)]
Merge pull request #13819 from mfb/temp-table
Use TempTable methods
Eileen McNaughton [Thu, 28 Mar 2019 20:03:34 +0000 (09:03 +1300)]
Merge pull request #13900 from greenpeace-cee/fix-get-custom-field
dev/core#755 - CRM/Core - Fix missing group name in custom field cache
lordt [Thu, 28 Mar 2019 19:49:11 +0000 (20:49 +0100)]
#829 Swaziland has changed its name to Eswatini (#13902)
* #829 Swaziland has changed its name to Eswatini
* #829 Swaziland has changed its name to Eswatini
* #829 Swaziland has changed its name to Eswatini
* #829 Swaziland has changed its name to Eswatini
eileen [Thu, 21 Mar 2019 01:22:03 +0000 (14:22 +1300)]
Support a multiple select for activity types to include & exclude
colemanw [Thu, 28 Mar 2019 13:48:57 +0000 (09:48 -0400)]
Merge pull request #13855 from eileenmcnaughton/activity_date_picker
Convert activity tab to use datepicker
Eileen McNaughton [Thu, 28 Mar 2019 04:53:25 +0000 (17:53 +1300)]
Merge pull request #13596 from jackrabbithanna/726-address-api-states
CiviCRM API, lookup state_province_id options based on country parame…
Eileen McNaughton [Thu, 28 Mar 2019 00:54:44 +0000 (13:54 +1300)]
Merge pull request #13904 from eileenmcnaughton/test
Add Unit test for export with incomplete data
Coleman Watts [Wed, 27 Mar 2019 23:48:00 +0000 (19:48 -0400)]
Fix api validate of states and improve test
Seamus Lee [Wed, 27 Mar 2019 22:25:31 +0000 (09:25 +1100)]
Update test to alter to changed output based on new htmlpurifier
Seamus Lee [Sun, 17 Mar 2019 19:53:05 +0000 (06:53 +1100)]
Update Config and class loader paths
Seamus Lee [Fri, 15 Mar 2019 23:28:16 +0000 (10:28 +1100)]
Upgrade htmlpurifier to 4.10 to support PHP7.2 and install via composer
Patrick Figel [Wed, 27 Mar 2019 20:46:50 +0000 (21:46 +0100)]
dev/core#755 - CRM/Core - Fix missing group name in custom field cache
CRM_Core_BAO_CustomField::getCustomFieldID caches custom fields based
on the field name, meaning if a custom field of the same name exists
in more than one group, the method will always return the first field
that was cached. This change adds the $groupName parameter to the
cache key.
This also adds a missing test for the $fullString parameter and
renames the $groupTitle parameter to $groupName in preparation
for future changes.
Eileen McNaughton [Wed, 27 Mar 2019 20:13:09 +0000 (09:13 +1300)]
Merge pull request #13905 from civicrm/5.12
5.12 to master
Eileen McNaughton [Wed, 27 Mar 2019 20:12:44 +0000 (09:12 +1300)]
Merge pull request #13903 from agh1/userdashcontrib-5-12
Intra-RC regression: User dashboard: show most recent contributions, not earliest
eileen [Wed, 27 Mar 2019 20:03:57 +0000 (09:03 +1300)]
Add Unit test for export with incomplete data
Eileen McNaughton [Wed, 27 Mar 2019 20:07:09 +0000 (09:07 +1300)]
Merge pull request #13889 from pradpnayak/ExportBug
dev/core/issues/819, Fixed fatal error on export screen
Andrew Hunt [Wed, 27 Mar 2019 17:31:37 +0000 (13:31 -0400)]
User dash: adjust test to make sure contributions are chronological
Eileen McNaughton [Wed, 27 Mar 2019 17:28:32 +0000 (06:28 +1300)]
Merge pull request #13864 from eileenmcnaughton/rule_group
Expose sort_name as a dedupe-matchable field
Andrew Hunt [Wed, 27 Mar 2019 15:43:34 +0000 (11:43 -0400)]
User dash: show most recent contributions, not earliest
colemanw [Wed, 27 Mar 2019 16:39:29 +0000 (12:39 -0400)]
Merge pull request #13896 from eileenmcnaughton/ar
[NFC] IDE formatting only
colemanw [Wed, 27 Mar 2019 14:13:00 +0000 (10:13 -0400)]
Merge pull request #13898 from eileenmcnaughton/merge_summary_2
dev/core#824 Render contact type icons in std way on merge screen
Eileen McNaughton [Wed, 27 Mar 2019 05:34:04 +0000 (18:34 +1300)]
Merge pull request #13883 from agh1/grantdetailgroupby
PHP Error on Grant Detail Report
projects / civicrm-core.git / log