Seamus Lee [Thu, 18 Oct 2018 20:43:04 +0000 (07:43 +1100)]
(NFC) Make the test concurrency test not run on PR testing but on matrix alone until we can sort out the issue
Eileen McNaughton [Thu, 18 Oct 2018 10:49:58 +0000 (23:49 +1300)]
Merge pull request #12952 from vingle/patch-1
Fixed Joomla menu z-index regression
Nicol [Thu, 18 Oct 2018 09:07:14 +0000 (10:07 +0100)]
Fixed Joomla menu z-index regression
As originally described https://civicrm.stackexchange.com/questions/26858/anyone-else-seeing-an-overlapping-admin-civi-menu-bug-with-joomla-3-8-13-and-civ
Eileen McNaughton [Wed, 17 Oct 2018 19:09:45 +0000 (08:09 +1300)]
Merge pull request #12915 from twomice/428_activity_report_fatal_section_headers
Fix for dev/core#428: Fatal error in Activity Details report when Sorting uses Section Header
Allen Shaw [Tue, 9 Oct 2018 17:50:21 +0000 (12:50 -0500)]
Fix for dev/core#428.
Eileen McNaughton [Tue, 9 Oct 2018 13:22:49 +0000 (14:22 +0100)]
Merge pull request #12909 from eileenmcnaughton/57reg
Ensure hard-coded date ranges are preserved in smart groups
Jamie McClelland [Mon, 17 Sep 2018 17:02:03 +0000 (13:02 -0400)]
ensure date ranges are preserved in smart groups
See https://lab.civicrm.org/dev/core/issues/396
Seamus Lee [Mon, 8 Oct 2018 23:48:44 +0000 (10:48 +1100)]
Merge pull request #12896 from seamuslee001/dev_core_421
dev/core#421 Fix issue where creating user driven message templates w…
Seamus Lee [Fri, 5 Oct 2018 02:31:38 +0000 (12:31 +1000)]
dev/core#421 Fix issue where creating user driven message templates was requireing the ssystem workflow message template permission as well
Wrap permission checking in the check_permissions param
Move Permission checking to BAO level from API
Allow for the fact that edit message templates permission should still be able to work on both sets of templates without the granular permissions. Also reduce duplication of code abit
Tim Otten [Wed, 3 Oct 2018 21:39:59 +0000 (17:39 -0400)]
Merge pull request #12894 from seamuslee001/5.7
5.7
Tim Otten [Wed, 3 Oct 2018 14:55:02 +0000 (10:55 -0400)]
Update 5.6.0.md
Tim Otten [Wed, 3 Oct 2018 14:53:04 +0000 (10:53 -0400)]
Update 5.6.0.md
eileen [Sun, 23 Sep 2018 01:42:01 +0000 (13:42 +1200)]
Fix missing amount in soft credit mode
Andrew Hunt [Thu, 27 Sep 2018 20:53:46 +0000 (16:53 -0400)]
5.6.0 release notes: reorganize sections and fix up contributors
Alice Frumin [Thu, 27 Sep 2018 20:22:23 +0000 (16:22 -0400)]
5.6.0 release notes: bulk of edits
Andrew Hunt [Thu, 13 Sep 2018 16:18:48 +0000 (12:18 -0400)]
5.6.0 release notes: added boilerplate
Andrew Hunt [Thu, 13 Sep 2018 16:15:54 +0000 (12:15 -0400)]
5.6.0 release notes: raw from script
CiviCRM [Wed, 3 Oct 2018 18:24:33 +0000 (18:24 +0000)]
Set version to 5.7.beta1
Eileen McNaughton [Wed, 3 Oct 2018 00:25:43 +0000 (13:25 +1300)]
Merge pull request #12885 from yashodha/report-fixes
CRM-21677 - report clean up
Seamus Lee [Mon, 1 Oct 2018 21:39:59 +0000 (07:39 +1000)]
Merge pull request #12882 from colemanw/extpage
Fix invalid markup on extension page - remove dots from ids & classes
yashodha [Mon, 1 Oct 2018 11:19:33 +0000 (16:49 +0530)]
CRM-21677 - report clean up
Coleman Watts [Sat, 29 Sep 2018 19:29:30 +0000 (15:29 -0400)]
Fix invalid markup on extension page - remove dots from ids & classes
Tim Otten [Sat, 29 Sep 2018 00:56:18 +0000 (20:56 -0400)]
Merge pull request #12876 from colemanw/Don't
Don't mess up fragment links in nav menu
Seamus Lee [Fri, 28 Sep 2018 11:35:32 +0000 (21:35 +1000)]
Merge pull request #12879 from totten/master-contact-settings
(DX) Civi::contactSettings - Add a facade for working with the logged-in user's settings
Seamus Lee [Fri, 28 Sep 2018 05:01:27 +0000 (15:01 +1000)]
Merge pull request #12878 from colemanw/menu-icons
Add icons to top-level navigation menu
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
Kevin Cristiano [Fri, 28 Sep 2018 02:13:58 +0000 (22:13 -0400)]
Regenerate sql for Add icons to top-level navigation menu (#7)
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 …
Coleman Watts [Fri, 28 Sep 2018 00:35:55 +0000 (20:35 -0400)]
Update activity_tab_filter setting code to use new fascade
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
Tim Otten [Thu, 27 Sep 2018 21:05:06 +0000 (17:05 -0400)]
(DX) Civi::contactSettings - Add a facade for working with the logged-in user's settings
Before
------
To read/write a setting for the logged-in user, you need a snippet like this:
```php
$cid = CRM_Core_Session::getLoggedInContactID();
$myFilter = Civi::service('settings_manager')
->getBagByContact(NULL, $cid)
->get('activity_tab_filter');
```
After
-----
To read/write a setting for the logged-in user, you can use a snippet like this:
```php
$myFilter = Civi::contactSettings()->get('activity_tab_filter');
```
Technical Details
-----------------
* A convenience function like this is liable to be used in lazy circumstances where
the developer is unlikely to check their conditions carefully. Therefore, the
errors are reported as exceptions so that mistakes are easiliy revealed.
* This is technically a small contract change to `SettingsManager::getBagByContact()`
because it now interprets `$contactId===NULL` as meaning "the logged-in user".
However, I don't think NULL was a sensible value before, and this interface
isn't widely known/used.
Coleman Watts [Thu, 27 Sep 2018 20:05:39 +0000 (16:05 -0400)]
Regenerate MailingComponent DAO file to reflect recent changes
Coleman Watts [Thu, 27 Sep 2018 19:52:36 +0000 (15:52 -0400)]
Fix bad menu name
Coleman Watts [Thu, 27 Sep 2018 19:45:52 +0000 (15:45 -0400)]
Add icons to nav menu
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
Coleman Watts [Thu, 27 Sep 2018 19:03:47 +0000 (15:03 -0400)]
Don't mess up fragment links in nav menu
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