Coleman Watts [Mon, 4 Sep 2017 03:45:02 +0000 (23:45 -0400)]
CRM-21139 - Add crm-i.css to common/fatal.tpl
colemanw [Mon, 4 Sep 2017 01:33:34 +0000 (21:33 -0400)]
Merge pull request #10929 from seamuslee001/CRM-20237
CRM-20237 Don't add in extra copy of ids and only use most recent id …
Eileen McNaughton [Sun, 3 Sep 2017 21:42:37 +0000 (09:42 +1200)]
Merge pull request #8724 from JMAConsulting/CRM-18231
CRM-18231 Environment variables
Eileen McNaughton [Fri, 1 Sep 2017 23:08:40 +0000 (11:08 +1200)]
Merge pull request #10933 from civicrm/4.7.24-rc
4.7.24 rc
colemanw [Fri, 1 Sep 2017 14:34:37 +0000 (10:34 -0400)]
Merge pull request #10932 from jitendrapurohit/CRM-21135-rcfix
CRM-21135 - Activity filter preference are not remembered when enable…
Jitendra Purohit [Fri, 1 Sep 2017 10:53:17 +0000 (16:23 +0530)]
CRM-21135 - Activity filter preference are not remembered when enabled in display settings
deb.monish [Tue, 29 Aug 2017 07:36:41 +0000 (13:06 +0530)]
QA fixes
Yashodha Chaku [Fri, 1 Sep 2017 03:15:07 +0000 (08:45 +0530)]
CRM-21130 - Search builder throws error if location type has space (#10928)
* CRM-21130 - Search builder throws error if location type has space
* minor fixes
Seamus Lee [Fri, 1 Sep 2017 02:05:11 +0000 (12:05 +1000)]
Update tests following changes by Eileen
eileen [Fri, 1 Sep 2017 01:34:26 +0000 (13:34 +1200)]
CRM-20237 keep some of original name in name field
Alar [Fri, 1 Sep 2017 01:56:06 +0000 (03:56 +0200)]
CRM-21128 Personal Campaign Page selection with force=1 in Find Contributions (#8997)
* Personal Campaign can now be passed in force mode
Passing pcpid=n with force=1 alloow to search on corresponding Personal
Campaign id
* Improves parameter passing
Now cope with both single value form (pcpid=n) and multivalue form
(pcpid[]=n&pcpid[]=m)
* Removed useless ++$n
* Fixed checkstyle warnings
* Operator spacing and comment indentation
Seamus Lee [Fri, 1 Sep 2017 00:43:50 +0000 (10:43 +1000)]
CRM-20237 Don't add in extra copy of ids and only use most recent id copied from in title and don't put copy of details in name for pricesets
Eileen McNaughton [Thu, 31 Aug 2017 21:31:53 +0000 (09:31 +1200)]
Merge pull request #10831 from MiyaNoctem/CRM-20858-fix-merge-of-unselected-custom-fields
CRM-20858: Fix Merging of Unselected Custom Fields
deb.monish [Tue, 29 Aug 2017 05:11:25 +0000 (10:41 +0530)]
additional fixes
Edsel [Mon, 14 Mar 2016 10:41:00 +0000 (16:11 +0530)]
CRM-18231 Added settings on developer page
Monish Deb [Thu, 31 Aug 2017 20:20:14 +0000 (01:50 +0530)]
Merge pull request #10923 from jitendrapurohit/CRM-21126
CRM-21126: fix default selection of member_is_primary input
Monish Deb [Thu, 31 Aug 2017 19:59:43 +0000 (01:29 +0530)]
Merge pull request #10921 from eileenmcnaughton/cachekey
CRM-21124 fix error on cacheKey when too long
Monish Deb [Thu, 31 Aug 2017 19:49:20 +0000 (01:19 +0530)]
Merge pull request #10731 from eileenmcnaughton/pref_comm
CRM-19933 proposed fix for import wiping out preferred comm method (possibly CRM-20035 too)
colemanw [Thu, 31 Aug 2017 19:03:09 +0000 (15:03 -0400)]
Merge pull request #10890 from eileenmcnaughton/dedupe
Towards CRM-20155 clean up form code in order to consolidate function…
Camilo Rodriguez [Thu, 31 Aug 2017 13:38:12 +0000 (13:38 +0000)]
CRM-20858: Remove Uneeded Variable
eileen [Mon, 24 Jul 2017 01:51:45 +0000 (13:51 +1200)]
CRM-19933 proposed fix for import wiping out preferred comm method
Jitendra Purohit [Thu, 31 Aug 2017 08:32:08 +0000 (14:02 +0530)]
modify check to 0 or 1
Eileen McNaughton [Thu, 31 Aug 2017 02:28:54 +0000 (14:28 +1200)]
Merge pull request #10924 from MegaphoneJon/CRM-21129
CRM-21129 - CLI API CSV import doesn't allow single-column CSVs
Monish Deb [Wed, 30 Aug 2017 20:14:34 +0000 (01:44 +0530)]
Merge pull request #10757 from jitendrapurohit/CRM-20964
CRM-20964: Include queue id while retrieving rows from Event Queue
Jon goldberg [Wed, 30 Aug 2017 18:47:16 +0000 (14:47 -0400)]
CRM-21129 - CLI API CSV import doesn't allow single-column CSVs
Jitendra Purohit [Wed, 30 Aug 2017 09:42:44 +0000 (15:12 +0530)]
CRM-21126: fix default selection of member_is_primary input
eileen [Wed, 30 Aug 2017 05:19:17 +0000 (17:19 +1200)]
CRM-21124 fix error on cacheKey when too long
Eileen McNaughton [Wed, 30 Aug 2017 02:57:51 +0000 (14:57 +1200)]
Merge pull request #10734 from jitendrapurohit/CRM-20949
CRM-20949 - Fix payment processor assignment
Tim Otten [Tue, 29 Aug 2017 20:51:44 +0000 (13:51 -0700)]
Merge pull request #10886 from eileenmcnaughton/task
NFC remove some unused vars, fix comment
Monish Deb [Tue, 29 Aug 2017 20:48:41 +0000 (02:18 +0530)]
Merge pull request #10906 from MegaphoneJon/CRM-21108-2
CRM-21108 - Greatly improve performance of adding contacts
colemanw [Tue, 29 Aug 2017 17:50:26 +0000 (13:50 -0400)]
Merge pull request #10916 from eileenmcnaughton/permission_problem_address_get
CRM-20027 add test for locBlock permission issue
Eileen McNaughton [Tue, 29 Aug 2017 10:32:19 +0000 (22:32 +1200)]
Merge pull request #10917 from mattwire/CRM-21118_messagetemplate_buttons_at_top
CRM-21118 Add action links at top of page on message template overview
Eileen McNaughton [Tue, 29 Aug 2017 10:29:32 +0000 (22:29 +1200)]
Merge pull request #10585 from JMAConsulting/CRM-17748
[ready for core team review] CRM-17748: Expose options to CRM_Core_DAO
eileen [Tue, 29 Aug 2017 08:21:15 +0000 (20:21 +1200)]
CRM-20027 add test for locBlock permission issue
Eileen McNaughton [Tue, 29 Aug 2017 09:20:45 +0000 (21:20 +1200)]
Merge pull request #9973 from lcdservices/CRM-19469
CRM-19469 support returning payment params after mapping
Matthew Wire [Tue, 29 Aug 2017 09:15:58 +0000 (10:15 +0100)]
Add action links at top of page
Eileen McNaughton [Tue, 29 Aug 2017 08:01:00 +0000 (20:01 +1200)]
Merge pull request #10780 from jitendrapurohit/CRM-20979
CRM-20979 - expose pre help for price fields to the UI
Eileen McNaughton [Tue, 29 Aug 2017 03:00:02 +0000 (15:00 +1200)]
Merge pull request #10874 from totten/master-ts-warn
CRM-21079, CRM-9683 - Display advisories about DATETIME/TIMESTAMP columns
Eileen McNaughton [Tue, 29 Aug 2017 02:21:38 +0000 (14:21 +1200)]
Merge pull request #10730 from eileenmcnaughton/test_name
Renamed test class.
Tim Otten [Tue, 29 Aug 2017 02:03:11 +0000 (19:03 -0700)]
CRM-21079, CRM-9683 - CRM_Utils_Check - Expand advice
Jon goldberg [Mon, 28 Aug 2017 22:50:28 +0000 (18:50 -0400)]
CRM-21108 - handle single or multi-dimensional contact detail arrays
Eileen McNaughton [Mon, 28 Aug 2017 21:11:44 +0000 (09:11 +1200)]
Merge pull request #10888 from mattwire/CRM-21092_financial_batch_fixes
Fix PHP Warnings. Replace fatal with statusBounce. Mark appendBreadCr…
Eileen McNaughton [Mon, 28 Aug 2017 21:09:06 +0000 (09:09 +1200)]
Merge pull request #10860 from mattwire/CRM-21065_optiongroup_to_pseudoconstant
CRM-21065 Replace some CRM_Core_OptionGroup::values with CRM_Activity_BAO_Activ…
Eileen McNaughton [Mon, 28 Aug 2017 21:05:54 +0000 (09:05 +1200)]
Merge pull request #10865 from mattwire/CRM-21069_check_eventid
CRM-21069 Fix crash when event_id is not set
Matthew Wire [Mon, 28 Aug 2017 17:37:36 +0000 (18:37 +0100)]
Add warning log message about bad data
Matthew Wire [Mon, 28 Aug 2017 17:19:06 +0000 (18:19 +0100)]
Update based on comments from @eileenmcnaughton
Jon goldberg [Sun, 27 Aug 2017 22:56:57 +0000 (18:56 -0400)]
Fix comments on new unit test
Jon goldberg [Thu, 24 Aug 2017 22:28:15 +0000 (18:28 -0400)]
CRM-21108 - Refactor greeting token replacement code to avoid calls to expensive queries in most situations
Formatting fixes
Eileen McNaughton [Sun, 27 Aug 2017 06:50:00 +0000 (18:50 +1200)]
Merge pull request #10863 from rtobias81/lastModified-graceful
CRM-21068 - getLastModified fails more gracefully now.
Eileen McNaughton [Sun, 27 Aug 2017 06:39:07 +0000 (18:39 +1200)]
Merge pull request #10882 from jitendrapurohit/CRM-21087
CRM-21087: Payment popup goes weird if you click 'adjust payment amount'
colemanw [Fri, 25 Aug 2017 16:43:15 +0000 (12:43 -0400)]
Merge pull request #10903 from colemanw/CRM-20680
CRM-20680 - Only spin the logo in the menubar
colemanw [Fri, 25 Aug 2017 16:26:55 +0000 (12:26 -0400)]
Merge pull request #10892 from herbdool/crm21098
CRM-21098
Coleman Watts [Fri, 25 Aug 2017 16:26:29 +0000 (12:26 -0400)]
CRM-20680 - Only spin the logo in the menubar
Eileen McNaughton [Fri, 25 Aug 2017 04:04:01 +0000 (16:04 +1200)]
Merge pull request #10889 from jmcclelland/CRM-21094
CRM-21094 - improve layout order of fields in SurveyDetails report
Tim Otten [Fri, 25 Aug 2017 01:05:22 +0000 (18:05 -0700)]
Merge pull request #10894 from seanmadsen/patch-1
(NFC) Update contributor-key.yml
colemanw [Thu, 24 Aug 2017 14:15:56 +0000 (10:15 -0400)]
Use delegated click handler
Herb vd Dool [Wed, 23 Aug 2017 15:54:53 +0000 (11:54 -0400)]
crm21098 hide the Backdrop admin menu when CiviCRM admin menu is visible
colemanw [Wed, 23 Aug 2017 23:49:08 +0000 (19:49 -0400)]
Merge pull request #10893 from twomice/CRM-21099_canceled_refunded_label
Fix CRM-21099.
Jamie McClelland [Wed, 23 Aug 2017 22:25:23 +0000 (18:25 -0400)]
CRM-21094 - formatting fixes
Eileen McNaughton [Wed, 23 Aug 2017 21:57:02 +0000 (09:57 +1200)]
Merge pull request #10718 from JMAConsulting/CRM-20936
CRM-20936: Hide statuses on backoffice contribution form
Eileen McNaughton [Wed, 23 Aug 2017 21:45:09 +0000 (09:45 +1200)]
Merge pull request #10628 from jitendrapurohit/CRM-20838
CRM-20838 - Add check for missing log tables on system status
Eileen McNaughton [Wed, 23 Aug 2017 21:43:23 +0000 (09:43 +1200)]
Merge pull request #10896 from civicrm/4.7.24-rc
4.7.24 rc
Eileen McNaughton [Wed, 23 Aug 2017 21:41:39 +0000 (09:41 +1200)]
Merge pull request #10895 from seamuslee001/CRM-21100-rc
CRM-21100 Hotfix to ensure that testGroup list is still the same as p…
Seamus Lee [Wed, 23 Aug 2017 20:46:34 +0000 (06:46 +1000)]
CRM-21100 Hotfix to ensure that testGroup list is still the same as previous, need to work on converting to AJAX list
Eileen McNaughton [Wed, 23 Aug 2017 20:28:38 +0000 (08:28 +1200)]
Merge pull request #10405 from agh1/crm-19612
CRM-19612 Fix temp table problems caused by union
Sean Madsen [Wed, 23 Aug 2017 19:40:35 +0000 (13:40 -0600)]
Update contributor-key.yml
colemanw [Wed, 23 Aug 2017 19:35:47 +0000 (15:35 -0400)]
Merge pull request #10891 from laryn/BackdropCSS2
CRM-21095: Alternate "more Civi-ish" approach to add Backdrop CSS
colemanw [Wed, 23 Aug 2017 19:34:31 +0000 (15:34 -0400)]
Merge pull request #10759 from davejenx/CRM-20966
CRM-20966: Do not create membership_payment record for inherited membership (when two memberships created in back end via price set).
colemanw [Wed, 23 Aug 2017 19:34:08 +0000 (15:34 -0400)]
Merge pull request #10745 from davejenx/CRM-20955
CRM-20955 - Allow contact's second membership to inherit when created…
Allen Shaw [Wed, 23 Aug 2017 18:25:46 +0000 (13:25 -0500)]
Fix CRM-21099.
laryn [Wed, 23 Aug 2017 14:29:17 +0000 (09:29 -0500)]
Clean whitespace
laryn [Wed, 23 Aug 2017 14:24:51 +0000 (09:24 -0500)]
CRM-21095: Alternate 'more Civi-ish' approach
deb.monish [Fri, 4 Aug 2017 19:58:35 +0000 (01:28 +0530)]
additional fixes
deb.monish [Fri, 21 Jul 2017 12:00:16 +0000 (17:30 +0530)]
CRM-20936: Hide statuses on backoffice contribution form
Monish Deb [Wed, 23 Aug 2017 11:07:55 +0000 (16:37 +0530)]
Merge pull request #10700 from alifrumin/participantnote
CRM-20914 updating data type for participant note to be consistent wi…
deb.monish [Mon, 21 Aug 2017 14:51:32 +0000 (20:21 +0530)]
test failure fixes
eileen [Sun, 23 Jul 2017 22:32:39 +0000 (10:32 +1200)]
Renamed test class.
I wonder if this test was running before?
Monish Deb [Wed, 23 Aug 2017 10:32:40 +0000 (16:02 +0530)]
Merge pull request #10832 from jitendrapurohit/CRM-21045
CRM-21045: Multiple email field shown on Contribution Page.
Jitendra Purohit [Wed, 23 Aug 2017 09:36:22 +0000 (15:06 +0530)]
add new api and unit test
Eileen McNaughton [Wed, 23 Aug 2017 03:11:17 +0000 (15:11 +1200)]
Merge pull request #10830 from jitendrapurohit/CRM-21043
CRM-21043 - Dupe check of on behalf organisation not working
Eileen McNaughton [Wed, 23 Aug 2017 03:05:10 +0000 (15:05 +1200)]
Merge pull request #10853 from seanmadsen/docs-contributing
(NFC) Improve docs in CONTRIBUTING.md
jmcclelland [Wed, 23 Aug 2017 02:17:08 +0000 (22:17 -0400)]
WIP CRM-20840 - ensure no receipt for recur payment if contrib page says … (#10850)
* CRM-20840 - Add unit test to ensure no receipt for recur payment if contrib page says no receipt
(bug fixed elsewhere)
* CRM-20840 - ensure unique address are sent to authorize.net
* CRM-20840 - argument should be optional to avoid breakage elsewhere.
eileen [Wed, 23 Aug 2017 01:40:57 +0000 (13:40 +1200)]
Towards CRM-20155 clean up form code in order to consolidate function use.
The code in the Find and Merge Duplicate Contacts form has mystified me for along time. As a step towards extracting
dedupe code into separate extension/s I have gone through & tidied up the finding of duplicates to re-use a function
used elsewhere rather than duplicate it on the form. In the process I tried, and failed, to come up with
a rationale for the duplicate form catching represented in setting form properties.
Note that I made the parameter explicit. I am expecting this to be a URL paramter in the future
(currently deploying that to our site as such in the context of being able to find matches for specfic contacts.
I felt making it explicit now would aid in not missing instances of it when patching later
Laryn - CEDC.org [Tue, 22 Aug 2017 21:35:27 +0000 (16:35 -0500)]
Merge pull request #4 from civicrm/master
Catching up w/ core
colemanw [Tue, 22 Aug 2017 21:00:07 +0000 (17:00 -0400)]
Merge pull request #10839 from MegaphoneJon/CRM-21049
CRM-21049 - Allow creating relationship types with no contact type specified
Matthew Wire [Tue, 22 Aug 2017 11:30:31 +0000 (12:30 +0100)]
Fix PHP Warnings. Replace fatal with statusBounce. Mark appendBreadCrumbs parameter as array instead of string so editors don't give a warning
Jamie McClelland [Tue, 22 Aug 2017 20:17:38 +0000 (16:17 -0400)]
CRM-21094 - improve layout order of fields in SurveyDetails report
Camilo Rodriguez [Tue, 22 Aug 2017 10:46:25 +0000 (10:46 +0000)]
CRM-20858: Set File's Permissions back to 644
Camilo Rodriguez [Tue, 22 Aug 2017 10:26:49 +0000 (10:26 +0000)]
CRM-20858: Fix Merging of Related Tables
Left out selected related tables from affected tables array, which caused
several tests to fail. Merged tables array into affected tables array.
Eileen McNaughton [Tue, 22 Aug 2017 04:27:20 +0000 (16:27 +1200)]
Merge pull request #10878 from seamuslee001/contact_edit_notices
CRM-21075 Replace call to CRM_Core_OptionGroup::getValue with CRM_Cor…
Eileen McNaughton [Tue, 22 Aug 2017 00:29:51 +0000 (12:29 +1200)]
Merge pull request #10885 from MegaphoneJon/CRM-21089
CRM-21089 - CiviSurvey - Fix fatal error on 'Interview Respondents'
eileen [Tue, 22 Aug 2017 00:17:25 +0000 (12:17 +1200)]
NFC comment tidy up
Eileen McNaughton [Mon, 21 Aug 2017 23:37:20 +0000 (11:37 +1200)]
Merge pull request #10705 from eileenmcnaughton/kill_switch_setting
CRM-20905: Make (simple_mail_limit) a configuration instead of h…
eileen [Mon, 21 Aug 2017 22:22:34 +0000 (10:22 +1200)]
NFC remove some unused vars, fix comment
Eileen McNaughton [Mon, 21 Aug 2017 22:12:23 +0000 (10:12 +1200)]
Merge pull request #10881 from civicrm/4.7.24-rc
4.7.24 rc
colemanw [Mon, 21 Aug 2017 20:53:40 +0000 (16:53 -0400)]
Merge pull request #10884 from laryn/BackdropCalls
CRM-21088: Changing drupal calls to backdrop calls
Jon goldberg [Mon, 21 Aug 2017 20:32:04 +0000 (16:32 -0400)]
CRM-21089 - CiviSurvey - Fix fatal error on 'Interview Respondents'
laryn [Mon, 21 Aug 2017 19:33:49 +0000 (14:33 -0500)]
CRM-21088: Changing drupal calls to backdrop calls
Camilo Rodriguez [Mon, 21 Aug 2017 18:10:44 +0000 (18:10 +0000)]
CRM-20858: Remove Try/Catch Blocks that Ignored Caught Exceptions
The try catch blocks were apparently added because not all fields passed were
custom fields, generating exceptions when the API call was made to obtain its
option group. This happened because actually all fields selected for merge
were being inserted into the $submittedCustomFields array, instead of just
custom fields. Plus, obtaining the field's ID on a field that was not custom
rendered strange strings to be used on search of the field, as this ID is
obtained by getting a substring from the field's key, that should have the
format 'move_custom_<fieldid>' (fields that are not custom don't have that
format).
Camilo Rodriguez [Mon, 21 Aug 2017 16:12:00 +0000 (16:12 +0000)]
CRM-20858: Call moveContactBelongings Only Once
moveContactBelongings() was bing called twice, first to move selected related
tables, and the second to move all other tables that reference contacts table.
Refactored moveContactBelongings() method so that it can be called only once,
by calculating in one go the tables that have to be taken into account when
merging, according to what has been selected to move. Basically, it searches
for all tables related to the contact, removes related tables, and then
includes only those related tables selected to be merged.