Coleman Watts [Tue, 29 May 2018 21:16:05 +0000 (17:16 -0400)]
Custom Field form tpl and js cleanup
colemanw [Tue, 29 May 2018 16:48:37 +0000 (12:48 -0400)]
Merge pull request #12227 from laryn/patch-1
Backdrop - update styles for status messages
Laryn - CEDC.org [Tue, 29 May 2018 15:58:45 +0000 (10:58 -0500)]
Update Backdrop styles slightly
Works better with stock and works with Shoreditch enabled as well.
Eileen McNaughton [Mon, 28 May 2018 23:26:42 +0000 (11:26 +1200)]
Merge pull request #10909 from mattwire/CRM-21111_BAO_Activity_getActivities_cleanup
CRM-21111 Refactor include/exclude activity types into it's own function and im…
Matthew Wire [Mon, 28 Aug 2017 12:02:04 +0000 (13:02 +0100)]
Refactor include/exclude activity types into it's own function and improve performance (don't retrieve excluded activity types)
colemanw [Mon, 28 May 2018 16:24:16 +0000 (10:24 -0600)]
Merge pull request #12213 from JMAConsulting/dev_core_142
dev/core#142 Add chain select to state and counties in Search Builder
colemanw [Mon, 28 May 2018 15:35:59 +0000 (09:35 -0600)]
Merge pull request #11739 from JMAConsulting/CRM-19948
CRM-19948: Store Attachment uploader information
Seamus Lee [Mon, 28 May 2018 08:21:29 +0000 (18:21 +1000)]
Merge pull request #12215 from seamuslee001/CRM-21120
CRM-21120 Add environment check for existence of mcrypt function
colemanw [Mon, 28 May 2018 04:54:33 +0000 (22:54 -0600)]
Merge pull request #12206 from eileenmcnaughton/api_encoder
[NFC] minor function tidy up - stop using $ids array
Eileen McNaughton [Mon, 28 May 2018 04:52:23 +0000 (16:52 +1200)]
Merge pull request #12222 from seamuslee001/master
Fix re-delcare issue
Seamus Lee [Mon, 28 May 2018 04:29:06 +0000 (14:29 +1000)]
Fix re-delcare issue
Eileen McNaughton [Sun, 27 May 2018 22:42:29 +0000 (10:42 +1200)]
Merge pull request #12214 from JMAConsulting/dev_core_143
dev/core#143 Contact 'World Region' Field not functioning properly in Search Builder
Eileen McNaughton [Sun, 27 May 2018 22:23:15 +0000 (10:23 +1200)]
Merge pull request #12184 from eileenmcnaughton/entity_form
Remove inheritance of MembershipConfig form from MembershipStatus form.
Eileen McNaughton [Sun, 27 May 2018 22:14:26 +0000 (10:14 +1200)]
Merge pull request #12216 from mattwire/dep_warning
dev/core#128 Add deprecated warning helper function
Eileen McNaughton [Sun, 27 May 2018 21:57:04 +0000 (09:57 +1200)]
Merge pull request #12220 from civicrm/5.2
5.2 merge to master
Eileen McNaughton [Sun, 27 May 2018 21:55:52 +0000 (09:55 +1200)]
Merge pull request #12219 from eileenmcnaughton/case
dev/core#137 Fix Find Deleted Cases
Matthew Wire [Sun, 27 May 2018 15:04:39 +0000 (16:04 +0100)]
Fix Find Deleted Cases
eileen [Wed, 23 May 2018 04:27:13 +0000 (16:27 +1200)]
Make label field on relationship type required again (accidentally removed
eileen [Wed, 23 May 2018 03:23:40 +0000 (15:23 +1200)]
Remove inheritance of MembershipConfig form from MembershipStatus form.
This is part of trying to move towards an entity form (ie. support custom data) for MembershipType.
Currently the 2 forms share a parent class - but really the add buttons is the only shared functionality.
This change uses the EntityTrait to add the buttons as well. There is some minor tidy up in there
but I tried to keep it very limited.
I switched only one field over to being added via addField, the parent mechanism so far
Eileen McNaughton [Sun, 27 May 2018 21:46:33 +0000 (09:46 +1200)]
Merge pull request #12174 from eileenmcnaughton/matt
Towards dev/financial/#16 Paypal unreliable getting payment processor type
Matthew Wire [Sat, 28 Apr 2018 15:15:45 +0000 (16:15 +0100)]
Remove usage of deprecated function from paypal
Matthew Wire [Sun, 27 May 2018 12:13:33 +0000 (13:13 +0100)]
dev/core#128 Add deprecated warning helper function
adixon [Tue, 29 Aug 2017 18:36:01 +0000 (14:36 -0400)]
CRM-21120 Add environment check for existence of mcrypt function
CRM-21120 Use a function-name agnostic test for encrypting powers
CRM-21120 syntax error, missing semi-colon
CRM-21120 Comma problems
deb.monish [Sat, 26 May 2018 19:47:42 +0000 (01:17 +0530)]
dev/core#143 Contact 'World Region' Field not functioning properly in Search Builder
deb.monish [Sat, 26 May 2018 14:21:51 +0000 (19:51 +0530)]
dev/core#142 Add chain select to state and counties in Search Builder
Eileen McNaughton [Fri, 25 May 2018 22:19:00 +0000 (10:19 +1200)]
Merge pull request #12210 from colemanw/dev/core#117
dev/core#117 Replace useage of deprecated each() in MembershpView
Coleman Watts [Fri, 25 May 2018 17:20:40 +0000 (11:20 -0600)]
dev/core#117 Replace useage of deprecated each() in MembershpView
Joe Murray [Fri, 25 May 2018 17:04:54 +0000 (13:04 -0400)]
Merge pull request #12192 from eileenmcnaughton/utils
Further additional utility function for handling odd array structure
colemanw [Fri, 25 May 2018 15:53:56 +0000 (09:53 -0600)]
Merge pull request #12208 from JMAConsulting/access-3-datepicker
dev/accessiblity#3 Add aria-label to datepicker element
deb.monish [Fri, 25 May 2018 12:24:15 +0000 (17:54 +0530)]
dev/accessiblity#3 Add aria-label to datepicker element
eileen [Fri, 25 May 2018 06:07:20 +0000 (18:07 +1200)]
[NFC] minor function tidy up - stop using array.
Also don't set a couple of params that aren't needed
Seamus Lee [Fri, 25 May 2018 05:13:43 +0000 (15:13 +1000)]
Merge pull request #12204 from eileenmcnaughton/api_teste
[NFC] test clean up.
Tim Otten [Fri, 25 May 2018 03:34:10 +0000 (21:34 -0600)]
Merge pull request #11951 from mydropwizard/open-flash-chart-markup
Adjust creation of markup for Open Flash Chart
Eileen McNaughton [Fri, 25 May 2018 03:18:52 +0000 (15:18 +1200)]
Merge pull request #12203 from eileenmcnaughton/api_tester
dev/core#38 Fix inappropriate limit on participant.getcount
Eileen McNaughton [Thu, 24 May 2018 23:49:34 +0000 (11:49 +1200)]
Merge pull request #12199 from seamuslee001/case_core_117
dev/core#117 Replace deprecated each() function in CiviCase
eileen [Thu, 24 May 2018 23:21:37 +0000 (11:21 +1200)]
dev/core#38 Fix inappropriate limit on participant.getcount
eileen [Thu, 24 May 2018 23:20:30 +0000 (11:20 +1200)]
[NFC] test clean up.
Just some basic tidy up, removed a couple of tests that are very much covered by syntaxConformance tests
Seamus Lee [Thu, 24 May 2018 23:07:39 +0000 (09:07 +1000)]
Merge pull request #12202 from seamuslee001/event_core_117
dev/core#117 Replace deprecated each in CiviEvent Participant registr…
Seamus Lee [Thu, 24 May 2018 23:07:11 +0000 (09:07 +1000)]
Merge pull request #12201 from seamuslee001/report_activity_117
dev/core#117 Replace usage of deprecated each() in Activity Summary R…
Eileen McNaughton [Thu, 24 May 2018 22:32:26 +0000 (10:32 +1200)]
Merge pull request #12196 from yashodha/CRM-12186_fix
CRM-21632 - {membership.fee} prints out in documents with 9 decimal p…
Seamus Lee [Thu, 24 May 2018 21:07:36 +0000 (07:07 +1000)]
dev/core#117 Replace usage of deprecated each() in Activity Summary Report
Seamus Lee [Thu, 24 May 2018 21:07:28 +0000 (07:07 +1000)]
dev/core#117 Replace deprecated each in CiviEvent Participant registration
Seamus Lee [Thu, 24 May 2018 21:07:06 +0000 (07:07 +1000)]
dev/core#117 Replace deprecated each() function in CiviCase
colemanw [Thu, 24 May 2018 17:32:49 +0000 (11:32 -0600)]
Merge pull request #12021 from michaelmcandrew/managed-entity-deletion
More robust managed entity deletion
Will Long [Thu, 24 May 2018 16:37:50 +0000 (10:37 -0600)]
Added comment describing obfuscation
yashodha [Thu, 24 May 2018 14:44:35 +0000 (20:14 +0530)]
CRM-21632 - {membership.fee} prints out in documents with 9 decimal places
Monish Deb [Thu, 24 May 2018 08:05:09 +0000 (13:35 +0530)]
Merge pull request #12177 from eileenmcnaughton/test_monish
[NFC] code changes for export with merge household
Eileen McNaughton [Thu, 24 May 2018 07:30:09 +0000 (19:30 +1200)]
Merge pull request #12180 from agileware/CIVICRM-832-5.0
Removing related memberships if parent membership type is changed which does not have relation type associated.
eileen [Thu, 24 May 2018 03:31:21 +0000 (15:31 +1200)]
Further utility on handling odd array structure
Eileen McNaughton [Thu, 24 May 2018 02:45:14 +0000 (14:45 +1200)]
Merge pull request #12191 from seamuslee001/dev_core_135
dev/core#135 Fix remaining non well formed numeric number problems in…
Eileen McNaughton [Thu, 24 May 2018 00:31:24 +0000 (12:31 +1200)]
Merge pull request #12188 from larssg-wildsight/master
dev/core#43 - Update geocoding setting text to reflect need for Google API key
Seamus Lee [Thu, 24 May 2018 00:05:59 +0000 (10:05 +1000)]
dev/core#135 Fix remaining non well formed numeric number problems in CRM_Batch_Form_EntryTest
Seamus Lee [Thu, 24 May 2018 00:03:25 +0000 (10:03 +1000)]
Merge pull request #12190 from seamuslee001/dev_ore_135_a
dev/core#135 Fix first of 2 non numeric issues in CRM_Batch_form_entr…
Seamus Lee [Wed, 23 May 2018 23:53:14 +0000 (09:53 +1000)]
Merge pull request #12189 from seamuslee001/117_report_recur
Dev/Core#117 Fix use of each() function in Recur Report
Seamus Lee [Wed, 23 May 2018 21:55:05 +0000 (07:55 +1000)]
dev/core#135 Fix first of 2 non numeric issues in CRM_Batch_form_entryTest
Seamus Lee [Wed, 23 May 2018 21:35:48 +0000 (07:35 +1000)]
Dev/Core#117 Fix use of each() function in Recur Report
Seamus Lee [Wed, 23 May 2018 21:31:46 +0000 (07:31 +1000)]
Merge pull request #12187 from colemanw/recursive
Add utils for finding nested array items
Coleman Watts [Wed, 23 May 2018 19:42:59 +0000 (13:42 -0600)]
Add utils for finding nested array items
wildsight [Wed, 23 May 2018 19:39:51 +0000 (13:39 -0600)]
Update GetFields.php
wildsight [Wed, 23 May 2018 19:34:38 +0000 (13:34 -0600)]
Update Map.setting.php
wildsight [Wed, 23 May 2018 19:32:45 +0000 (13:32 -0600)]
Update Mapping.tpl
wildsight [Wed, 23 May 2018 19:25:02 +0000 (13:25 -0600)]
Update Mapping.tpl
Michael McAndrew [Wed, 23 May 2018 09:26:50 +0000 (10:26 +0100)]
adding test to ensure dependent entities are uninstalled cleanly
Michael McAndrew [Mon, 23 Apr 2018 11:16:57 +0000 (12:16 +0100)]
Delete entities in the reverse order that they were created
Michael McAndrew [Mon, 23 Apr 2018 11:01:55 +0000 (12:01 +0100)]
always remove entity from civicrm_managed if we think it should be deleted
Alok Patel [Wed, 23 May 2018 07:05:55 +0000 (12:35 +0530)]
CIVICRM-832: Removing related memberships if parent membership type is changed which does not have relation type associated.
deb.monish [Wed, 18 Apr 2018 12:03:46 +0000 (17:33 +0530)]
set default created_id value to BAO
Davi Alexandre [Tue, 31 Jan 2017 20:30:30 +0000 (18:30 -0200)]
CRM-19948: Store the logged in contact ID as the file uploader
Davi Alexandre [Wed, 8 Mar 2017 20:40:04 +0000 (17:40 -0300)]
CRM-19948: Add The created_id field to File
Eileen McNaughton [Tue, 22 May 2018 19:30:09 +0000 (07:30 +1200)]
Merge pull request #12137 from eileenmcnaughton/year_fiscal
Extend fiscal year relative options to better match other periods
Monish Deb [Tue, 22 May 2018 18:01:15 +0000 (23:31 +0530)]
Merge pull request #12182 from michaelmcandrew/dev/mail#10
only add a closing quote if it is not already present
Michael McAndrew [Tue, 22 May 2018 15:28:19 +0000 (16:28 +0100)]
only add a closing quote if it is not already present
Monish Deb [Tue, 22 May 2018 13:13:02 +0000 (18:43 +0530)]
Merge pull request #12169 from seamuslee001/mime_mail_upgrade
Update variable name as per upgraded Mime_mail package to support PHP7.2
eileen [Tue, 22 May 2018 11:11:02 +0000 (23:11 +1200)]
[NFC] stop passing around variables that are cached anyway.
eileen [Tue, 22 May 2018 10:44:25 +0000 (22:44 +1200)]
[NFC] minor variable renaming.
I am working through https://github.com/civicrm/civicrm-core/pull/11870/files &
this is one very minor change that makes sense to commit in isolation
deb.monish [Tue, 22 May 2018 10:24:21 +0000 (15:54 +0530)]
minor fix
Seamus Lee [Sat, 19 May 2018 21:55:26 +0000 (07:55 +1000)]
Update variable name as per upgraded Mime_mail package to support PHP7.2
Monish Deb [Tue, 22 May 2018 09:06:51 +0000 (14:36 +0530)]
Merge pull request #12170 from seamuslee001/php72_pledge_foreach
dev/core#117 Fix use of each in CRM/Pledge
Seamus Lee [Tue, 22 May 2018 04:01:26 +0000 (14:01 +1000)]
Merge pull request #11732 from twomice/CRM-21811_optimize_search_reciprocal_relationship_group
CRM-21811: Optimize advanced search by relationship with target g…
Eileen McNaughton [Mon, 21 May 2018 20:06:06 +0000 (08:06 +1200)]
Merge pull request #12175 from eileenmcnaughton/jamie
dev/core#35 Avoid variable leakage on recurring contribution receipts.
Monish Deb [Mon, 21 May 2018 20:02:22 +0000 (01:32 +0530)]
Merge pull request #11944 from JMAConsulting/access-3-1
(accessibility/misc-core-fixes/issues/3) Remove CMS specific print header templates that share same code
colemanw [Mon, 21 May 2018 12:07:09 +0000 (08:07 -0400)]
Merge pull request #12128 from eileenmcnaughton/cust_extract
Permit UI editing of custom data on other entities (here relationship_type) when enabled in an extension
colemanw [Mon, 21 May 2018 12:03:48 +0000 (08:03 -0400)]
Merge pull request #12155 from seamuslee001/php7_2_each_membership
dev/core#117 Replace use of Deprecated function each in CRM/Member/BA…
colemanw [Mon, 21 May 2018 12:01:13 +0000 (08:01 -0400)]
Merge pull request #12172 from eileenmcnaughton/report_id_filter
dev/core#126 Add support for contact id as a basic report filter.
Eileen McNaughton [Mon, 21 May 2018 11:33:33 +0000 (23:33 +1200)]
Merge pull request #12153 from JMAConsulting/dev_core_116
dev/core#116 Search builder searches on primary addresses are producing unexpected results
Jamie McClelland [Wed, 28 Mar 2018 18:55:50 +0000 (14:55 -0400)]
dev/core#35 Avoid variable leakage on recurring contribution receipts.
This covers pcpParams (which are tested & sets up the data set to extend to honor
params).
See https://lab.civicrm.org/dev/core/issues/35
deb.monish [Fri, 6 Apr 2018 13:25:01 +0000 (18:55 +0530)]
(accessibility/misc-core-fixes/issues/3) Remove CMS specific print header templates that share same code
Eileen McNaughton [Mon, 21 May 2018 03:28:20 +0000 (15:28 +1200)]
Merge pull request #11737 from aydun/CRM-21816-relative-dates-in-search
CRM-21816 Fix Relative dates in search bug
Eileen McNaughton [Mon, 21 May 2018 02:21:59 +0000 (14:21 +1200)]
Merge pull request #12036 from mattwire/mail_unsetcc
dev/core#85 On some servers mail() fails when 'Cc' or 'Bcc' headers are defined but empty
Eileen McNaughton [Mon, 21 May 2018 01:43:03 +0000 (13:43 +1200)]
Merge pull request #12171 from eileenmcnaughton/paypal_ex
Towards dev/financial/#16 Paypal unreliable getting payment processor type
eileen [Mon, 21 May 2018 01:04:03 +0000 (13:04 +1200)]
Add support for contact id as a basic report filter.
This is to address a declared regression https://lab.civicrm.org/dev/core/issues/126 (in 4.7.30) and also to improve flexibility
eileen [Sun, 20 May 2018 23:16:20 +0000 (11:16 +1200)]
Towards dev/financial/#16 Paypal unreliable getting payment processor type
This is a partial reviewer's commit on the work Matt did in
https://github.com/civicrm/civicrm-core/pull/12007#event-
1631874773
It adds the new function & new construct but I spotted an error in
the usage of the function & so want to add the usage changes more slowly
& carefully
Eileen McNaughton [Sun, 20 May 2018 22:51:10 +0000 (10:51 +1200)]
Merge pull request #11679 from jitendrapurohit/CRM-21776
CRM-21776: Ensure from clause adds custom table when search query is …
Eileen McNaughton [Sun, 20 May 2018 21:57:17 +0000 (09:57 +1200)]
Merge pull request #12159 from tschuettler/123-core-particpiant-import-custom-fields
dev/core#123 Retrieve existing participant custom fields for import
Monish Deb [Sun, 20 May 2018 13:07:42 +0000 (18:37 +0530)]
Merge pull request #12156 from seamuslee001/non_numeric_membership_test
Fix issue where non numeric number was encounted in running unit test…
Seamus Lee [Thu, 17 May 2018 21:51:42 +0000 (07:51 +1000)]
Fix issue where non numeric number was encounted in running unit tests on php7.2
Unit Test in api_v3_MembershipTest was throwing an error on the non numeric value of tax_amount, tax_amount was a NULL string.
Seamus Lee [Sun, 20 May 2018 02:29:42 +0000 (12:29 +1000)]
dev/core#117 Fix Pledge each use in CRM/Pledge
Seamus Lee [Thu, 17 May 2018 21:51:33 +0000 (07:51 +1000)]
dev/core#117 Replace use of Deprecated function each in CRM/Member/BAO/Membership.php to assit in supporting php7.2
Rename Variable to be more accurate
Monish Deb [Sat, 19 May 2018 18:27:16 +0000 (23:57 +0530)]
Merge pull request #12162 from seamuslee001/group_query_count
dev/core#118 Fix issue using count on non array in Group query builder
colemanw [Sat, 19 May 2018 18:26:05 +0000 (14:26 -0400)]
Merge pull request #12157 from seamuslee001/pass_by_reference_mailing
Remove pass by reference for some mailing functions