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
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
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
Eileen McNaughton [Thu, 13 Sep 2018 01:08:35 +0000 (13:08 +1200)]
Merge pull request #12721 from mattwire/billingblock_descriptions
Allow descriptions for payment fields
Eileen McNaughton [Thu, 13 Sep 2018 00:59:11 +0000 (12:59 +1200)]
Merge pull request #12781 from mattwire/event_fromtemplateurl
Allow to specify template_id on URL when creating a new event
Eileen McNaughton [Thu, 13 Sep 2018 00:58:30 +0000 (12:58 +1200)]
Merge pull request #12794 from eileenmcnaughton/test_mem
Just a test.
Eileen McNaughton [Thu, 13 Sep 2018 00:57:44 +0000 (12:57 +1200)]
Merge pull request #12798 from mattwire/membership_renewal_varrename
Rename variable in MembershipRenewal form to make a merge with Membership form in future easier
Eileen McNaughton [Thu, 13 Sep 2018 00:57:12 +0000 (12:57 +1200)]
Merge pull request #12799 from mattwire/import_formatting
Display tables correctly on import wizard/membership dashboard when using drupal bootstrap based theme
Eileen McNaughton [Wed, 12 Sep 2018 22:14:18 +0000 (10:14 +1200)]
Merge pull request #12814 from civicrm/5.6
5.6 to master
Eileen McNaughton [Wed, 12 Sep 2018 21:24:16 +0000 (09:24 +1200)]
Merge pull request #12785 from seamuslee001/lab_core_382
dev/core#382 Ensure that no db errors are generated when trying to up…
Eileen McNaughton [Wed, 12 Sep 2018 21:23:12 +0000 (09:23 +1200)]
Merge pull request #12802 from mlutfy/fix-country-caps
Fix capitalisation for 'Republic of' countries (Iran, Macedonia)
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
Monish Deb [Wed, 12 Sep 2018 16:16:22 +0000 (21:46 +0530)]
Merge pull request #12707 from tanyabouman/master
fixing batch search by payment method
Mukesh [Wed, 12 Sep 2018 11:17:10 +0000 (16:47 +0530)]
SHOR-17: Fixed regression - campaigns and grants issues
Mukesh [Wed, 12 Sep 2018 06:18:21 +0000 (11:48 +0530)]
SHOR-16: Fixed regression - events &membership issues
eileen [Wed, 12 Sep 2018 03:34:57 +0000 (15:34 +1200)]
Report Template test for SelectWhere - add test
Jon Goldberg [Wed, 12 Sep 2018 03:45:30 +0000 (23:45 -0400)]
closes reporting#6 - can't sort by Street Name
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:43:33 +0000 (23:43 +0000)]
Set version to 5.7.alpha1
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
Mathieu Lutfy [Tue, 11 Sep 2018 15:43:57 +0000 (11:43 -0400)]
Fix capitalisation for 'Republic of' countries (Iran, Macedonia)
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.
Matthew Wire (MJW Consulting) [Sun, 9 Sep 2018 20:12:15 +0000 (21:12 +0100)]
Fix display of membership import and dashboard tables when using drupal bootstrap theme
Matthew Wire (MJW Consulting) [Sat, 8 Sep 2018 13:07:38 +0000 (14:07 +0100)]
Display first column (labels) correctly on import preview/summary tables when using drupal bootstrap based theme
Matthew Wire (MJW Consulting) [Sat, 8 Sep 2018 09:40:47 +0000 (10:40 +0100)]
Rename variable in MembershipRenewal form to make a merge with Membership form in future easier
Seamus Lee [Thu, 6 Sep 2018 04:58:08 +0000 (14:58 +1000)]
dev/core#382 Ensure that no db errors are generated when trying to update a civicrm group linked to an organization when the group id doesn't match the id of the relevant row in civicrm_group_organization
Only Pass necessary params to GroupOrganization::add function
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 [Fri, 7 Sep 2018 08:01:08 +0000 (20:01 +1200)]
Just a test.
I was trying to replicate something & failed but adding the test
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.
Matthew Wire (MJW Consulting) [Wed, 5 Sep 2018 22:44:26 +0000 (23:44 +0100)]
Allow to specify template_id on URL when creating a new event
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
Mathieu Lutfy [Wed, 5 Sep 2018 15:01:09 +0000 (11:01 -0400)]
dev/core#379 Activity View: only nl2br Inbound Email.
Jitendra Purohit [Wed, 5 Sep 2018 11:26:39 +0000 (16:56 +0530)]
dev/core#346 - rc submission for 12745
Coleman Watts [Tue, 4 Sep 2018 15:24:18 +0000 (11:24 -0400)]
Switch grant form to use crmDatepicker instead of jCalendar
Matthew Wire (MJW Consulting) [Tue, 4 Sep 2018 15:15:01 +0000 (16:15 +0100)]
Rename to as it is used by activities and events
Matthew Wire (MJW Consulting) [Tue, 4 Sep 2018 13:52:09 +0000 (14:52 +0100)]
Don't show 'Register Participant' on the manage events page if the logged in user does not have 'Edit Event Participants' permission
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.
projects / civicrm-core.git / log