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
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.
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
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 01:32:43 +0000 (13:32 +1200)]
Merge pull request #12832 from colemanw/groupContact
groupContact BAO - standardize add function
Coleman Watts [Mon, 17 Sep 2018 21:31:26 +0000 (17:31 -0400)]
groupContact BAO - standardize add function
Eileen McNaughton [Wed, 12 Sep 2018 21:22:33 +0000 (09:22 +1200)]
Merge pull request #12804 from highfalutin/CORE-390-relation_permission-search-5.6
Handle smart groups created in previous Civis which include relation_permission
Noah Miller [Wed, 12 Sep 2018 02:10:42 +0000 (19:10 -0700)]
Account for smart groups created in previous versions of Civi which include relation_permission
CiviCRM [Tue, 11 Sep 2018 23:26:08 +0000 (23:26 +0000)]
Set version to 5.6.beta1
Eileen McNaughton [Tue, 11 Sep 2018 21:03:52 +0000 (09:03 +1200)]
Merge pull request #12801 from civicrm/5.5
5.5
Tim Otten [Tue, 11 Sep 2018 00:27:34 +0000 (19:27 -0500)]
Merge pull request #12786 from totten/master-stringtest
CRM_Utils_StringTest - Fix false-negative on systems with non-standard HTTP port
Tim Otten [Thu, 6 Sep 2018 04:56:01 +0000 (23:56 -0500)]
CRM_Utils_StringTest - Fix false-negative on systems with non-standard HTTP port
Before
------
On a local build with the base URL `http://dmaster.bknix:8001`, the test
`testSimplifyURL()` fails because the actual URL includes `:8001`. The
actual URL is correct, but the test expectation is wrong.
After
-----
The test passes.
Comments
--------
* In the continuous-integration server, we've traditionally tested with
the default/blank port (`http://core-1234-1234.test-ubu1204-5.civicrm.org`), so
this didn't come up.
* The formatt returned by `simpleParseUrl()` in `host+port` is clever about colons.
It has unit-test coverage to show this.
Tim Otten [Fri, 7 Sep 2018 21:21:16 +0000 (16:21 -0500)]
Merge pull request #12796 from colemanw/api4ReleaseNotes
Add release note about api4 inclusion
Coleman Watts [Fri, 7 Sep 2018 13:09:09 +0000 (09:09 -0400)]
Add release note about api4 inclusion
Eileen McNaughton [Fri, 7 Sep 2018 07:21:04 +0000 (19:21 +1200)]
Merge pull request #12792 from civicrm/5.5
5.5
colemanw [Thu, 6 Sep 2018 23:42:32 +0000 (19:42 -0400)]
Merge pull request #12793 from totten/5.5-api4
distmaker - Add APIv4 to standard tarball
Tim Otten [Thu, 6 Sep 2018 23:26:37 +0000 (16:26 -0700)]
Update 5.5.0.md - Fix Markdown syntax in credits
Tim Otten [Thu, 6 Sep 2018 23:24:24 +0000 (18:24 -0500)]
Merge pull request #12791 from seamuslee001/final_release_notes_update_55
Update Release Notes to include PR #12789
Tim Otten [Thu, 6 Sep 2018 23:24:09 +0000 (16:24 -0700)]
Update 5.5.0.md - Fix Markdown syntax
Seamus Lee [Thu, 6 Sep 2018 23:14:52 +0000 (09:14 +1000)]
Update Release Notes to include PR #12789
Tim Otten [Thu, 6 Sep 2018 05:15:11 +0000 (00:15 -0500)]
distmaker - Add APIv4 to standard tarball
colemanw [Thu, 6 Sep 2018 15:34:13 +0000 (11:34 -0400)]
Merge pull request #12789 from mattwire/devcore383fixcustomfield
dev/core#383 Fix edit form of custom field not linked to optiongroup
Matthew Wire (MJW Consulting) [Thu, 6 Sep 2018 13:17:53 +0000 (14:17 +0100)]
Fix edit form of custom field not linked to optiongroup
Tim Otten [Wed, 5 Sep 2018 23:37:57 +0000 (18:37 -0500)]
Merge pull request #12783 from civicrm/5.5
5.5
Tim Otten [Wed, 5 Sep 2018 22:49:54 +0000 (17:49 -0500)]
Merge pull request #12782 from seamuslee001/5_5_release_notes_update
(NFC) Update Release notes to take into account PR #12766 and move the sect…
colemanw [Wed, 5 Sep 2018 22:47:26 +0000 (18:47 -0400)]
Merge pull request #12766 from eileenmcnaughton/report
dev/core#326: Fix for fatal error in section headers.
Seamus Lee [Wed, 5 Sep 2018 22:43:33 +0000 (08:43 +1000)]
Update Release notes to take into account PR #12766 and move the section on PR #12777 into the bugs from features
Tim Otten [Wed, 5 Sep 2018 22:19:43 +0000 (17:19 -0500)]
Merge pull request #12780 from seamuslee001/5_5_release_notes_update
(NFC) Update 5.5 Release notes to take into account pr #12777
Seamus Lee [Wed, 5 Sep 2018 22:11:39 +0000 (08:11 +1000)]
Update 5.5 Release notes to take into account pr #12777
Tim Otten [Wed, 5 Sep 2018 22:03:59 +0000 (17:03 -0500)]
Merge pull request #12777 from jitendrapurohit/core-346-rc
dev/core#346 - 5.5 submission for 12745
Tim Otten [Wed, 5 Sep 2018 21:50:58 +0000 (16:50 -0500)]
Merge pull request #12779 from agh1/5.5.0-releasenotes
5.5.0 release notes
Andrew Hunt [Wed, 5 Sep 2018 15:59:17 +0000 (11:59 -0400)]
5.5.0 release notes: incorporate late changes
Andrew Hunt [Wed, 5 Sep 2018 15:41:17 +0000 (11:41 -0400)]
5.5.0 release notes: updated contributors
Andrew Hunt [Wed, 5 Sep 2018 14:42:45 +0000 (10:42 -0400)]
5.5.0 release notes: fixed up ordering and issues handled in 5.4.1
Tim Otten [Sun, 26 Aug 2018 00:43:44 +0000 (17:43 -0700)]
Update 5.4.1.md
Tim Otten [Sun, 26 Aug 2018 00:43:26 +0000 (17:43 -0700)]
Update 5.4.1.md
Update SMS notes
Tim Otten [Sun, 26 Aug 2018 00:26:14 +0000 (17:26 -0700)]
Update release notes for 5.4.1
Tim Otten [Mon, 13 Aug 2018 21:49:05 +0000 (14:49 -0700)]
Add draft 5.4.1 release notes
Alice Frumin [Tue, 28 Aug 2018 15:46:52 +0000 (11:46 -0400)]
5.5.0 release notes: bulk of issues
Andrew Hunt [Tue, 28 Aug 2018 14:58:28 +0000 (10:58 -0400)]
5.5.0 release notes: added boilerplate and listing
Andrew Hunt [Tue, 28 Aug 2018 14:39:19 +0000 (10:39 -0400)]
5.5.0 release notes: raw from script
Jitendra Purohit [Wed, 5 Sep 2018 11:26:39 +0000 (16:56 +0530)]
dev/core#346 - rc submission for 12745
Eileen McNaughton [Tue, 4 Sep 2018 00:29:44 +0000 (12:29 +1200)]
Merge pull request #12763 from eileenmcnaughton/5.5
5.5
Allen Shaw [Tue, 28 Aug 2018 13:32:05 +0000 (08:32 -0500)]
dev/core#326: Fix for fatal error in section headers.
Pradeep Nayak [Tue, 14 Aug 2018 15:43:04 +0000 (16:43 +0100)]
Fixed fatal error when Gender is selected in column
Pradeep Nayak [Tue, 14 Aug 2018 14:36:02 +0000 (15:36 +0100)]
Fixed fatal error 'DB Error: no such field' on Contribution detail report
Eileen McNaughton [Mon, 3 Sep 2018 00:18:04 +0000 (12:18 +1200)]
Merge pull request #12760 from civicrm/5.5
5.5 to master
Eileen McNaughton [Mon, 3 Sep 2018 00:17:39 +0000 (12:17 +1200)]
Merge pull request #12755 from jitendrapurohit/core-368-rc
dev/core#368 - Upgrade changes for reminder entity dates
Eileen McNaughton [Sun, 2 Sep 2018 05:08:49 +0000 (17:08 +1200)]
Merge pull request #12759 from civicrm/5.5
5.5 to master
Eileen McNaughton [Sun, 2 Sep 2018 05:07:34 +0000 (17:07 +1200)]
Merge pull request #12756 from mlutfy/5.5-ops-842
infrastructure/ops#842 Fix Getting Started and Blog dashlets caching.
Eileen McNaughton [Sun, 2 Sep 2018 05:02:58 +0000 (17:02 +1200)]
Merge pull request #12694 from eileenmcnaughton/mem_1
Deduplicate setting of mailSent message
Eileen McNaughton [Fri, 31 Aug 2018 21:21:56 +0000 (09:21 +1200)]
Merge pull request #12745 from jitendrapurohit/core-346
dev/core#346 - Online Pay Now error when used from dashboard checksum…
colemanw [Fri, 31 Aug 2018 19:11:55 +0000 (15:11 -0400)]
Merge pull request #12757 from colemanw/ext
Show ext version status even when directory not writeable
Coleman Watts [Fri, 31 Aug 2018 16:36:53 +0000 (12:36 -0400)]
Show ext version status even when directory not writeable
Mathieu Lutfy [Fri, 31 Aug 2018 01:56:45 +0000 (21:56 -0400)]
infrastructure/ops#842 Fix Getting Started and Blog dashlets caching.
Jitendra Purohit [Fri, 31 Aug 2018 09:24:49 +0000 (14:54 +0530)]
Fix inaccessible links for checksum users
Jitendra Purohit [Fri, 31 Aug 2018 06:38:33 +0000 (12:08 +0530)]
Upgrade changes for reminder entity dates
Eileen McNaughton [Fri, 31 Aug 2018 01:04:35 +0000 (13:04 +1200)]
Merge pull request #12752 from civicrm/5.5
5.5
colemanw [Thu, 30 Aug 2018 23:19:29 +0000 (19:19 -0400)]
Merge pull request #12751 from colemanw/tplExtract
Extract contact summary basic block to its own tpl
Seamus Lee [Thu, 30 Aug 2018 21:28:57 +0000 (07:28 +1000)]
Merge pull request #12744 from eileenmcnaughton/setting_form3
Setting form - function extraction
Coleman Watts [Thu, 30 Aug 2018 15:14:01 +0000 (11:14 -0400)]
Extract contact summary basic block to its own tpl
Eileen McNaughton [Thu, 30 Aug 2018 08:11:15 +0000 (20:11 +1200)]
Merge pull request #12749 from colemanw/public
Fix compatibility problem with CRM_Extendedreport_Form_Report_ExtendedReport
Coleman Watts [Thu, 30 Aug 2018 00:57:47 +0000 (20:57 -0400)]
Fix compatibility problem with CRM_Extendedreport_Form_Report_ExtendedReport
Mathieu Lu [Wed, 29 Aug 2018 15:04:05 +0000 (11:04 -0400)]
Merge pull request #12636 from chamilwijesooriya/issue-311
Upgrading multilingual site causes DB Error
Jitendra Purohit [Wed, 29 Aug 2018 10:50:38 +0000 (16:20 +0530)]
dev/core#346 - Online Pay Now error when used from dashboard checksum link
eileen [Wed, 29 Aug 2018 01:52:42 +0000 (13:52 +1200)]
Function extraction on setting form
eileen [Wed, 29 Aug 2018 01:46:45 +0000 (13:46 +1200)]
Minor code tidy up, clarify readonly status
colemanw [Wed, 29 Aug 2018 01:28:28 +0000 (21:28 -0400)]
Merge pull request #12732 from eileenmcnaughton/setting_form1
Towards rationalising settings form & preferences form (partial of 12731)
Eileen McNaughton [Wed, 29 Aug 2018 00:49:59 +0000 (12:49 +1200)]
Merge pull request #12743 from civicrm/5.5
5.5 to master
Eileen McNaughton [Wed, 29 Aug 2018 00:49:26 +0000 (12:49 +1200)]
Merge pull request #12742 from colemanw/dev/core#353
dev/core#353 fixed Source contact ID clause
colemanw [Wed, 29 Aug 2018 00:23:01 +0000 (20:23 -0400)]
Merge pull request #12723 from colemanw/addressBlock
Improve styling of address block on summary screen
colemanw [Wed, 29 Aug 2018 00:10:46 +0000 (20:10 -0400)]
Merge pull request #12706 from pradpnayak/OptionGroupFK
Foreign key for civicrm_custom_field.option_group_id
colemanw [Wed, 29 Aug 2018 00:08:24 +0000 (20:08 -0400)]
Merge pull request #12733 from eileenmcnaughton/crypt2
Remove mcrypt warning except for affected sites.
Eileen McNaughton [Tue, 28 Aug 2018 22:05:00 +0000 (10:05 +1200)]
Merge pull request #12740 from twomice/lab367_a_to_z_query_performance
dev/core#367: Query optimization for A-Z pager by adding indices to t…
Eileen McNaughton [Tue, 28 Aug 2018 21:55:21 +0000 (09:55 +1200)]
Merge pull request #12660 from pradpnayak/report-error
Fixed fatal error 'DB Error: no such field' on Contribution detail re…
Eileen McNaughton [Tue, 28 Aug 2018 21:44:59 +0000 (09:44 +1200)]
Merge pull request #12691 from andrewpthompson/dev-core-343
dev/core#343 Fix long address lines overflowing label
colemanw [Tue, 28 Aug 2018 21:35:24 +0000 (17:35 -0400)]
Merge pull request #12509 from JMAConsulting/dev-mail-20
dev/mail#20 : Preview screen doesn't open until recipients list is built on mail compose screen
Eileen McNaughton [Tue, 28 Aug 2018 21:30:44 +0000 (09:30 +1200)]
Merge pull request #12684 from mattwire/money_fn_update_payment_details
dev/core#299 Fix mishandling of non decimal currency on update payment details form
Eileen McNaughton [Tue, 28 Aug 2018 21:26:51 +0000 (09:26 +1200)]
Merge pull request #12738 from mattwire/membershiptype_customdata_formsupport
Enable custom data display on MembershipType form
Seamus Lee [Tue, 28 Aug 2018 21:12:32 +0000 (07:12 +1000)]
Merge pull request #12735 from colemanw/dev/core#351
dev/core#351 - Fix $.crmSnippet error with no url args
Eileen McNaughton [Tue, 28 Aug 2018 21:11:43 +0000 (09:11 +1200)]
Merge pull request #12712 from seamuslee001/dev_core_352
dev/core#352 Ensure that contacts that are to be exluded are not adde…
eileen [Mon, 20 Aug 2018 03:17:17 +0000 (15:17 +1200)]
Deduplicate setting of mailSent message
Pradeep Nayak [Wed, 22 Aug 2018 11:22:11 +0000 (12:22 +0100)]
dev/core#353 fixed Source contact ID clause
Allen Shaw [Tue, 28 Aug 2018 16:55:43 +0000 (11:55 -0500)]
dev/core#367: Query optimization for A-Z pager by adding indices to temp table.
Coleman Watts [Tue, 28 Aug 2018 12:24:37 +0000 (08:24 -0400)]
dev/core#351 - Fix $.crmSnippet error with no url args
Matthew Wire (MJW Consulting) [Tue, 24 Jul 2018 10:00:15 +0000 (11:00 +0100)]
Enable custom data display on MembershipType form
Eileen McNaughton [Tue, 28 Aug 2018 10:59:11 +0000 (22:59 +1200)]
Merge pull request #12701 from magnolia61/Scheduled_reminders-default-sort
dev/core#349 correct default sort for scheduled reminders list
Matthew Wire (MJW Consulting) [Fri, 17 Aug 2018 10:23:36 +0000 (11:23 +0100)]
Format money correctly for locale on UpdatePaymentDetails form
Eileen McNaughton [Tue, 28 Aug 2018 09:29:45 +0000 (21:29 +1200)]
Merge pull request #12667 from mlutfy/translation-14
dev/translation#14 Fix InnoDB Advanced Logging
eileen [Mon, 27 Aug 2018 21:48:56 +0000 (09:48 +1200)]
Remove mcrypt warning except for affected sites.
Extensions that wish to have a version of this should implement it themselves as
it is basically pretty trivial & it doesn't make sense to spam non-affected people
colemanw [Mon, 27 Aug 2018 21:37:32 +0000 (17:37 -0400)]
Merge pull request #12704 from colemanw/recent
Fix recent item deduping & call hooks
Seamus Lee [Wed, 22 Aug 2018 03:59:37 +0000 (13:59 +1000)]
dev/core#352 Ensure that contacts that are to be exluded are not added incorrectly when adding recipients of past mailings
Add in DISTINCT clause as per Moonish's comment
colemanw [Mon, 27 Aug 2018 16:08:51 +0000 (12:08 -0400)]
Merge pull request #12729 from mattwire/custom_field_optiongroup_fix2
Further fix for updating custom fields linked to optiongroups.
Coleman Watts [Mon, 27 Aug 2018 15:16:11 +0000 (11:16 -0400)]
Remove unneeded clear
Eileen McNaughton [Mon, 27 Aug 2018 06:31:41 +0000 (18:31 +1200)]
Merge pull request #12662 from eileenmcnaughton/net_amount
Remove net_amount from the Back office contribution form.
Eileen McNaughton [Mon, 27 Aug 2018 06:06:54 +0000 (18:06 +1200)]
Merge pull request #12678 from kewljuice/patch-1
Fix Undefined index: params in CRM_Event_BAO_Event::buildCustomProfile()
Eileen McNaughton [Mon, 27 Aug 2018 05:46:03 +0000 (17:46 +1200)]
Merge pull request #12700 from vinuvarshith/BASW-240-membership-network-error-fix
BASW-240: 'Network Error' when creating membership type from contact membership tab
projects / civicrm-core.git / log