Seamus Lee [Sat, 3 Nov 2018 23:00:04 +0000 (10:00 +1100)]
Fix unit tests following merge of PR #12797
Eileen McNaughton [Fri, 2 Nov 2018 21:29:39 +0000 (10:29 +1300)]
Merge pull request #12797 from madhavimalgaonkar/CRM-287
CRM-287 Disable child groups if all parents are disabled
Eileen McNaughton [Fri, 2 Nov 2018 10:10:34 +0000 (23:10 +1300)]
Merge pull request #13056 from eileenmcnaughton/qs_follow_up
Remove limit when choosing fields for quick search
eileen [Fri, 2 Nov 2018 07:37:50 +0000 (20:37 +1300)]
Remove when choosing fields for quick search
Eileen McNaughton [Fri, 2 Nov 2018 02:05:07 +0000 (15:05 +1300)]
Merge pull request #13039 from colemanw/quicksearchSetting
Configurable quicksearch settings
Eileen McNaughton [Fri, 2 Nov 2018 01:25:34 +0000 (14:25 +1300)]
Merge pull request #13055 from mfb/cleanup-query-logic
cleanup query logic - followup on GH-12991
Seamus Lee [Fri, 2 Nov 2018 01:05:33 +0000 (12:05 +1100)]
Merge pull request #12818 from mattwire/contributionsearch_byrecurtrxnprocessor
Allow contribution search by recurring payment processor ID / Transaction ID
colemanw [Fri, 2 Nov 2018 00:36:54 +0000 (20:36 -0400)]
Merge pull request #13014 from eileenmcnaughton/strlen
Prevent hard error when a string is too long for a field.
Seamus Lee [Fri, 2 Nov 2018 00:28:52 +0000 (11:28 +1100)]
Merge pull request #13035 from eileenmcnaughton/strtolower_name
Strtolower fix 'name'
Seamus Lee [Fri, 2 Nov 2018 00:26:45 +0000 (11:26 +1100)]
Merge pull request #13034 from eileenmcnaughton/strtolower_rels
Remove lowercasing in relationship query
mark burdett [Thu, 1 Nov 2018 23:49:29 +0000 (16:49 -0700)]
cleanup query logic - followup on GH-12991
Eileen McNaughton [Thu, 1 Nov 2018 20:13:40 +0000 (09:13 +1300)]
Merge pull request #13047 from eileenmcnaughton/settings_contribution_prefs
Finish unsharing hacks for contribution preferences form
colemanw [Thu, 1 Nov 2018 17:21:48 +0000 (13:21 -0400)]
Merge pull request #13049 from JKingsnorth/event-start-required
Mark event start date as required and refactoring
Coleman Watts [Wed, 31 Oct 2018 19:48:02 +0000 (15:48 -0400)]
Support custom fields with option lists in quicksearch
JKingsnorth [Thu, 1 Nov 2018 12:00:48 +0000 (12:00 +0000)]
Mark event start date as required and refactor formRule
eileen [Thu, 1 Nov 2018 02:02:39 +0000 (15:02 +1300)]
Finish fixing contribute preferences & preferences form to isolate hacks into one form
Eileen McNaughton [Thu, 1 Nov 2018 11:04:46 +0000 (00:04 +1300)]
Merge pull request #13046 from eileenmcnaughton/settings_address
[NFC] Preferences form template cleanup
Eileen McNaughton [Thu, 1 Nov 2018 10:57:53 +0000 (23:57 +1300)]
Merge pull request #13048 from eileenmcnaughton/resource-urls
Update casing on setting metadata for html_type = text
eileen [Thu, 1 Nov 2018 07:26:18 +0000 (20:26 +1300)]
Update casing on setting metadata for html_type = text
We have conventionally 'preferred' quick_form_type but we we not 'prefer' the more generic html_type.
We are fixing the places where the casing is inconsistent to support this
eileen [Thu, 1 Nov 2018 02:02:39 +0000 (15:02 +1300)]
post if-clause removal whitespace
eileen [Thu, 1 Nov 2018 02:02:15 +0000 (15:02 +1300)]
Remove if clauses that no longer apply
eileen [Thu, 1 Nov 2018 02:00:22 +0000 (15:00 +1300)]
Remove Contribute.tpl specific code from basicForm.tpl
Contribute.tpl no longer shares this form
eileen [Thu, 1 Nov 2018 01:59:08 +0000 (14:59 +1300)]
Move basicForm.tpl in it's entirity into Contribute.tpl.
Contribute.tpl no longer relies on basicForm.tpl so we can clean that up now
eileen [Thu, 1 Nov 2018 01:57:37 +0000 (14:57 +1300)]
Extract sharable portion of basicForm to basicFormFields.
This is part of disentangling the invoicing mess out of the shared code
Seamus Lee [Thu, 1 Nov 2018 00:28:02 +0000 (11:28 +1100)]
Merge pull request #13043 from christianwach/issue-wp-12
Pass path through rawurlencode when not using CIVICRM_CLEANURL
Seamus Lee [Wed, 31 Oct 2018 22:05:40 +0000 (09:05 +1100)]
Merge pull request #12969 from christianwach/issue-460
Fix malformed redirect URLs
Eileen McNaughton [Wed, 31 Oct 2018 20:52:52 +0000 (09:52 +1300)]
Merge pull request #13040 from eileenmcnaughton/setting_display
Convert final settings on the Display form
Christian Wach [Wed, 31 Oct 2018 14:51:34 +0000 (14:51 +0000)]
Pass path through rawurlencode when not using CIVICRM_CLEANURL
Coleman Watts [Tue, 30 Oct 2018 21:24:27 +0000 (17:24 -0400)]
Update db for new setting
Coleman Watts [Tue, 30 Oct 2018 18:52:07 +0000 (14:52 -0400)]
Confiurable quicksearch settings
Eileen McNaughton [Wed, 31 Oct 2018 01:50:02 +0000 (14:50 +1300)]
Merge pull request #13036 from yashodha/dev-491
(dev/core#491) Report results don't show inactive campaigns
Eileen McNaughton [Wed, 31 Oct 2018 01:45:45 +0000 (14:45 +1300)]
Merge pull request #13031 from compucorp/fix-custom-home-url-parsing
Fix custom Home URL parsing
eileen [Wed, 31 Oct 2018 00:13:04 +0000 (13:13 +1300)]
Convert final settings on the Display form
Eileen McNaughton [Tue, 30 Oct 2018 23:44:27 +0000 (12:44 +1300)]
Merge pull request #13004 from eileenmcnaughton/setting_address
Fix e-notices on Address settings page, convert YesNo field
eileen [Wed, 24 Oct 2018 20:56:10 +0000 (09:56 +1300)]
Fix e-notices on Address settings page, convert YesNo field
This fixes enotices & also does our first preferences conversion of a YesNo / Radio field
Seamus Lee [Tue, 30 Oct 2018 21:10:49 +0000 (08:10 +1100)]
Merge pull request #13027 from eileenmcnaughton/settings_event
Fix notices on event settings form
Seamus Lee [Tue, 30 Oct 2018 20:32:59 +0000 (07:32 +1100)]
Merge pull request #12769 from mattwire/civievent_permissions
Fix caching issues with Event permissions
Eileen McNaughton [Tue, 30 Oct 2018 19:44:59 +0000 (08:44 +1300)]
Merge pull request #13001 from JKingsnorth/core-456
dev/core#456 Improve UX of scheduling mass SMS
Eileen McNaughton [Tue, 30 Oct 2018 19:42:20 +0000 (08:42 +1300)]
Merge pull request #13018 from colemanw/iconTabs
Add icons to contact summary tabs
Davi Alexandre [Tue, 30 Oct 2018 14:53:04 +0000 (11:53 -0300)]
Extract duplicated URL processing code
Coleman Watts [Tue, 30 Oct 2018 16:30:22 +0000 (12:30 -0400)]
Also update markup in TabHeader.tpl for consistency
Coleman Watts [Tue, 30 Oct 2018 15:00:03 +0000 (11:00 -0400)]
Add span around tab titles
yashodha [Tue, 30 Oct 2018 09:06:57 +0000 (14:36 +0530)]
(dev/core#491) Report results don't show inactive campaigns
Madhavi [Tue, 30 Oct 2018 07:55:56 +0000 (13:25 +0530)]
CRM-20236 Added participant note column (#13029)
* CRM-20236 Added participant note column in Event Participant Listing report
* fix code style warnings and switch to $this->isTableSelected
Seamus Lee [Tue, 30 Oct 2018 05:59:01 +0000 (16:59 +1100)]
Merge pull request #12986 from seamuslee001/lab_core_463
dev/core#463 Add in ability for Extensions to use their Extension Utils class to s…
Seamus Lee [Tue, 30 Oct 2018 04:29:28 +0000 (15:29 +1100)]
Merge pull request #13033 from seamuslee001/icon_style_guide_5_8
Duplicate upgrade step for 5.7.beta1 in 5.8.alpha1 to capture anyone …
Seamus Lee [Tue, 23 Oct 2018 00:08:30 +0000 (11:08 +1100)]
dev/core#463 Add in ability for Extensions to use their Extension Utils class to supply ts Functions in DAOs
Update DAO generation using ts function name as per conversation with Tim
eileen [Mon, 29 Oct 2018 07:37:04 +0000 (20:37 +1300)]
Fix event preferences form
eileen [Mon, 29 Oct 2018 23:09:11 +0000 (12:09 +1300)]
Strtolower fix 'name'
eileen [Mon, 29 Oct 2018 23:02:40 +0000 (12:02 +1300)]
Remove lowercasing in relationship query
Seamus Lee [Mon, 29 Oct 2018 22:39:18 +0000 (09:39 +1100)]
Duplicate upgrade step for 5.7.beta1 in 5.8.alpha1 to capture anyone who has already upgrade to RC
Eileen McNaughton [Mon, 29 Oct 2018 22:28:14 +0000 (11:28 +1300)]
Merge pull request #13032 from civicrm/5.7
5.7 to master
Eileen McNaughton [Mon, 29 Oct 2018 22:27:47 +0000 (11:27 +1300)]
Merge pull request #13015 from colemanw/memberIcon
Update menu icons to follow style guide
Eileen McNaughton [Mon, 29 Oct 2018 22:27:29 +0000 (11:27 +1300)]
Merge pull request #13026 from eileenmcnaughton/campaign_prefs
Fix notices on Campaign preferences form
Matthew Wire (MJW Consulting) [Mon, 29 Oct 2018 21:21:58 +0000 (21:21 +0000)]
Add more unit tests for Event permissions
Eileen McNaughton [Mon, 29 Oct 2018 21:48:28 +0000 (10:48 +1300)]
Merge pull request #12978 from mattwire/datepicker_manageevent_search
Convert event search to datepicker and cleanup template
Matthew Wire (MJW Consulting) [Mon, 29 Oct 2018 21:34:10 +0000 (21:34 +0000)]
Further tweaks to contribution search recurring fields (@kirk-jackson)
Matthew Wire (MJW Consulting) [Thu, 16 Aug 2018 16:51:03 +0000 (17:51 +0100)]
Refactor Event::checkPermissions to resolve issues with caching
Seamus Lee [Mon, 29 Oct 2018 20:48:29 +0000 (07:48 +1100)]
Merge pull request #13030 from MegaphoneJon/core-477
Closes core#477 - display employer/title/group info in print summary
Coleman Watts [Fri, 26 Oct 2018 14:08:20 +0000 (10:08 -0400)]
Add icons to contact summary tabs
Coleman Watts [Fri, 26 Oct 2018 03:29:29 +0000 (23:29 -0400)]
Update menu icons to follow style guide
Eileen McNaughton [Mon, 29 Oct 2018 19:48:30 +0000 (08:48 +1300)]
Merge pull request #13019 from seamuslee001/lab_core_481
dev/core#481 Ensure that Bulk Mailings is a checkbox rather than radi…
eileen [Mon, 29 Oct 2018 06:23:10 +0000 (19:23 +1300)]
Fix campaign preferences form
Seamus Lee [Mon, 29 Oct 2018 19:42:10 +0000 (06:42 +1100)]
Merge pull request #13025 from eileenmcnaughton/multisite_settings
Fix notices on Multisite settings form
Eileen McNaughton [Mon, 29 Oct 2018 19:37:36 +0000 (08:37 +1300)]
Merge pull request #13028 from yashodha/report-fixes
CRM-21677 - more report clean up
Davi Alexandre [Mon, 29 Oct 2018 18:54:27 +0000 (15:54 -0300)]
Support URL fragments in custom Home URLs
Davi Alexandre [Mon, 29 Oct 2018 18:46:27 +0000 (15:46 -0300)]
Avoid E_NOTICE when Home URL does not contain a query string
The list assignment will result in an E_NOTICE when the Home URL does
not contain a query string, because the array returned by the explode()
call will contain only one item.
Davi Alexandre [Mon, 29 Oct 2018 18:26:08 +0000 (15:26 -0300)]
Remove unused variable and param
Jon Goldberg [Mon, 29 Oct 2018 15:23:32 +0000 (11:23 -0400)]
Closes core#477 - display employer/title/group info in print summary
colemanw [Mon, 29 Oct 2018 12:29:29 +0000 (08:29 -0400)]
Merge pull request #13006 from seamuslee001/lab_core_472
dev/core#472 Allow for APIv3 to find examples in Extenion folders as …
Eileen McNaughton [Mon, 29 Oct 2018 11:41:16 +0000 (00:41 +1300)]
Merge pull request #12586 from eileenmcnaughton/dao_in_export
Export code cleanup: Convert relationships to pseudonames at the point of loading
eileen [Mon, 29 Oct 2018 06:01:07 +0000 (19:01 +1300)]
Fix multisite form to work off SettingTrait
Eileen McNaughton [Mon, 29 Oct 2018 11:00:53 +0000 (00:00 +1300)]
Merge pull request #13023 from eileenmcnaughton/mailing_settings
Fix notices on mailing components screen, convert to metadata based
Andrew Hunt [Mon, 29 Oct 2018 10:43:37 +0000 (06:43 -0400)]
CRM-14098 Membership reminders: don't exclude people who inherit other memberships (#12510)
* CRM-14098 Membership reminders: don't exclude people who inherit other memberships
* Membership reminders: test had two reminders with same name, differing params
* CRM-14098 Membership reminders: test for inherited members
----------------------------------------
* CRM-14098: Scheduled reminders silently skipped for contacts with a non-permissioned relationship associated with ANY inherited membership type
https://issues.civicrm.org/jira/browse/CRM-14098
* Membership reminders: comments to document some shaky assumptions
* CRM-14098 Membership reminders: fix relies on joins, causing DB error on repeat
* CRM-14098 Membership reminders: missing alias on date field
* CRM-14098 Reminders test: explicitly make emails primary
yashodha [Mon, 29 Oct 2018 08:51:32 +0000 (14:21 +0530)]
CRM-21677 - more report clean up
Seamus Lee [Mon, 29 Oct 2018 07:14:57 +0000 (18:14 +1100)]
Merge pull request #12993 from eileenmcnaughton/strtolower_mailing
Remove use of LOWER from mailing_name searches
Seamus Lee [Mon, 29 Oct 2018 07:13:53 +0000 (18:13 +1100)]
Merge pull request #12987 from eileenmcnaughton/strtolower_sort
Remove instances of LOWER casing searches from sort_name, display_name
Seamus Lee [Mon, 29 Oct 2018 07:12:49 +0000 (18:12 +1100)]
Merge pull request #12988 from eileenmcnaughton/strtolower_email
Remove instances of LOWER casing searches from
Seamus Lee [Mon, 29 Oct 2018 07:11:45 +0000 (18:11 +1100)]
Merge pull request #12991 from eileenmcnaughton/strtolower_city
Remove use of LOWER from city & street searches
eileen [Mon, 29 Oct 2018 02:18:07 +0000 (15:18 +1300)]
Fix notices on mailing components screen, convert to metadata based
Seamus Lee [Mon, 29 Oct 2018 07:06:42 +0000 (18:06 +1100)]
Merge pull request #13022 from eileenmcnaughton/contribution_settings
Fix Contribution settings form per dev/core/473
Seamus Lee [Wed, 24 Oct 2018 23:54:55 +0000 (10:54 +1100)]
dev/core#472 Allow for APIv3 to find examples in Extenion folders as well as core
Improve inclusion scanning by using get_include_path as suggested by Coleamn and alpha sort the list of entities
Deal with windows directory separators and more helpfully handle the trailing and non trailing slash directories
Further fixes for windows Directory Separators
eileen [Mon, 29 Oct 2018 00:29:09 +0000 (13:29 +1300)]
Fix Contribution settings form per dev/core/473
colemanw [Sun, 28 Oct 2018 00:49:17 +0000 (20:49 -0400)]
Merge pull request #13021 from mattwire/caseactivity_array
Activities can be linked to multiple cases. Handle caseIds being an array
Matthew Wire (MJW Consulting) [Sat, 27 Oct 2018 20:01:55 +0000 (21:01 +0100)]
Activities can be linked to multiple cases. Handle caseIds being an array
Seamus Lee [Sat, 27 Oct 2018 04:51:30 +0000 (15:51 +1100)]
dev/core#481 Ensure that Bulk Mailings is a checkbox rather than radio to allow for users even when only 1 bulk mailing setting to unset bulk mailing
Fix UI handling when in multiple bulk email mode
eileen [Thu, 25 Oct 2018 11:34:43 +0000 (00:34 +1300)]
Fix double handling of fields with unique names.
The relationship array is being built with 'names' & the main array with 'unique names' which later need to be wrangled back into sync. Do relationships the same as main array
Eileen McNaughton [Sat, 27 Oct 2018 02:58:23 +0000 (15:58 +1300)]
Merge pull request #13017 from yashodha/dev-479
(dev/core#479) Contribution Summary report throw DB error with custom…
eileen [Sat, 28 Jul 2018 04:38:28 +0000 (16:38 +1200)]
Convert relationships to pseudonames at the point of loading
Eileen McNaughton [Sat, 27 Oct 2018 02:44:29 +0000 (15:44 +1300)]
Merge pull request #12736 from calbasi/master
Style improvement of radio form elements
Seamus Lee [Fri, 26 Oct 2018 22:50:57 +0000 (09:50 +1100)]
Merge pull request #13008 from eileenmcnaughton/activity_src
Fix Activity api to cope with renamed record type labels (e.g renaming 'Target' to 'Directed At')
Seamus Lee [Fri, 26 Oct 2018 20:31:54 +0000 (07:31 +1100)]
Merge pull request #13010 from jitendrapurohit/core-474
dev/core#474 - Show missing log table warning only if logging is enabled
yashodha [Fri, 26 Oct 2018 06:18:35 +0000 (11:48 +0530)]
(dev/core#479) Contribution Summary report throw DB error with custom data and soft credit fields
Jitendra Purohit [Thu, 25 Oct 2018 11:20:02 +0000 (16:50 +0530)]
dev/core#474 - Show missing log table warning only if logging is enabled
eileen [Fri, 26 Oct 2018 00:57:48 +0000 (13:57 +1300)]
Prevent hard error when a string is too long for a field.
Over time we have had various requests to extend the length of various
fields (currently https://github.com/civicrm/civicrm-core/pull/12939 ).
The main issue is not that it matters to capture every single character of
a crazy long user entered field - but that a hard fail when the data is too long can lose payment or registration or other data & provide a bad
experience.
This PR makes it still save, with a logged message & the utf friendly
function in play. As of writing the api validation is stilltight - see
```
// Check our field length
throw new API_Exception("Value for $fieldName is " . strlen(utf8_decode($value)) . " characters - This field has a maxlength of {$fieldInfo['maxlength']} characters.",
2100, array('field' => $fieldName)
);
}
```
and changing this is up for discussion.
Note that at the UI level max field lengths can be enforced by using
addField which uses metadata to determine field length etc
Eileen McNaughton [Thu, 25 Oct 2018 21:30:38 +0000 (10:30 +1300)]
Merge pull request #12971 from mattwire/entityfields_metadatadescription
Use description from schema if available when using entityForm
colemanw [Thu, 25 Oct 2018 21:28:30 +0000 (17:28 -0400)]
Merge pull request #13005 from eileenmcnaughton/dao_desc_ts
Translate description in DAO files
colemanw [Thu, 25 Oct 2018 21:20:27 +0000 (17:20 -0400)]
Merge pull request #13003 from agh1/obsoleteIcons
Replace translation and calendar image icons
Seamus Lee [Thu, 25 Oct 2018 20:30:49 +0000 (07:30 +1100)]
Merge pull request #12979 from mattwire/datepicker_eventparticipant_register
Convert Event Participant Registration Date to datepicker
colemanw [Thu, 25 Oct 2018 16:20:48 +0000 (12:20 -0400)]
Merge pull request #12957 from scardinius/core-457
[dev/core#457] Add $ids to hook_civicrm_export