colemanw [Tue, 5 Jun 2018 01:04:24 +0000 (21:04 -0400)]
Merge pull request #12256 from colemanw/CRM-20621
CRM-20621 - Initial cleanup toward performance improvements
Eileen McNaughton [Mon, 4 Jun 2018 21:45:26 +0000 (09:45 +1200)]
Merge pull request #12254 from jitendrapurohit/core-162
dev/core#162 - Use checksum to access user dashboard
Coleman Watts [Mon, 4 Jun 2018 16:31:11 +0000 (12:31 -0400)]
CRM-20621 - Initial cleanup toward performance improvements
colemanw [Mon, 4 Jun 2018 19:35:45 +0000 (15:35 -0400)]
Merge pull request #12241 from michaelmcandrew/dev/core#157
ensure that the indexed column is not an FK before deleting the index
Michael McAndrew [Thu, 31 May 2018 20:39:17 +0000 (21:39 +0100)]
ensure that the indexed column is not an FK before deleting the index
Monish Deb [Mon, 4 Jun 2018 10:08:29 +0000 (15:38 +0530)]
Merge pull request #12248 from colemanw/tagsets
Auto-open tagest fields
Seamus Lee [Mon, 4 Jun 2018 10:03:48 +0000 (20:03 +1000)]
Merge pull request #12249 from hosseinamin/master
fix of issue dev/core#127 (at gitlab), incorrect cache records for smart groups
Monish Deb [Mon, 4 Jun 2018 10:00:31 +0000 (15:30 +0530)]
Merge pull request #12114 from jitendrapurohit/membership-2
dev/membership#2 - Add membership start date and registration start/end date to schedule reminder
Jitendra Purohit [Mon, 4 Jun 2018 09:21:42 +0000 (14:51 +0530)]
dev/core#162 - Use checksum to access user dashboard
Hossein Amin [Sat, 2 Jun 2018 11:03:11 +0000 (14:03 +0300)]
fix for issue dev/core#127, incorrect cache records for smart groups, with testunit
Jitendra Purohit [Mon, 4 Jun 2018 05:16:20 +0000 (10:46 +0530)]
Additional unit test
Seamus Lee [Fri, 1 Jun 2018 21:55:29 +0000 (07:55 +1000)]
Merge pull request #12226 from JMAConsulting/dev_core_147
dev/core#147 Use location type machine name as table alias instead of label
Seamus Lee [Fri, 1 Jun 2018 21:54:03 +0000 (07:54 +1000)]
Merge pull request #12245 from sritechie26/master
getCaseRoles not working when supplied relationship id. civicrm_relationship table name changed to alias name rel because its changed in the actual query
Seamus Lee [Fri, 1 Jun 2018 21:53:43 +0000 (07:53 +1000)]
Merge pull request #12247 from JMAConsulting/dev_mail_12
dev/mail#12 Incorrect Total Count on mail summary report
Coleman Watts [Fri, 1 Jun 2018 20:55:42 +0000 (16:55 -0400)]
Auto-open tagest fields
colemanw [Fri, 1 Jun 2018 18:42:16 +0000 (14:42 -0400)]
Merge pull request #11407 from cividesk/CRM-21553
CRM-21553 : profile duplicate field validation for field with primary location type
deb.monish [Fri, 1 Jun 2018 18:34:30 +0000 (00:04 +0530)]
dev/mail#12 Incorrect Total Count on mail summary report
deb.monish [Tue, 29 May 2018 02:52:49 +0000 (08:22 +0530)]
dev/core#147 Use location type m/c name as table alias instead of label
root [Fri, 1 Jun 2018 13:05:42 +0000 (14:05 +0100)]
civicrm_relationship table name changed to alias name rel, because its changed in the actual query but not in this extra Where condition
colemanw [Fri, 1 Jun 2018 11:52:26 +0000 (07:52 -0400)]
Merge pull request #12225 from jitendrapurohit/core-149
dev/core#149 - Fatal Error on customvalue get api
Jitendra Purohit [Fri, 1 Jun 2018 09:41:04 +0000 (15:11 +0530)]
additional unit test fixes
Eileen McNaughton [Fri, 1 Jun 2018 04:10:05 +0000 (16:10 +1200)]
Merge pull request #12240 from michaelmcandrew/dev/core#156
Only set defaults when creating a custom field (not when editing one)
Seamus Lee [Fri, 1 Jun 2018 01:02:30 +0000 (11:02 +1000)]
Merge pull request #12242 from eileenmcnaughton/up
Move upgrade message to right file
Michael McAndrew [Thu, 31 May 2018 23:50:55 +0000 (00:50 +0100)]
Only set defaults when creating the custom field
eileen [Thu, 31 May 2018 21:45:59 +0000 (09:45 +1200)]
Move upgrade message to right file
colemanw [Thu, 31 May 2018 18:19:36 +0000 (14:19 -0400)]
Merge pull request #12211 from eileenmcnaughton/price
Preliminary tidy up on PriceSet form.
colemanw [Thu, 31 May 2018 18:17:28 +0000 (14:17 -0400)]
Merge pull request #12158 from agileware/Accessibility-Issue-4
Accessibility #4: Make alerts accessible, Added new setting under misc.
Michael McAndrew [Thu, 31 May 2018 13:57:01 +0000 (14:57 +0100)]
Merge pull request #11672 from omarabuhussein/CRM-21769-improve-unsupported-locale-warning
CRM-21769: Show 'unsupported locale for parsing' warning only when enabling address parsing
Alok Patel [Thu, 31 May 2018 12:43:48 +0000 (18:13 +0530)]
Accessibility #4: Make alerts accessible, Added new setting under misc.
Samson Alajede [Thu, 31 May 2018 11:41:50 +0000 (12:41 +0100)]
dev/core#61 Split Edit Message Templates Permission (#11974)
* dev/core#61 split edit message templates permission
Jitendra Purohit [Tue, 29 May 2018 10:39:15 +0000 (16:09 +0530)]
dev/core#149 - Fatal Error on customvalue get api
Eileen McNaughton [Wed, 30 May 2018 20:14:27 +0000 (08:14 +1200)]
Merge pull request #12234 from colemanw/CustomForm
Change custom contact ref groups selector to use select2
Eileen McNaughton [Wed, 30 May 2018 10:34:33 +0000 (22:34 +1200)]
Merge pull request #12229 from mattwire/optionvalue_fixes
Allow saving of new option value with value = 0.
eileen [Fri, 25 May 2018 22:10:41 +0000 (10:10 +1200)]
Preliminary tidy up on PriceSet form.
Switching price set form to using metadata & trait as first step towards making it
custom data aware. Note the form will need to call the api rather than BAO::create
and the tpl will need to be updated before the form is viable for custom data
Matthew Wire [Tue, 29 May 2018 18:45:27 +0000 (19:45 +0100)]
Fix saving option value with value=0
Matthew Wire [Tue, 29 May 2018 18:45:03 +0000 (19:45 +0100)]
Commenting/unused variables
Monish Deb [Wed, 30 May 2018 06:35:15 +0000 (12:05 +0530)]
Merge pull request #12212 from eileenmcnaughton/export_clean
Code cleanup on export
Monish Deb [Wed, 30 May 2018 04:20:06 +0000 (09:50 +0530)]
Merge pull request #12221 from eileenmcnaughton/api_extend_mailing_job
Add api testing / custom data support for MailingJob.
eileen [Mon, 28 May 2018 00:00:13 +0000 (12:00 +1200)]
Add api testing / custom data support for MailingJob.
There is no specific requirement for MailingJob to have custom data - but
this is generally part of standardising all entities to support custom
data (ie. workign through the list in
api_v3_SyntaxConformanceTest:toBeSkipped_custom_data_creatable
to remove the remaining rows.
Fix some places to call create instead of saving mailing job to trigger hooks.
Lars SG [Tue, 29 May 2018 22:48:24 +0000 (16:48 -0600)]
dev/core#43 - [Update] to Update geocoding setting text to reflect need for Google API key (#12232)
dev/core#43 - [Update] to Update geocoding setting text to reflect need for Google API key
Coleman Watts [Tue, 29 May 2018 21:22:29 +0000 (17:22 -0400)]
Change custom contact ref groups selector to use select2
Eileen McNaughton [Tue, 29 May 2018 21:16:51 +0000 (09:16 +1200)]
Merge pull request #12205 from eileenmcnaughton/soft_error
dev/core#139 Fail more gracefully on contribution detail report with invalid combination
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 [Fri, 25 May 2018 00:18:34 +0000 (12:18 +1200)]
Fail more gracefully when attempting to use a soft credit filter but not including soft credits.
For better or worse this report munges soft credits & contributions in a very wierd way.
It currently hard fails if you try to search for 'contributions only' but include
a soft credit criteria, although there appears to have been an effort to block this in the past.
It might be nice to add that filter but restructuring the report to make it testable
should be a pre-requisite for that - so for now, let's address the fatal
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 [Thu, 22 Feb 2018 02:21:47 +0000 (15:21 +1300)]
Refactor towards fixing / reviewing export issues
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