civicrm-core.git
6 years agoMerge pull request #11844 from eileenmcnaughton/cust_tpl
Eileen McNaughton [Wed, 21 Mar 2018 20:05:59 +0000 (09:05 +1300)]
Merge pull request #11844 from eileenmcnaughton/cust_tpl

Meld Address custom field display template with main custom field template

6 years agoMerge pull request #11851 from mukeshcompucorp/fix-template-structure-issues
colemanw [Wed, 21 Mar 2018 11:46:19 +0000 (07:46 -0400)]
Merge pull request #11851 from mukeshcompucorp/fix-template-structure-issues

Fix template structure

6 years agoMerge pull request #11842 from eileenmcnaughton/format
colemanw [Wed, 21 Mar 2018 10:22:20 +0000 (06:22 -0400)]
Merge pull request #11842 from eileenmcnaughton/format

NFC reformat whitespace in Email.tpl files

6 years agoFix template structure
Mukesh Ram [Wed, 21 Mar 2018 08:54:31 +0000 (14:24 +0530)]
Fix template structure

6 years agoSync address custom field file with main file.
eileen [Wed, 21 Mar 2018 04:17:59 +0000 (17:17 +1300)]
Sync address custom field file with main file.

There is no reason for there being 2 files almost the same for custom data

I plan to use this file more broadly (ie. permit custom data on other entities such as email, phone)
and towards that have aligned the 2 files first.

There are minor differences in display
- read only fields show up as frozen for non-address & now for address too (instead of suppressed)
- post help text shows as full text for address currently but after this it shows as a help-icon
which can be clicked on
- display improvements for file custom fields.

Note that I think making address like the main file makes sense as that will be where deliberate
changes have happened.

6 years agoShow custom address view only fields in edit mode.
eileen [Wed, 21 Mar 2018 03:22:08 +0000 (16:22 +1300)]
Show custom address view only fields in edit mode.

This brings them into line with the behaviour of other custom fields in edit mode (shown, but
greyed out) and is a step towards sharing the tpl

6 years agoMerge pull request #11586 from alifrumin/CRM-21711
Eileen McNaughton [Wed, 21 Mar 2018 06:59:40 +0000 (19:59 +1300)]
Merge pull request #11586 from alifrumin/CRM-21711

CRM-21711 When updating multiple memberships thru a contribution page custom fields are only updated on one

6 years agoMerge pull request #11843 from agileware/CRM-20790-T
Eileen McNaughton [Wed, 21 Mar 2018 06:56:54 +0000 (19:56 +1300)]
Merge pull request #11843 from agileware/CRM-20790-T

CRM-20790: Unit test to ensure relationships are created on import.

6 years agoMerge pull request #11847 from civicrm/5.0
Eileen McNaughton [Wed, 21 Mar 2018 06:55:21 +0000 (19:55 +1300)]
Merge pull request #11847 from civicrm/5.0

Merge rc to master

6 years agoMerge pull request #11846 from eileenmcnaughton/mail_hold
Eileen McNaughton [Wed, 21 Mar 2018 06:54:41 +0000 (19:54 +1300)]
Merge pull request #11846 from eileenmcnaughton/mail_hold

Fix issue where on_hold email addresses are not being filtered out of

6 years agoFix issue where on_hold email addresses are not being filtered out of
Darrick Servis [Mon, 19 Mar 2018 23:14:18 +0000 (16:14 -0700)]
Fix issue where on_hold email addresses are not being filtered out of
recipient list for mailings.

6 years agoCRM-20790: Unit test to ensure relationships are created on import.
Alok Patel [Wed, 21 Mar 2018 03:16:14 +0000 (13:16 +1000)]
CRM-20790: Unit test to ensure relationships are created on import.

6 years agoNFC reformat whitespace in Email.tpl files
eileen [Wed, 21 Mar 2018 02:23:05 +0000 (15:23 +1300)]
NFC reformat whitespace in Email.tpl files

6 years agotools/scripts/phpunit-ls - Fix syntax error
Tim Otten [Wed, 21 Mar 2018 00:32:14 +0000 (17:32 -0700)]
tools/scripts/phpunit-ls - Fix syntax error

6 years agoMerge pull request #11199 from twomice/CRM-21348_joomla_edit_link
Eileen McNaughton [Tue, 20 Mar 2018 23:01:45 +0000 (12:01 +1300)]
Merge pull request #11199 from twomice/CRM-21348_joomla_edit_link

CRM-21348: Don't hide the "edit" link from logged-in users in profile listings in joomla front-end

6 years agoMerge pull request #11819 from compucorp/CRM-21840-show-tool-icon-for-radio-groups
colemanw [Tue, 20 Mar 2018 20:44:54 +0000 (16:44 -0400)]
Merge pull request #11819 from compucorp/CRM-21840-show-tool-icon-for-radio-groups

CRM-21840: Show Options Edit Link for Radio and Checkbox Groups

6 years agoCRM-21840: Show options edit link for radio and checkbox groups
Michael Devery [Thu, 15 Mar 2018 13:02:00 +0000 (13:02 +0000)]
CRM-21840: Show options edit link for radio and checkbox groups

6 years agoMerge pull request #10783 from totten/master-angldr
colemanw [Tue, 20 Mar 2018 15:41:52 +0000 (11:41 -0400)]
Merge pull request #10783 from totten/master-angldr

CRM-20981 - Allow custom base-pages with less `crmApp` boilerplate

6 years agoMerge pull request #11841 from jitendrapurohit/core-26
colemanw [Tue, 20 Mar 2018 15:38:55 +0000 (11:38 -0400)]
Merge pull request #11841 from jitendrapurohit/core-26

core/issues/26 - On behalf form fails to create new organisation

6 years agoMerge pull request #11839 from mukeshcompucorp/fix-template-structure-issues
colemanw [Tue, 20 Mar 2018 12:58:38 +0000 (08:58 -0400)]
Merge pull request #11839 from mukeshcompucorp/fix-template-structure-issues

Fix template structure issues

6 years agocore/issues/26 - On behalf form fails to create new organisation
Jitendra Purohit [Tue, 20 Mar 2018 09:34:37 +0000 (15:04 +0530)]
core/issues/26 - On behalf form fails to create new organisation

6 years agoFix table for Contribute
Mukesh Ram [Tue, 20 Mar 2018 05:14:38 +0000 (10:44 +0530)]
Fix table for Contribute

6 years agoMerge pull request #11835 from civicrm/5.0
Eileen McNaughton [Tue, 20 Mar 2018 02:21:46 +0000 (15:21 +1300)]
Merge pull request #11835 from civicrm/5.0

Merge from rc to master

6 years agoCRM-20981 - Tweak docblock
Tim Otten [Mon, 19 Mar 2018 22:20:54 +0000 (15:20 -0700)]
CRM-20981 - Tweak docblock

6 years agoMerge pull request #10602 from agileware/CIVICRM-167
Eileen McNaughton [Mon, 19 Mar 2018 21:35:04 +0000 (10:35 +1300)]
Merge pull request #10602 from agileware/CIVICRM-167

CRM-20811 CIVICRM-167 Schedule Reminders uses mixed terminology for Active state

6 years agoMerge pull request #10403 from yashodha/CRM-20624
Eileen McNaughton [Mon, 19 Mar 2018 21:31:23 +0000 (10:31 +1300)]
Merge pull request #10403 from yashodha/CRM-20624

CRM-20624

6 years agoMerge pull request #11786 from seamuslee001/CRM-21835
Eileen McNaughton [Mon, 19 Mar 2018 21:19:23 +0000 (10:19 +1300)]
Merge pull request #11786 from seamuslee001/CRM-21835

CRM-21835 Gracefully switch Log Table Engines if Archive is not avali…

6 years agoMerge pull request #11831 from agh1/alphatestfix
Eileen McNaughton [Mon, 19 Mar 2018 19:57:21 +0000 (08:57 +1300)]
Merge pull request #11831 from agh1/alphatestfix

Version check test: in alphas don't test for site stats not provided for alphas

6 years agoVersionCheckTest - Use assertions if *not* alpha
Tim Otten [Mon, 19 Mar 2018 18:12:55 +0000 (11:12 -0700)]
VersionCheckTest - Use assertions if *not* alpha

6 years agoVersion check test: in alphas don't test for site stats not provided for alphas
Andrew Hunt [Mon, 19 Mar 2018 14:45:16 +0000 (10:45 -0400)]
Version check test: in alphas don't test for site stats not provided for alphas

6 years agoMerge pull request #11727 from jitendrapurohit/CRM-21807
Eileen McNaughton [Mon, 19 Mar 2018 07:55:14 +0000 (20:55 +1300)]
Merge pull request #11727 from jitendrapurohit/CRM-21807

CRM-21807 - Deleted contacts included by default in Membership and co…

6 years agoMove help section outside of block
Mukesh Ram [Mon, 19 Mar 2018 07:24:20 +0000 (12:54 +0530)]
Move help section outside of block

6 years agoFix template structures
Mukesh Ram [Mon, 19 Mar 2018 07:16:52 +0000 (12:46 +0530)]
Fix template structures

6 years agoMerge pull request #11820 from seanmadsen/CRM-21264
Eileen McNaughton [Mon, 19 Mar 2018 06:53:00 +0000 (19:53 +1300)]
Merge pull request #11820 from seanmadsen/CRM-21264

 CRM-21264 - Fix tabular formatting of contributions in merged letters grouped by contact

6 years agoMerge pull request #11827 from eileenmcnaughton/fix_wp
colemanw [Mon, 19 Mar 2018 06:16:49 +0000 (02:16 -0400)]
Merge pull request #11827 from eileenmcnaughton/fix_wp

Fix page layout for wordpress (dev/core/issues/21)

6 years agoFix page layout for wordpress
eileen [Mon, 19 Mar 2018 01:27:31 +0000 (14:27 +1300)]
Fix page layout for wordpress

6 years agoMerge pull request #10776 from eileenmcnaughton/mon2
Eileen McNaughton [Mon, 19 Mar 2018 00:00:11 +0000 (13:00 +1300)]
Merge pull request #10776 from eileenmcnaughton/mon2

CRM-20610 expose payment edit form on the contribution page

6 years agoMerge pull request #11809 from mattwire/devcore17_interview_task_pseudoconstant
Eileen McNaughton [Sun, 18 Mar 2018 22:54:01 +0000 (11:54 +1300)]
Merge pull request #11809 from mattwire/devcore17_interview_task_pseudoconstant

dev/core/17 Convert interview task to use Pseudoconstants

6 years agoTest for CRM-21711
Alice Frumin [Wed, 21 Feb 2018 22:17:53 +0000 (17:17 -0500)]
Test for CRM-21711

6 years agoCRM-21711 Membership: moving updating custom fields into the foreach
Alice Frumin [Thu, 25 Jan 2018 21:50:50 +0000 (16:50 -0500)]
CRM-21711 Membership: moving updating custom fields into the foreach

6 years agodev/core/17 Convert interview task to use Pseudoconstants
Matthew Wire [Wed, 14 Mar 2018 11:56:37 +0000 (11:56 +0000)]
dev/core/17 Convert interview task to use Pseudoconstants

6 years agoMerge pull request #11797 from hoegrammer/master
colemanw [Fri, 16 Mar 2018 16:35:49 +0000 (12:35 -0400)]
Merge pull request #11797 from hoegrammer/master

CRM-21838 strip html tags from alerts when crm-notification-container div is not present

6 years agoMerge pull request #11818 from mukeshcompucorp/fix-template-structure-issues
colemanw [Fri, 16 Mar 2018 16:32:17 +0000 (12:32 -0400)]
Merge pull request #11818 from mukeshcompucorp/fix-template-structure-issues

Fix template in pledge and batch

6 years agoSet version to 5.1.alpha1
CiviCRM [Thu, 15 Mar 2018 23:14:45 +0000 (23:14 +0000)]
Set version to 5.1.alpha1

6 years agoset-version.php - Fix for running on uninitialized codebase
CiviCRM [Thu, 15 Mar 2018 23:06:29 +0000 (23:06 +0000)]
set-version.php - Fix for running on uninitialized codebase

The script assumes that `civicrm-version.php` is around. It will eventually be
committed, and it's available if you ran GenCode, but it's not *necessarily*
around yet.

6 years agoDowngrade number from 5.0.0 to 5.0.beta1
CiviCRM [Thu, 15 Mar 2018 23:05:08 +0000 (23:05 +0000)]
Downgrade number from 5.0.0 to 5.0.beta1

We're about to branch for RC period. Since we've got the third digit again
(for use in each monthly cycle), let's take advantage of it!

6 years agoCRM-21264 - Fix broken regular expression
Sean Madsen [Thu, 15 Mar 2018 14:58:33 +0000 (10:58 -0400)]
CRM-21264 - Fix broken regular expression

* Escape dot in token since it will be used in a regex (for good
  measure)
* Add `(?![\w-])` to ensure that `td` is not followed by other
  characters that would make it a different element.
* Instead of the first `.+?`, use `((?!</td>).)*` which matches zero or
  more characters but refuses to consume if it encounters `</td>`
* Escape curly braces (for good measure)
* Instead of the second `.+?`, use `.*?` so that it will match if there
  are zero characters. (Note: this change is really the crux of the
  issue, as described in CRM-21264).
* Complete then closing `</td>` (for good measure)

6 years agoCRM-21264 - Minor refactoring
Sean Madsen [Thu, 15 Mar 2018 14:45:53 +0000 (10:45 -0400)]
CRM-21264 - Minor refactoring

* Improve docblock
* Get rid of "dontCare" since that argument is optional as of PHP 5.4
  http://php.net/manual/en/function.preg-match-all.php#refsect1-function.preg-match-all-changelog
* Move regex to its own line to improve readability

6 years agoCRM-21264 - Add test for isHtmlTokenInTableCell
Sean Madsen [Thu, 15 Mar 2018 14:40:16 +0000 (10:40 -0400)]
CRM-21264 - Add test for isHtmlTokenInTableCell

Test currently fails on "simplest TRUE" case added, which demonstrates
the bug described in CRM-21264. Also added other test cases which
current fail as well.

6 years agoFix template in pledge and batch
Mukesh Ram [Thu, 15 Mar 2018 14:05:03 +0000 (19:35 +0530)]
Fix template in pledge and batch

6 years agoMerge pull request #11815 from eileenmcnaughton/notice
Eileen McNaughton [Thu, 15 Mar 2018 11:20:17 +0000 (00:20 +1300)]
Merge pull request #11815 from eileenmcnaughton/notice

Activity Form - Fix recently introduced warning

6 years agoMerge pull request #11519 from eileenmcnaughton/hook
Eileen McNaughton [Thu, 15 Mar 2018 07:48:20 +0000 (20:48 +1300)]
Merge pull request #11519 from eileenmcnaughton/hook

CRM-21659 - Add hook to CRM_Utils_System::redirect

6 years agoCRM_Utils_Hook::alterRedirect - Pass URL by reference
Tim Otten [Thu, 15 Mar 2018 05:19:49 +0000 (22:19 -0700)]
CRM_Utils_Hook::alterRedirect - Pass URL by reference

PSR-7 specifies that the `UriInterface` is immutable.  There are methods
like `withQuery(...)` which generate a *new instance*.

For the hook to support altering the URL, you must be able to replace the
`$url` with a newer instance.

6 years agoWarning fix
eileen [Thu, 15 Mar 2018 04:21:44 +0000 (17:21 +1300)]
Warning fix

6 years agoMerge pull request #11813 from seanmadsen/add-survey-pre-post-hooks
Eileen McNaughton [Thu, 15 Mar 2018 02:28:25 +0000 (15:28 +1300)]
Merge pull request #11813 from seanmadsen/add-survey-pre-post-hooks

Add pre and post hooks to the Survey entity

6 years agoMerge pull request #11811 from mukeshcompucorp/fix-template-structure-issues
Eileen McNaughton [Wed, 14 Mar 2018 22:59:14 +0000 (11:59 +1300)]
Merge pull request #11811 from mukeshcompucorp/fix-template-structure-issues

Fix transaction template

6 years agoMerge pull request #11704 from totten/master-50
Eileen McNaughton [Wed, 14 Mar 2018 22:32:14 +0000 (11:32 +1300)]
Merge pull request #11704 from totten/master-50

dev/release/1 - Change numbering to 5.x.x

6 years agoAdd pre/post hooks to the Survey entity
Sean Madsen [Wed, 14 Mar 2018 21:31:47 +0000 (17:31 -0400)]
Add pre/post hooks to the Survey entity

Also improve docblock

6 years agoMerge pull request #11808 from mattwire/CRM-21391_find_respondents_fix
Eileen McNaughton [Wed, 14 Mar 2018 21:04:35 +0000 (10:04 +1300)]
Merge pull request #11808 from mattwire/CRM-21391_find_respondents_fix

CRM-21391 Fix for "Find Respondents" Search

6 years agoCRM-21391 Fix 'Find Respondents' Search Tasks
Matthew Wire [Wed, 14 Mar 2018 11:50:48 +0000 (11:50 +0000)]
CRM-21391 Fix 'Find Respondents' Search Tasks

6 years agoFix transaction templates
Mukesh Ram [Wed, 14 Mar 2018 11:36:04 +0000 (17:06 +0530)]
Fix transaction templates

6 years agoCRM-21659 Add hook to CRM_Utils_System::redirect
eileen [Wed, 14 Mar 2018 02:00:15 +0000 (15:00 +1300)]
CRM-21659 Add hook to CRM_Utils_System::redirect

fixup CRM-21659 Add hook to CRM_Utils_System::redirect

This renames the hook function to be stylistically more consistent.  In
other tests, the function name matches the hook name.

6 years agoSet version to 5.0.0
Tim Otten [Wed, 21 Feb 2018 23:41:21 +0000 (15:41 -0800)]
Set version to 5.0.0

6 years agoMerge pull request #11721 from eileenmcnaughton/website
colemanw [Tue, 13 Mar 2018 13:06:12 +0000 (09:06 -0400)]
Merge pull request #11721 from eileenmcnaughton/website

Fix relationshipType, paymentProcessorType, Note & jobLog apis to support custom data

6 years agoMerge pull request #11590 from michaelmcandrew/CRM-21576-sms-permission
colemanw [Tue, 13 Mar 2018 13:02:06 +0000 (09:02 -0400)]
Merge pull request #11590 from michaelmcandrew/CRM-21576-sms-permission

CRM-21576 Add a 'send SMS' permission

6 years agoMerge pull request #11796 from mukeshcompucorp/fix-template-structure-issues
colemanw [Tue, 13 Mar 2018 12:10:45 +0000 (08:10 -0400)]
Merge pull request #11796 from mukeshcompucorp/fix-template-structure-issues

Fix html template structure with classes, divs & tags

6 years agoAdding Send SMS permission + test + upgrade message
Michael McAndrew [Tue, 13 Mar 2018 09:18:36 +0000 (09:18 +0000)]
Adding Send SMS permission + test + upgrade message

6 years agoMerge pull request #11801 from eileenmcnaughton/api_test
Monish Deb [Tue, 13 Mar 2018 07:47:00 +0000 (13:17 +0530)]
Merge pull request #11801 from eileenmcnaughton/api_test

Add test for api money, fix net_amount calc

6 years agoMerge pull request #11802 from jitendrapurohit/CRM-21777-ts
Eileen McNaughton [Tue, 13 Mar 2018 07:20:02 +0000 (20:20 +1300)]
Merge pull request #11802 from jitendrapurohit/CRM-21777-ts

CRM-21777 - add ts to the message string

6 years agoCall labels from logic instead of static
Mukesh Ram [Tue, 13 Mar 2018 05:35:18 +0000 (11:05 +0530)]
Call labels from logic instead of static

6 years agoCRM-21777 - add ts to the message string
Jitendra Purohit [Tue, 13 Mar 2018 05:13:43 +0000 (10:43 +0530)]
CRM-21777 - add ts to the message string

6 years agoAdd test for api money, fix net_amount calc
eileen [Tue, 13 Mar 2018 03:24:23 +0000 (16:24 +1300)]
Add test for api money, fix net_amount calc

6 years agoMerge pull request #11781 from colemanw/MenuHacks
Eileen McNaughton [Tue, 13 Mar 2018 01:04:10 +0000 (14:04 +1300)]
Merge pull request #11781 from colemanw/MenuHacks

Remove hacks from CRM_Core_Menu for old unsupported versions

6 years agoMerge pull request #11799 from eileenmcnaughton/enotice
Eileen McNaughton [Mon, 12 Mar 2018 23:36:11 +0000 (12:36 +1300)]
Merge pull request #11799 from eileenmcnaughton/enotice

E-notice fix.

6 years agoCRM-21838 - Strips html from CRM.alert when falling back to alert()
Naomi [Mon, 12 Mar 2018 20:53:33 +0000 (22:53 +0200)]
CRM-21838 - Strips html from CRM.alert when falling back to alert()

6 years agoE-notice fix - move variable declaration to parent class.
eileen [Mon, 12 Mar 2018 08:02:29 +0000 (21:02 +1300)]
E-notice fix - move variable declaration to parent class.

I hit this when editing a contribution with line items related to membership.

6 years agoMerge pull request #11800 from GinkgoFJG/patch-2
colemanw [Mon, 12 Mar 2018 19:57:26 +0000 (15:57 -0400)]
Merge pull request #11800 from GinkgoFJG/patch-2

CRM-21667: Fix for timezone handoff from Drupal6 should take DST into account.

6 years agoMerge pull request #11777 from twomice/CRM-20608_paypal_ipn_confuses_pro_vs_standard
Mathieu Lu [Mon, 12 Mar 2018 18:51:29 +0000 (14:51 -0400)]
Merge pull request #11777 from twomice/CRM-20608_paypal_ipn_confuses_pro_vs_standard

CRM-20608: IPN thinks Paypal Pro is Standard.

6 years agoCRM-21667: Fix for timezone handoff from Drupal6 should take DST into account
Frank J. Gómez [Mon, 12 Mar 2018 17:04:36 +0000 (13:04 -0400)]
CRM-21667: Fix for timezone handoff from Drupal6 should take DST into account

6 years agoFix for CRM-20608: throw exception in case of not-found processor or wrong processor...
Allen Shaw [Mon, 12 Mar 2018 16:11:45 +0000 (11:11 -0500)]
Fix for CRM-20608: throw exception in case of not-found processor or wrong processor type.

6 years agoMerge pull request #11795 from mattwire/form_disabled_currency
Eileen McNaughton [Mon, 12 Mar 2018 09:06:14 +0000 (22:06 +1300)]
Merge pull request #11795 from mattwire/form_disabled_currency

dev/financial/5 If a currency has been disabled allow the form to be submitted

6 years agoMerge pull request #11798 from eileenmcnaughton/test
Seamus Lee [Mon, 12 Mar 2018 04:06:26 +0000 (15:06 +1100)]
Merge pull request #11798 from eileenmcnaughton/test

Update test to NOT accept a failure in the api call.

6 years agoMerge pull request #11680 from jitendrapurohit/setting
Eileen McNaughton [Mon, 12 Mar 2018 04:00:36 +0000 (17:00 +1300)]
Merge pull request #11680 from jitendrapurohit/setting

CRM-21777 - Set readonly for the fields initialised in civicrm_settings.php

6 years agoMerge pull request #11761 from mattwire/CRM-21391_mailing_task
Eileen McNaughton [Mon, 12 Mar 2018 03:34:01 +0000 (16:34 +1300)]
Merge pull request #11761 from mattwire/CRM-21391_mailing_task

CRM-21391 Convert Mailing to use core Task class

6 years agoMerge pull request #11762 from mattwire/CRM-21391_member_task
Eileen McNaughton [Mon, 12 Mar 2018 03:22:30 +0000 (16:22 +1300)]
Merge pull request #11762 from mattwire/CRM-21391_member_task

CRM-21391 Convert Member to use core Task class

6 years agoUpdate test to NOT accept a failure in the api call.
eileen [Mon, 12 Mar 2018 02:27:44 +0000 (15:27 +1300)]
Update test to NOT accept a failure in the api call.

I believe the failure handling exists because this was copied from a test that
uses a real payment gateway's sandbox account, hence intermittant failure.

However, we don't need that for the Dummy processor & it's making debugging hard

6 years agoMerge pull request #11780 from JMAConsulting/CRM-21756
Eileen McNaughton [Sun, 11 Mar 2018 22:17:57 +0000 (11:17 +1300)]
Merge pull request #11780 from JMAConsulting/CRM-21756

CRM-21756: Freeze total amount field on Edit Contribution if related to Membership or Event registration

6 years agoMerge pull request #11763 from mattwire/CRM-21391_pledge_task
Eileen McNaughton [Sun, 11 Mar 2018 22:06:51 +0000 (11:06 +1300)]
Merge pull request #11763 from mattwire/CRM-21391_pledge_task

CRM-21391 Convert Pledge to use core Task class

6 years agoMerge pull request #11776 from vinuvarshith/CRM-21830-state-province-tokens-not-worki...
Eileen McNaughton [Sun, 11 Mar 2018 21:39:29 +0000 (10:39 +1300)]
Merge pull request #11776 from vinuvarshith/CRM-21830-state-province-tokens-not-working-billing-address

CRM-21830: Add 'state_province_name' token and set appropriate value …

6 years agoMerge pull request #11600 from mattwire/CRM-21720_core_task_search_classes
Eileen McNaughton [Sun, 11 Mar 2018 21:32:30 +0000 (10:32 +1300)]
Merge pull request #11600 from mattwire/CRM-21720_core_task_search_classes

CRM-21720 Cleanup search classes to use enumerators instead of hardcoded values

6 years agoConvert Contact to use core Task class (#11764)
Matthew Wire [Sun, 11 Mar 2018 21:31:52 +0000 (21:31 +0000)]
Convert Contact to use core Task class (#11764)

6 years agoAdd contributionStatusName to invoice params so you don't have to use hardcoded IDs...
Matthew Wire [Sun, 11 Mar 2018 21:23:52 +0000 (21:23 +0000)]
Add contributionStatusName to invoice params so you don't have to use hardcoded IDs in template (#11771)

6 years agoFix template structure
Mukesh Ram [Sat, 10 Mar 2018 11:02:03 +0000 (16:32 +0530)]
Fix template structure

6 years agoMerge pull request #11769 from JMAConsulting/CRM-21806
Tim Otten [Sat, 10 Mar 2018 01:30:45 +0000 (17:30 -0800)]
Merge pull request #11769 from JMAConsulting/CRM-21806

[REGRESSION] CRM-21806: Fix issues is search form when FULL_GROUP_BY_MODE enabled

6 years agoMerge pull request #11790 from GinkgoFJG/dev/core#12-crmWizard-scrollup
colemanw [Fri, 9 Mar 2018 15:09:10 +0000 (10:09 -0500)]
Merge pull request #11790 from GinkgoFJG/dev/core#12-crmWizard-scrollup

dev/core#12: Added auto-scroll-up functionality between steps to crmUiWizard

6 years agoMerge pull request #11792 from mukeshcompucorp/fix-template-structure-issues
colemanw [Fri, 9 Mar 2018 14:36:45 +0000 (09:36 -0500)]
Merge pull request #11792 from mukeshcompucorp/fix-template-structure-issues

Fix style glitches

6 years agoMerge pull request #11793 from cor73x/CRM-21837
Mathieu Lu [Fri, 9 Mar 2018 14:21:19 +0000 (09:21 -0500)]
Merge pull request #11793 from cor73x/CRM-21837

Refs CRM-21837 - Missing states for Gabon

6 years agoIf a currency has been disabled allow the form to be submitted
Matthew Wire [Fri, 9 Mar 2018 11:39:51 +0000 (11:39 +0000)]
If a currency has been disabled allow the form to be submitted

6 years agoFix classes and tags
Mukesh Ram [Fri, 9 Mar 2018 10:10:06 +0000 (15:40 +0530)]
Fix classes and tags

6 years agoRefs CRM-21837 - Missing states for Gabon
Lukasz Krutul [Fri, 9 Mar 2018 10:07:15 +0000 (11:07 +0100)]
Refs CRM-21837 - Missing states for Gabon