Seamus Lee [Thu, 15 Nov 2018 19:28:57 +0000 (06:28 +1100)]
Merge pull request #13100 from eileenmcnaughton/env
dev/cloud-native/issues#18: Soften messages for read-only extensionsDir
Seamus Lee [Thu, 15 Nov 2018 19:28:17 +0000 (06:28 +1100)]
Merge pull request #13102 from christianwach/issue-526
Use tab title in feedback message
Christian Wach [Thu, 15 Nov 2018 13:16:03 +0000 (13:16 +0000)]
Use tab title in feedback message
tiotsop01 [Thu, 15 Nov 2018 12:21:19 +0000 (01:21 +1300)]
dev/cloud-native/issues#18: Soften messages for read-only extensionsDir
Eileen McNaughton [Thu, 15 Nov 2018 11:18:13 +0000 (00:18 +1300)]
Merge pull request #13095 from eileenmcnaughton/case_date
Add format type to Case Start and End Dates
ray-wright [Thu, 15 Nov 2018 08:35:56 +0000 (21:35 +1300)]
Add format type to Case Start and End Dates
Monish Deb [Thu, 15 Nov 2018 08:10:21 +0000 (13:40 +0530)]
Merge pull request #13091 from omarabuhussein/dev/core#193-v2
dev/core#193: Ensure that tax amount is calculated when checking for order API line item
Eileen McNaughton [Thu, 15 Nov 2018 07:53:09 +0000 (20:53 +1300)]
Merge pull request #13094 from civicrm/5.8
5.8 to master
Monish Deb [Thu, 15 Nov 2018 07:26:36 +0000 (12:56 +0530)]
Merge pull request #13084 from colemanw/menuCleanup
dev/core#487 Menu cleanup in preparation for switch to SmartMenus library
Seamus Lee [Wed, 14 Nov 2018 22:06:54 +0000 (09:06 +1100)]
Merge pull request #12557 from eileenmcnaughton/activity
Activity tab code refactor
Omar abu hussein [Wed, 14 Nov 2018 21:06:56 +0000 (23:06 +0200)]
dev/core#193: Ensure that tax amount is calculated when checking for order API line items
Eileen McNaughton [Wed, 14 Nov 2018 19:06:22 +0000 (08:06 +1300)]
Merge pull request #13081 from colemanw/mergeBtn
Add merge link to duplicate contact popup
colemanw [Wed, 14 Nov 2018 14:45:22 +0000 (09:45 -0500)]
Merge pull request #12659 from kenwest/strip-html-tags-from-joblog-description
Fix Job Log entries containing links so they will display properly
Monish Deb [Wed, 14 Nov 2018 07:42:50 +0000 (13:12 +0530)]
Merge pull request #13085 from colemanw/scroll
Fix accidental scroll when saving/deleting CiviMail draft
Coleman Watts [Wed, 14 Nov 2018 04:28:47 +0000 (23:28 -0500)]
Add unit test for CRM_Core_BAO_Navigation::checkPermission()
Eileen McNaughton [Wed, 14 Nov 2018 01:35:36 +0000 (14:35 +1300)]
Merge pull request #12942 from twomice/CRM-19751_search_on_hold_form
Toward CRM-19751: conditionally change On-Hold criteria to select on …
Coleman Watts [Tue, 13 Nov 2018 20:24:32 +0000 (15:24 -0500)]
Fix accidental scroll when saving/deleting CiviMail draft
Allen Shaw [Tue, 16 Oct 2018 14:07:34 +0000 (09:07 -0500)]
Toward CRM-19751: conditionally change On-Hold criteria to select on Advanced Search form.
Eileen McNaughton [Tue, 13 Nov 2018 19:39:13 +0000 (08:39 +1300)]
Merge pull request #12990 from mattwire/event_copy_posthook
Trigger post hook on Event Copy
Coleman Watts [Tue, 13 Nov 2018 16:20:41 +0000 (11:20 -0500)]
Menu code cleanup in preparation for switch to SmartMenus library
- Add a couple client side variables
- Fix access to functions that were private for no reason
- Extract permissions check into its own function
- Fire crmLoad event when menu loads
Coleman Watts [Sun, 11 Nov 2018 16:51:41 +0000 (11:51 -0500)]
Add merge link to duplicate contact popup
Eileen McNaughton [Tue, 13 Nov 2018 03:01:39 +0000 (16:01 +1300)]
Merge pull request #13076 from colemanw/dev/core#503
dev/core#503 - More accurate custom field checking before htmlEncode
Monish Deb [Mon, 12 Nov 2018 18:31:44 +0000 (00:01 +0530)]
Merge pull request #13083 from eileenmcnaughton/export_huh
Export code cleanup -remove meaningless code
eileen [Mon, 12 Nov 2018 04:40:02 +0000 (17:40 +1300)]
Export code cleanup -remove meaningless code
Eileen McNaughton [Sun, 11 Nov 2018 20:16:33 +0000 (09:16 +1300)]
Merge pull request #13079 from seamuslee001/lab_core_372
dev/core#372 Remove notice on activity update due to trying to proces…
Eileen McNaughton [Sun, 11 Nov 2018 00:09:25 +0000 (13:09 +1300)]
Merge pull request #13073 from omarabuhussein/dev/core#513
dev/core#513: Using payment_instrument_id instead of payment_type to determine the payment instrument when using the Transact API
Seamus Lee [Sat, 10 Nov 2018 12:04:03 +0000 (23:04 +1100)]
Merge pull request #13080 from civicrm/5.8
5.8
Seamus Lee [Sat, 10 Nov 2018 05:12:08 +0000 (16:12 +1100)]
Merge pull request #13075 from colemanw/help
Fix typo in smarty help
Seamus Lee [Sat, 10 Nov 2018 00:23:28 +0000 (11:23 +1100)]
Merge pull request #13077 from seamuslee001/lab_core_93
(NFC) Add in unit test of dev/core#93 expansion to allow order by of more t…
Seamus Lee [Fri, 9 Nov 2018 21:09:32 +0000 (08:09 +1100)]
dev/core#372 Remove notice on activity update due to trying to process details key when non existant
Seamus Lee [Fri, 9 Nov 2018 21:01:28 +0000 (08:01 +1100)]
Add in unit test of dev/core#93 expansion to allow order by of more than 2 joins
Coleman Watts [Fri, 9 Nov 2018 15:42:39 +0000 (10:42 -0500)]
dev/core#503 - More accurate custom field checking before htmlEncode
Coleman Watts [Fri, 9 Nov 2018 15:29:23 +0000 (10:29 -0500)]
Fix missing quotation marks in help file
Coleman Watts [Fri, 9 Nov 2018 15:22:10 +0000 (10:22 -0500)]
Fix typo in smarty help
Eileen McNaughton [Fri, 9 Nov 2018 01:43:26 +0000 (14:43 +1300)]
Merge pull request #13072 from aydun/core511_membership_dashboard
dev/core#511 Fix wrong current month showing on Membership Dashboard
Aidan Saunders [Thu, 8 Nov 2018 12:39:06 +0000 (12:39 +0000)]
Fix wrong current month showing on Membership Dashboard
Remove stray dash after Last Month name
Add tests for new CRM_Utils_Date::customFormatTs() and existing CRM_Utils_Date::customFormat()
dev/core#511
Omar abu hussein [Thu, 8 Nov 2018 16:23:13 +0000 (16:23 +0000)]
dev/core#513: USe payment_instrument_id instead of payment_type to determine the payment instrument when using the Transact API
Eileen McNaughton [Thu, 8 Nov 2018 09:02:56 +0000 (22:02 +1300)]
Merge pull request #13071 from civicrm/5.8
5.8 to master
Eileen McNaughton [Thu, 8 Nov 2018 09:02:21 +0000 (22:02 +1300)]
Merge pull request #13070 from seamuslee001/5.8
5.7 Release notes for 5.8
Andrew Hunt [Wed, 7 Nov 2018 04:22:23 +0000 (23:22 -0500)]
5.7.0 release notes: added late changes and contributors
Andrew Hunt [Tue, 6 Nov 2018 23:20:44 +0000 (18:20 -0500)]
5.7.0 release notes: edits and organization
Still need to handle contributors and add late changes
Alice Frumin [Tue, 23 Oct 2018 21:21:45 +0000 (17:21 -0400)]
first stab at 5.7.0 releasenotes (#11)
* adding links to gitlab
* moving obvious misc changes
* adding notes
* more noes
* wrapping
* first stab at release notes
Andrew Hunt [Tue, 16 Oct 2018 17:04:37 +0000 (13:04 -0400)]
5.7.0 release notes: added boilerplate
Andrew Hunt [Tue, 16 Oct 2018 16:59:41 +0000 (12:59 -0400)]
5.7.0 release notes: raw from script
Eileen McNaughton [Thu, 8 Nov 2018 07:15:33 +0000 (20:15 +1300)]
Merge pull request #13069 from eileenmcnaughton/master
Merge 5.7 to master
eileen [Thu, 8 Nov 2018 07:14:47 +0000 (20:14 +1300)]
Merge 5.7 to master
Eileen McNaughton [Thu, 8 Nov 2018 05:56:52 +0000 (18:56 +1300)]
Merge pull request #13050 from mlutfy/i18n-getlocale
CRM_Core_I18n::setLocale should change $tsLocale for getLocale() to work correctly
Eileen McNaughton [Thu, 8 Nov 2018 05:48:24 +0000 (18:48 +1300)]
Merge pull request #13058 from JKingsnorth/msgtpl-title-in-delete
Display message template title on deletion form
Eileen McNaughton [Thu, 8 Nov 2018 05:28:57 +0000 (18:28 +1300)]
Merge pull request #12775 from eileenmcnaughton/cancel
Fix metadata on cancel_reason so it is an exportable field
CiviCRM [Thu, 8 Nov 2018 03:48:17 +0000 (03:48 +0000)]
Set version to 5.9.alpha1
CiviCRM [Thu, 8 Nov 2018 03:38:33 +0000 (03:38 +0000)]
Set version to 5.8.beta1
Eileen McNaughton [Thu, 8 Nov 2018 02:13:13 +0000 (15:13 +1300)]
Merge pull request #12682 from eileenmcnaughton/date_extension
Genericise 'ending' date filter and add tests
CiviCRM [Thu, 8 Nov 2018 02:03:36 +0000 (02:03 +0000)]
Set version to 5.7.0
Eileen McNaughton [Wed, 7 Nov 2018 04:28:59 +0000 (17:28 +1300)]
Merge pull request #12944 from agh1/5.7.0-releasenotes
5.7.0 release notes
Andrew Hunt [Wed, 7 Nov 2018 04:22:23 +0000 (23:22 -0500)]
5.7.0 release notes: added late changes and contributors
Andrew Hunt [Tue, 6 Nov 2018 23:20:44 +0000 (18:20 -0500)]
5.7.0 release notes: edits and organization
Still need to handle contributors and add late changes
JKingsnorth [Tue, 6 Nov 2018 17:44:11 +0000 (17:44 +0000)]
Escape message template title on deletion form
Eileen McNaughton [Tue, 6 Nov 2018 04:23:28 +0000 (17:23 +1300)]
Merge pull request #13054 from eileenmcnaughton/settings_generic
dev/core/495 Introduce generic settings form (fully metadata driven)
Eileen McNaughton [Tue, 6 Nov 2018 04:19:25 +0000 (17:19 +1300)]
Merge pull request #12921 from colemanw/ajaxMode
Fix isAjaxMode to also recognize angular ajax
Seamus Lee [Tue, 6 Nov 2018 01:50:32 +0000 (12:50 +1100)]
Merge pull request #13063 from seamuslee001/lab_core_119
dev/core#119 Fix undefined variable notice when going to pages like …
Seamus Lee [Tue, 6 Nov 2018 01:50:10 +0000 (12:50 +1100)]
Merge pull request #13064 from ejegg/master
Fix misplaced hyphens in regex
Eileen McNaughton [Mon, 5 Nov 2018 20:15:30 +0000 (09:15 +1300)]
Merge pull request #13044 from giovannidalmas1967/giovannidalmas1967-patch-1
Problem with Custom Field in Contact Reports
Elliott Eggleston [Mon, 5 Nov 2018 19:54:55 +0000 (14:54 -0500)]
Fix misplaced hyphens in regex
Inside a character range surrounded by [], the hyphen is interpreted
as defining a range, unless it's the first character. Move the
hyphens to the first character in the square brackets where it's
supposed to be interpreted as a hyphen.
Under PHP 7.3, the previous code failed with error message
preg_match(): Compilation failed: invalid range in character class at offset 7
Seamus Lee [Mon, 5 Nov 2018 19:49:09 +0000 (06:49 +1100)]
dev/core#119 Fix underfined variable notice when going to pages like civicrm/contact/map/event?eid=3&reset=1
eileen [Thu, 1 Nov 2018 21:55:17 +0000 (10:55 +1300)]
Replace event form with a generic replacement form
eileen [Wed, 5 Sep 2018 05:38:23 +0000 (17:38 +1200)]
Fix metadata on cancel_reason so it is an exportable field
This means it is available for searching
colemanw [Mon, 5 Nov 2018 12:22:01 +0000 (07:22 -0500)]
Merge pull request #13062 from eileenmcnaughton/settings_help_text
Fix handling of advmutltiselect (on localization form). Handle casing issues
Seamus Lee [Mon, 5 Nov 2018 00:53:51 +0000 (11:53 +1100)]
Merge pull request #12494 from eileenmcnaughton/strtolower
Fix international strings test / mishandling of international strings
eileen [Mon, 5 Nov 2018 00:45:48 +0000 (13:45 +1300)]
Fix handling of advmutltiselect (on localization form) Add deprecation notice rather than hard-fail for incorrect case for html type.
We have clarified the correct syntax (it was haphazard) an updated the docs.
This ALSO fixes fails on localisation form
Seamus Lee [Sun, 4 Nov 2018 23:28:27 +0000 (10:28 +1100)]
Merge pull request #13053 from eileenmcnaughton/settings_help
Fix help for financial acls.
eileen [Thu, 1 Nov 2018 21:05:48 +0000 (10:05 +1300)]
Fix help for financial acls.
I've done this by using the field template that is used by entity forms & adding
help to the spec (which I'll document).
I noted in this that entityTrait used a different field key for the
documentation link - literally documentation_link whereas I had used field_link
so I fixed settings to match
Seamus Lee [Sun, 4 Nov 2018 01:43:35 +0000 (12:43 +1100)]
Merge pull request #13061 from seamuslee001/crm-287
Fix unit tests following merge of PR #12797
Eileen McNaughton [Sat, 3 Nov 2018 23:55:46 +0000 (12:55 +1300)]
Merge pull request #13060 from seamuslee001/lab_core_6
dev/core#6 Add in help text about the is public setting for custom gr…
Seamus Lee [Sat, 3 Nov 2018 23:00:04 +0000 (10:00 +1100)]
Fix unit tests following merge of PR #12797
Seamus Lee [Sat, 3 Nov 2018 22:13:53 +0000 (09:13 +1100)]
dev/core#6 Add in help text about the is public setting for custom groups
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
JKingsnorth [Fri, 2 Nov 2018 15:01:21 +0000 (15:01 +0000)]
Display message template title on deletion form
giovannidalmas1967 [Fri, 2 Nov 2018 13:36:57 +0000 (14:36 +0100)]
Update Form.php
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 [Tue, 23 Oct 2018 19:54:54 +0000 (08:54 +1300)]
Remove use of LOWER from city & street searches and fix international strings test.
Adding LOWER to mysql queries makes them slower. lowercasing php strings
breaks under some character sets with some server configs.
In trying to review PR 12364 I dug into the strotolower behaviour. I found that
in the path altered in this PR we are setting the value to lower case but not the
mysql clause. I ran through ContactTest without these lines & found it
only hit this strtolower in one test - testInternationalStrings which searches
by organization name. I found the this test actually failed for me
when I ran it locally - but it passed when I removed the strotlower lines.
Wonder in jenkins finds the same
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
Mathieu Lutfy [Thu, 1 Nov 2018 20:12:11 +0000 (16:12 -0400)]
CRM_Core_I18n::setLocale should also change the tsLocale global variable
Mathieu Lutfy [Thu, 1 Nov 2018 17:42:30 +0000 (13:42 -0400)]
Add phpunit test for getLocale/setLocale.
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