Seamus Lee [Fri, 28 Sep 2018 04:59:47 +0000 (14:59 +1000)]
Merge pull request #12877 from colemanw/MailingComponentDAO
Regenerate MailingComponent DAO file to reflect recent changes
Eileen McNaughton [Fri, 28 Sep 2018 01:16:06 +0000 (13:16 +1200)]
Merge pull request #12790 from alifrumin/core362
dev/core#362 fix search functionality of contact reference fields in On Behalf Profiles
Eileen McNaughton [Fri, 28 Sep 2018 01:14:23 +0000 (13:14 +1200)]
Merge pull request #12874 from seamuslee001/lab_core_410
dev/core#410 Ensure that Email related fields in Scheduled Reminders …
Eileen McNaughton [Thu, 27 Sep 2018 23:01:31 +0000 (11:01 +1200)]
Merge pull request #12867 from mattwire/entityformajaxcustomdatafreeze
Freeze custom data elements when viewing an entity
Coleman Watts [Thu, 27 Sep 2018 20:05:39 +0000 (16:05 -0400)]
Regenerate MailingComponent DAO file to reflect recent changes
Alice Frumin [Thu, 6 Sep 2018 18:08:45 +0000 (14:08 -0400)]
dev/core#362 fixing contact reference fields on On Behalf Profiles search and select functionality
Seamus Lee [Thu, 27 Sep 2018 05:35:10 +0000 (15:35 +1000)]
dev/core#410 Ensure that Email related fields in Scheduled Reminders are not required when creating an SMS reminder and ensure that SMS Text Message field is required when creating an SMS reminder
Seamus Lee [Wed, 26 Sep 2018 09:34:55 +0000 (19:34 +1000)]
Merge pull request #12871 from civicrm/5.6
Merge 5.6 to master
Matthew Wire (MJW Consulting) [Tue, 25 Sep 2018 10:41:30 +0000 (11:41 +0100)]
Freeze custom data elements when viewing an entity
colemanw [Tue, 25 Sep 2018 15:32:21 +0000 (11:32 -0400)]
Merge pull request #12855 from colemanw/dev/core#391
dev/core#391 - Fix saving tags in profile
Coleman Watts [Fri, 21 Sep 2018 17:48:35 +0000 (13:48 -0400)]
dev/core#391 - Fix saving tags in profile
Eileen McNaughton [Tue, 25 Sep 2018 02:37:14 +0000 (14:37 +1200)]
Merge pull request #12865 from civicrm/5.6
5.6
Eileen McNaughton [Tue, 25 Sep 2018 00:28:02 +0000 (12:28 +1200)]
Merge pull request #12833 from mattwire/relationshipform_fix
dev/399 Fix saving of relationship permissions when relationship is b_a on form
Eileen McNaughton [Tue, 25 Sep 2018 00:27:17 +0000 (12:27 +1200)]
Merge pull request #12728 from pradpnayak/MailingComponent
Renamed Mailing Component entity
Eileen McNaughton [Mon, 24 Sep 2018 20:35:47 +0000 (08:35 +1200)]
Merge pull request #12863 from civicrm/5.6
5.6 to master
colemanw [Mon, 24 Sep 2018 19:35:42 +0000 (15:35 -0400)]
Merge pull request #12672 from eileenmcnaughton/fix_location_export_labels
Export code improvement
Coleman Watts [Mon, 24 Sep 2018 17:48:26 +0000 (13:48 -0400)]
Rename MailingComponent BAO
Coleman Watts [Mon, 24 Sep 2018 13:42:00 +0000 (09:42 -0400)]
Further fix to permission fields on relationship form
colemanw [Mon, 24 Sep 2018 12:46:14 +0000 (08:46 -0400)]
Merge pull request #12861 from eileenmcnaughton/locked
Fix typo in 5.5 upgrade script
eileen [Sun, 23 Sep 2018 08:04:51 +0000 (20:04 +1200)]
Fix typo in 5.5 upgrade script
Eileen McNaughton [Sun, 23 Sep 2018 22:05:46 +0000 (10:05 +1200)]
Merge pull request #12847 from mmyriam/patch-1
Add span to amount label in Confirm.tpl
colemanw [Sun, 23 Sep 2018 16:12:25 +0000 (12:12 -0400)]
Merge pull request #12858 from eileenmcnaughton/this
Fix typo
eileen [Sun, 23 Sep 2018 00:03:50 +0000 (12:03 +1200)]
Fix typo
https://lab.civicrm.org/dev/core/issues/402
Seamus Lee [Sat, 22 Sep 2018 20:34:12 +0000 (06:34 +1000)]
Merge pull request #12856 from seamuslee001/dev_core_281
dev/core#281 Fix invoice number in message template
Eileen McNaughton [Sat, 22 Sep 2018 01:28:15 +0000 (13:28 +1200)]
Merge pull request #12800 from mattwire/relationshiptab_format
Improve display of relationships tab
Eileen McNaughton [Sat, 22 Sep 2018 01:25:44 +0000 (13:25 +1200)]
Merge pull request #12854 from mattwire/cc_contribution_clears_email2
When submitting a standalone credit card contribution the contact email address should not be deleted
yashodha [Thu, 26 Jul 2018 07:13:25 +0000 (12:43 +0530)]
dev/core#281 Fix invoice number in message template
shift upgrade to 5.7.alpha1 and Get passing unit tests where template didn't exist before 4.6.alpha1
Seamus Lee [Fri, 21 Sep 2018 22:05:55 +0000 (08:05 +1000)]
Merge pull request #12773 from eileenmcnaughton/perf_conts
Use cached function for financialAccount retrieval.
Matthew Wire (MJW Consulting) [Fri, 21 Sep 2018 11:50:58 +0000 (12:50 +0100)]
Remove redundant code to get email address which we've already retrieved
Matthew Wire (MJW Consulting) [Fri, 21 Sep 2018 11:44:21 +0000 (12:44 +0100)]
When submitting a standalone credit card contribution the contact email address should not be deleted
colemanw [Fri, 21 Sep 2018 02:21:50 +0000 (22:21 -0400)]
Merge pull request #12853 from seamuslee001/nfc_case_dashboad
NFC Fix overindenting in caseDashboard template
Seamus Lee [Fri, 21 Sep 2018 02:20:06 +0000 (12:20 +1000)]
NFC Fix overindenting in caseDashboard template
Eileen McNaughton [Fri, 21 Sep 2018 02:15:29 +0000 (14:15 +1200)]
Merge pull request #12849 from seamuslee001/case_dashboard_indent_fix
(NFC) Fix indenting of Case DashBoard.tpl
colemanw [Fri, 21 Sep 2018 01:38:50 +0000 (21:38 -0400)]
Merge pull request #12748 from compucorp/370-no-new-tasks-and-documents-get-added-to-workflow
dev/core#370: No new tasks and documents get added to workflow
Seamus Lee [Fri, 21 Sep 2018 00:13:10 +0000 (10:13 +1000)]
Merge pull request #12846 from eileenmcnaughton/activitytest
[NFC] Add unit test to cover component ACLs.
Eileen McNaughton [Thu, 20 Sep 2018 22:50:47 +0000 (10:50 +1200)]
Merge pull request #12852 from eileenmcnaughton/master
5.6 to Master
eileen [Thu, 20 Sep 2018 22:48:29 +0000 (10:48 +1200)]
Merge branch '5.6' of https://github.com/civicrm/civicrm-core
Change-Id: I2dd0a9d8f83fe13b7f731db0b959a67e3dd0ae9f
Eileen McNaughton [Thu, 20 Sep 2018 22:42:04 +0000 (10:42 +1200)]
Merge pull request #12844 from totten/5.6-asg-opt-group
(dev/core#107) Fix regression which prevents editing CiviCase configuration
Seamus Lee [Thu, 20 Sep 2018 22:12:24 +0000 (08:12 +1000)]
Merge pull request #12850 from civicrm/5.6
5.6
Seamus Lee [Thu, 20 Sep 2018 22:11:55 +0000 (08:11 +1000)]
Merge pull request #12845 from eileenmcnaughton/activity56
Partial revert of pull/12559
Seamus Lee [Thu, 20 Sep 2018 22:04:54 +0000 (08:04 +1000)]
(NFC) Fix indenting of Case DashBoard.tpl
Seamus Lee [Thu, 20 Sep 2018 21:55:40 +0000 (07:55 +1000)]
Merge pull request #12848 from gah242s/patch-5
Remove Stray Extra Div in Case Dashboard TPL
Tim Otten [Thu, 20 Sep 2018 19:39:48 +0000 (12:39 -0700)]
(dev/core#107) civicrm_data.tpl - Fix typo
gah242s [Thu, 20 Sep 2018 18:42:32 +0000 (14:42 -0400)]
Update DashBoard.tpl
Looks like there is an extra </div> tag at the bottom of this file. The WordPress footer was coming up into the middle of the page. Discussion threads on MM:
https://chat.civicrm.org/civicrm/pl/9eywqazzt3yb5e49jg9yh71rfh
https://chat.civicrm.org/civicrm/pl/taebbfneutyrfdh7ed9srhoiwy
mmyriam [Thu, 20 Sep 2018 15:45:43 +0000 (11:45 -0400)]
Update Confirm.tpl
Added span to amount label.
eileen [Thu, 20 Sep 2018 06:42:26 +0000 (18:42 +1200)]
Remove some unused variables
eileen [Thu, 20 Sep 2018 06:35:23 +0000 (18:35 +1200)]
Add unit test to cover component ACLs.
This adds a unit test and does a very minor cleanup making the return a little clearer
eileen [Thu, 20 Sep 2018 06:28:10 +0000 (18:28 +1200)]
Partial revert of pull/12559
https://github.com/civicrm/civicrm-core/pull/12559/files is currently in RC.
While we find that this change improves performance and we are running it in production
we have identified that performance is very poor in the specific scenario where only
email is linked to 39000 assignees - in this case it was an old experimental civimail
activity. In the interests of prudence I am reverting the parts that switch function
in the rc.
Tim Otten [Thu, 20 Sep 2018 03:25:57 +0000 (20:25 -0700)]
(dev/core#107) Upgrader - Re-run addActivityDefaultAssigneeOptions() for 5.4/5.5 sites
Tim Otten [Thu, 20 Sep 2018 03:19:47 +0000 (20:19 -0700)]
(dev/core#107) Update civircrm_generated.mysql
Based on a call to `bin/regen.sh`
Tim Otten [Wed, 19 Sep 2018 20:21:51 +0000 (13:21 -0700)]
(dev/core#107) Add the required option group to the default data template
Tim Otten [Thu, 20 Sep 2018 03:17:20 +0000 (20:17 -0700)]
Set version to 5.6.beta2
eileen [Wed, 5 Sep 2018 04:36:05 +0000 (16:36 +1200)]
Cache payment instrument financial ids.
I don't really see any value in this calling a shared function as it fails to simplify
eileen [Wed, 5 Sep 2018 01:40:57 +0000 (13:40 +1200)]
Use cached function for financialAccount retrieval.
In performance testing I find that when inserting 100 contributions this change
saves 198 queries by using an alternative that is cached
colemanw [Wed, 19 Sep 2018 13:12:15 +0000 (09:12 -0400)]
Merge pull request #12774 from colemanw/pledgePicker
Cleanup pledge form to use datepicker
Eileen McNaughton [Wed, 19 Sep 2018 01:59:55 +0000 (13:59 +1200)]
Merge pull request #12840 from eileenmcnaughton/master
5.6 to Master
eileen [Wed, 19 Sep 2018 01:58:16 +0000 (13:58 +1200)]
Merge branch '5.6' of https://github.com/civicrm/civicrm-core
Eileen McNaughton [Wed, 19 Sep 2018 01:51:57 +0000 (13:51 +1200)]
Merge pull request #12837 from colemanw/basicTpl
Fix html wrapper on basic summary block
Seamus Lee [Tue, 18 Sep 2018 22:14:18 +0000 (08:14 +1000)]
Merge pull request #12838 from civicrm/JoeMurray-patch-1
NFC: fix grammar/punctuation in help
Joe Murray [Tue, 18 Sep 2018 20:03:44 +0000 (16:03 -0400)]
NFC: fix grammar/punctuation in help
Coleman Watts [Tue, 18 Sep 2018 16:07:28 +0000 (12:07 -0400)]
Fix html wrapper on basic summary block
colemanw [Tue, 18 Sep 2018 15:31:06 +0000 (11:31 -0400)]
Merge pull request #12830 from colemanw/emptyProfileTags
Allow profile.submit api for tags
Coleman Watts [Mon, 17 Sep 2018 12:55:40 +0000 (08:55 -0400)]
Allow profile.submit api to remove all tags from a contact
Coleman Watts [Sat, 15 Sep 2018 02:46:43 +0000 (22:46 -0400)]
Fix api profile.submit to work with tag & note fields
Eileen McNaughton [Tue, 18 Sep 2018 02:52:48 +0000 (14:52 +1200)]
Merge pull request #12835 from civicrm/5.6
5.6
Eileen McNaughton [Tue, 18 Sep 2018 01:32:43 +0000 (13:32 +1200)]
Merge pull request #12832 from colemanw/groupContact
groupContact BAO - standardize add function
colemanw [Mon, 17 Sep 2018 22:23:14 +0000 (18:23 -0400)]
Merge pull request #12690 from eileenmcnaughton/member_dates
Convert membership date fields to datepicker & form to entity form
Coleman Watts [Mon, 17 Sep 2018 21:31:26 +0000 (17:31 -0400)]
groupContact BAO - standardize add function
Seamus Lee [Mon, 17 Sep 2018 21:43:03 +0000 (07:43 +1000)]
Merge pull request #12827 from colemanw/note
Better title for note field
Matthew Wire (MJW Consulting) [Mon, 17 Sep 2018 21:33:41 +0000 (22:33 +0100)]
Fix saving of relationship permissions when relationship is b_a on form
Eileen McNaughton [Mon, 17 Sep 2018 04:03:21 +0000 (16:03 +1200)]
Merge pull request #12734 from mattwire/membershiprenew_duplicatepayprocfield
Remove duplicate payment processor select on Membership Renewal form
Eileen McNaughton [Mon, 17 Sep 2018 04:00:06 +0000 (16:00 +1200)]
Merge pull request #12825 from colemanw/profileTagNote
Fix api profile.submit to work with tag & note fields
Coleman Watts [Sat, 15 Sep 2018 21:16:28 +0000 (17:16 -0400)]
Better title for note field
Coleman Watts [Sat, 15 Sep 2018 02:46:43 +0000 (22:46 -0400)]
Fix api profile.submit to work with tag & note fields
colemanw [Fri, 14 Sep 2018 18:32:34 +0000 (14:32 -0400)]
Merge pull request #12820 from mukeshcompucorp/SHOR-10-regression-issues-find-contacts
SHOR-10: Fixed wrapper
Mukesh [Fri, 14 Sep 2018 13:17:49 +0000 (18:47 +0530)]
SHOR-10: Fixed wrapper
Seamus Lee [Fri, 14 Sep 2018 05:42:42 +0000 (15:42 +1000)]
Merge pull request #12768 from mattwire/register_participant_permissions
Don't show 'Register Participant' on the manage events page if the logged in user does not have 'Edit Event Participants' permission
Eileen McNaughton [Fri, 14 Sep 2018 00:32:34 +0000 (12:32 +1200)]
Merge pull request #12817 from MegaphoneJon/zero-option-values
Closes core#393 - allow 0 as a valid option value when option group d…
Eileen McNaughton [Fri, 14 Sep 2018 00:30:02 +0000 (12:30 +1200)]
Merge pull request #12762 from mattwire/payproc_supportsX
Add new paymentprocessor supportsX methods to replace remaining isSupported methods
Seamus Lee [Fri, 14 Sep 2018 00:12:48 +0000 (10:12 +1000)]
Merge pull request #12776 from mattwire/eventinfo_datepicker
Convert "Info and Settings" tab on ManageEvent to use datepicker
Eileen McNaughton [Thu, 13 Sep 2018 21:55:20 +0000 (09:55 +1200)]
Merge pull request #12772 from pradpnayak/DetailContactReport
Fixes to Contact Detail report
Jon Goldberg [Thu, 13 Sep 2018 16:48:27 +0000 (12:48 -0400)]
linting fixes
Jon Goldberg [Thu, 13 Sep 2018 16:34:45 +0000 (12:34 -0400)]
Closes core#393 - allow 0 as a valid option value when option group data_type is Integer
Matthew Wire (MJW Consulting) [Mon, 3 Sep 2018 09:13:01 +0000 (10:13 +0100)]
Add new paymentprocessor supportsX methods to replace remaining isSupported methods
Matthew Wire (MJW Consulting) [Fri, 7 Sep 2018 14:20:31 +0000 (15:20 +0100)]
Event configuration - Simplify labels for start/end date
Matthew Wire (MJW Consulting) [Wed, 5 Sep 2018 10:58:08 +0000 (11:58 +0100)]
Convert EventInfo to datepicker
Matthew Wire (MJW Consulting) [Wed, 5 Sep 2018 10:56:57 +0000 (11:56 +0100)]
NFC Formatting for EventInfo.tpl
Pradeep Nayak [Thu, 13 Sep 2018 09:33:50 +0000 (10:33 +0100)]
Fixed styling and included Contact detail report in SelectWhereClause test
Pradeep Nayak [Tue, 4 Sep 2018 16:23:19 +0000 (17:23 +0100)]
only include the tables that will be in from clause
Pradeep Nayak [Tue, 4 Sep 2018 16:20:34 +0000 (17:20 +0100)]
Fixed indentation and styling and removed looping
Seamus Lee [Thu, 13 Sep 2018 08:47:49 +0000 (18:47 +1000)]
Merge pull request #12815 from seamuslee001/test_fix_report_activity_test
Alter Test to ensure that order of city is output doesn't mater in th…
Eileen McNaughton [Thu, 13 Sep 2018 05:52:16 +0000 (17:52 +1200)]
Merge pull request #12809 from eileenmcnaughton/report_test
Report Template test for SelectWhere - add test
Eileen McNaughton [Thu, 13 Sep 2018 05:48:01 +0000 (17:48 +1200)]
Merge pull request #12808 from MegaphoneJon/reporting-6
closes reporting#6 - can't sort by Street Name
Seamus Lee [Thu, 13 Sep 2018 04:39:05 +0000 (14:39 +1000)]
Merge pull request #12770 from mattwire/recurringentity_parentid_rename
NFC: Rename variable in RecurringEntityPreview
Seamus Lee [Thu, 13 Sep 2018 04:38:25 +0000 (14:38 +1000)]
Merge pull request #12771 from colemanw/grantDates
Switch grant form to use crmDatepicker instead of jCalendar
Seamus Lee [Thu, 13 Sep 2018 03:30:15 +0000 (13:30 +1000)]
Alter Test to ensure that order of city is output doesn't mater in the same format as country
Eileen McNaughton [Thu, 13 Sep 2018 03:14:33 +0000 (15:14 +1200)]
Merge pull request #12811 from mukeshcompucorp/SHOR-16-regression-events-and-membership
SHOR-16: Fixed spacing between & table structure issues
Eileen McNaughton [Thu, 13 Sep 2018 03:12:54 +0000 (15:12 +1200)]
Merge pull request #12812 from mukeshcompucorp/SHOR-17-regression-campaigns-and-grants
SHOR-17: Fixed pages dropdown design issues
Eileen McNaughton [Thu, 13 Sep 2018 03:11:45 +0000 (15:11 +1200)]
Merge pull request #12778 from mlutfy/core-379
dev/core#379 Activity View: only nl2br Inbound Email.
Eileen McNaughton [Thu, 13 Sep 2018 01:09:17 +0000 (13:09 +1200)]
Merge pull request #12746 from mattwire/repeat_converttodatepicker
Convert RecurringEntity form to datepicker