civicrm-core.git
6 years agoMerge pull request #11368 from JMAConsulting/CRM-21499
colemanw [Tue, 5 Dec 2017 16:17:26 +0000 (11:17 -0500)]
Merge pull request #11368 from JMAConsulting/CRM-21499

CRM-21499: Add filter for tagset page

6 years agoCRM-21499 - Add clear button to search form and cleanup/bugfixes
Coleman Watts [Tue, 5 Dec 2017 05:44:51 +0000 (00:44 -0500)]
CRM-21499 - Add clear button to search form and cleanup/bugfixes

6 years agoMerge pull request #11364 from eileenmcnaughton/ps1
colemanw [Mon, 4 Dec 2017 23:38:20 +0000 (18:38 -0500)]
Merge pull request #11364 from eileenmcnaughton/ps1

CRM-21180: Inline changes to custom fields aren't reflected in custom greetings + CRM-21474 add support for setting non-required fields to 'null'

6 years agoMerge pull request #11367 from mattwire/CRM_21517_updatesub_optiongroup
Eileen McNaughton [Mon, 4 Dec 2017 22:21:06 +0000 (11:21 +1300)]
Merge pull request #11367 from mattwire/CRM_21517_updatesub_optiongroup

CRM-21517 OptionGroup->PseudoConstant in UpdateSubscription

6 years agoCRM-21499: Add filter for tagset page
deb.monish [Mon, 4 Dec 2017 20:59:01 +0000 (02:29 +0530)]
CRM-21499: Add filter for tagset page

6 years agoOptionGroup->PseudoConstant in UpdateSubscription
Matthew Wire [Mon, 4 Dec 2017 20:03:46 +0000 (20:03 +0000)]
OptionGroup->PseudoConstant in UpdateSubscription

6 years agoMerge pull request #11091 from JMAConsulting/CRM-21279
Mathieu Lu [Mon, 4 Dec 2017 15:20:05 +0000 (10:20 -0500)]
Merge pull request #11091 from JMAConsulting/CRM-21279

CRM-21279: Rebuild recipient list and calculate count on demand, store result in cache

6 years agominor fixes
deb.monish [Mon, 30 Oct 2017 17:25:28 +0000 (22:55 +0530)]
minor fixes

6 years agoadditional fixes
deb.monish [Thu, 12 Oct 2017 20:12:28 +0000 (01:42 +0530)]
additional fixes

6 years agoRebuild recipient list and calculate count on demand, store result in
deb.monish [Mon, 9 Oct 2017 14:20:15 +0000 (19:50 +0530)]
Rebuild recipient list and calculate count on demand, store result in

6 years agoCRM-21474, CRM-21880 fix error in Contact schema causing test fail.
eileen [Mon, 4 Dec 2017 08:37:43 +0000 (21:37 +1300)]
CRM-21474, CRM-21880 fix error in Contact schema causing test fail.

The pseudoConstant was against the wrong field

6 years agoCRM-21474 add support for setting non-required fields to 'null'
eileen [Mon, 4 Dec 2017 05:10:01 +0000 (18:10 +1300)]
CRM-21474 add support for setting non-required fields to 'null'

When a field is not required in the database the 'null' should be pass through the pseudoconstant validation.

Note the unit test on this is failing because the BAO is not respecting setting null. Follow up patch

6 years agoFix for CRM-21180: Inline changes to custom fields aren't reflected in custom greetings.
Allen Shaw [Wed, 8 Nov 2017 09:46:50 +0000 (03:46 -0600)]
Fix for CRM-21180: Inline changes to custom fields aren't reflected in custom greetings.

Includes unit test.

Toward CRM-21180: Better static var handling.

Toward CRM-21180: removed static vars; removed unused method parameters.

CRM-21180 add unit test for custom field being set in address

CRM-21180 Inline changes to custom fields aren't reflected in custom greetings

This incorporates Allan's work to cause custom fields to be updated
when a custom value is updated. These have been reconciled with the changes to allow
greeting fields to be set to null per CRM-21474

m

6 years agoMerge pull request #11363 from civicrm/4.7.28-rc
Eileen McNaughton [Mon, 4 Dec 2017 04:45:54 +0000 (17:45 +1300)]
Merge pull request #11363 from civicrm/4.7.28-rc

4.7.28 rc

6 years agoMerge pull request #11310 from eileenmcnaughton/greet
Eileen McNaughton [Mon, 4 Dec 2017 04:00:32 +0000 (17:00 +1300)]
Merge pull request #11310 from eileenmcnaughton/greet

CRM-21466 - Fix (obscure) enotice when updating greeting for contact,…

6 years agoCRM-21466 follow up, add unit test to ensure custom fields can be populated.
eileen [Wed, 22 Nov 2017 23:13:10 +0000 (12:13 +1300)]
CRM-21466 follow up, add unit test to ensure custom fields can be populated.

This involves fixing the caching to be flushed during testing

6 years agoMerge pull request #11361 from seamuslee001/CRM-21508
Eileen McNaughton [Mon, 4 Dec 2017 00:49:19 +0000 (13:49 +1300)]
Merge pull request #11361 from seamuslee001/CRM-21508

CRM-21508 Fix column Information for civicrm_mailing.created_date pas…

6 years agoMerge pull request #11360 from seanmadsen/CRM-21507
colemanw [Mon, 4 Dec 2017 00:08:41 +0000 (19:08 -0500)]
Merge pull request #11360 from seanmadsen/CRM-21507

CRM-21507 Fix error when creating case activities

6 years agoCRM-21507 Improve Activity Separation field logic
Sean Madsen [Sun, 3 Dec 2017 23:20:03 +0000 (18:20 -0500)]
CRM-21507 Improve Activity Separation field logic

Only display the this field on the form if it's defined in the form
class. Only define it in the form class if the class property says to do
so.

6 years agoCRM-21508 Fix column Information for civicrm_mailing.created_date passed to Docker...
Seamus Lee [Sun, 3 Dec 2017 20:10:49 +0000 (07:10 +1100)]
CRM-21508 Fix column Information for civicrm_mailing.created_date passed to Docker When

6 years agoCRM-21507 Fix error when creating case activities
Sean Madsen [Sun, 3 Dec 2017 17:03:40 +0000 (12:03 -0500)]
CRM-21507 Fix error when creating case activities

Before: When adding a new activity to a case, an error message
"Activity Separation is a required field" appears and prevents the user
from submitting the form. There is no way to get around this error.

After: The user can create case activities without hitting this error
message. Also the error still displays as expected when creating
non-case activities that have multiple target contacts.

This changes fixes a regression caused by my fix for CRM-21419.

6 years agoMerge pull request #11250 from agh1/no-update-indices
colemanw [Sat, 2 Dec 2017 23:25:10 +0000 (18:25 -0500)]
Merge pull request #11250 from agh1/no-update-indices

CRM-21298 System check: bypass missing indices check until update indices works

6 years agoMerge pull request #9648 from MegaphoneJon/CRM-19608
colemanw [Sat, 2 Dec 2017 23:20:03 +0000 (18:20 -0500)]
Merge pull request #9648 from MegaphoneJon/CRM-19608

CRM-19608 - Show/hide auto-renew element on membership pages even whe…

6 years agoMerge pull request #11198 from jitendrapurohit/CRM-20343-fix
colemanw [Sat, 2 Dec 2017 23:16:45 +0000 (18:16 -0500)]
Merge pull request #11198 from jitendrapurohit/CRM-20343-fix

CRM-20343: Override membership status when contribution is cancelled

6 years agoMerge pull request #11359 from eileenmcnaughton/recur
Eileen McNaughton [Sat, 2 Dec 2017 22:27:28 +0000 (11:27 +1300)]
Merge pull request #11359 from eileenmcnaughton/recur

CRM-20800 follow on fix per Matt review

7 years agoCRM-20800 follow on fix per Matt review
eileen [Thu, 30 Nov 2017 19:57:04 +0000 (08:57 +1300)]
CRM-20800 follow on fix per Matt review

7 years agoMerge pull request #11290 from yashodha/CRM-21443
Eileen McNaughton [Sat, 2 Dec 2017 21:17:23 +0000 (10:17 +1300)]
Merge pull request #11290 from yashodha/CRM-21443

CRM-21443 - Add support for auto-complete fields in the batch update …

7 years agoCRM-21466 - Fix (obscure) enotice when updating greeting for contact, add test
eileen [Wed, 22 Nov 2017 04:17:59 +0000 (17:17 +1300)]
CRM-21466 - Fix (obscure) enotice when updating greeting for contact, add test

7 years agoMerge pull request #11358 from mattwire/CRM-21504_membership_on_recurring_detail
colemanw [Sat, 2 Dec 2017 16:52:09 +0000 (11:52 -0500)]
Merge pull request #11358 from mattwire/CRM-21504_membership_on_recurring_detail

CRM-21504 Add membership to recurring contribution detail

7 years agoMerge pull request #11281 from nielosz/recent-items-dupe-check
colemanw [Sat, 2 Dec 2017 16:50:20 +0000 (11:50 -0500)]
Merge pull request #11281 from nielosz/recent-items-dupe-check

CRM-21433: Optimize dupe checking in Recent Items stack

7 years agoMerge pull request #11313 from eileenmcnaughton/greet2
colemanw [Sat, 2 Dec 2017 16:45:50 +0000 (11:45 -0500)]
Merge pull request #11313 from eileenmcnaughton/greet2

CRM-21471 remove unused core function CRM_Core_Pseudoconstant::greeti…

7 years agoMerge pull request #11187 from yashodha/CRM-21342
colemanw [Sat, 2 Dec 2017 16:22:33 +0000 (11:22 -0500)]
Merge pull request #11187 from yashodha/CRM-21342

CRM-21342 - Contribution note is not wiped if the value is removed

7 years agoMerge pull request #11193 from MiyaNoctem/CRM-21328-warning-on-empty-visibility
colemanw [Sat, 2 Dec 2017 16:20:30 +0000 (11:20 -0500)]
Merge pull request #11193 from MiyaNoctem/CRM-21328-warning-on-empty-visibility

CRM-21328: Remove '-select-' Option From Visibility

7 years agoAdd membership to recurring contribution detail
Matthew Wire [Sat, 2 Dec 2017 15:03:28 +0000 (15:03 +0000)]
Add membership to recurring contribution detail

7 years agoMerge pull request #11323 from samuelsov/CRM-21478
Eileen McNaughton [Sat, 2 Dec 2017 03:52:45 +0000 (16:52 +1300)]
Merge pull request #11323 from samuelsov/CRM-21478

CRM-21478 Using contribution status id instead of label in if statement

7 years agoMerge pull request #11010 from seamuslee001/CRM-21206
Eileen McNaughton [Sat, 2 Dec 2017 03:32:51 +0000 (16:32 +1300)]
Merge pull request #11010 from seamuslee001/CRM-21206

CRM-21206 Ensure that the recipients field of AB Test results is fill…

7 years agoMerge pull request #11357 from eileenmcnaughton/reportts
Eileen McNaughton [Fri, 1 Dec 2017 22:18:33 +0000 (11:18 +1300)]
Merge pull request #11357 from eileenmcnaughton/reportts

Fix ts() functions to have variable on the outside.

7 years agoMerge pull request #11103 from yashodha/CRM-21286
Eileen McNaughton [Fri, 1 Dec 2017 21:33:53 +0000 (10:33 +1300)]
Merge pull request #11103 from yashodha/CRM-21286

CRM-21286 - expose active flag in UI for group

7 years agoFix ts() functions to have variable on the outside.
eileen [Fri, 1 Dec 2017 21:22:17 +0000 (10:22 +1300)]
Fix ts() functions to have variable on the outside.

7 years agoMerge pull request #11276 from eileenmcnaughton/report-c
colemanw [Fri, 1 Dec 2017 15:40:17 +0000 (10:40 -0500)]
Merge pull request #11276 from eileenmcnaughton/report-c

CRM-20545 - port extended reports metadata approach to adding columns

7 years agoMerge pull request #11349 from JMAConsulting/CRM-21468
colemanw [Fri, 1 Dec 2017 14:46:15 +0000 (09:46 -0500)]
Merge pull request #11349 from JMAConsulting/CRM-21468

CRM-21468: mailing recipients field limits how many groups can be selected

7 years agoMerge pull request #11334 from jitendrapurohit/CRM-21436-unittest
Eileen McNaughton [Fri, 1 Dec 2017 07:36:23 +0000 (20:36 +1300)]
Merge pull request #11334 from jitendrapurohit/CRM-21436-unittest

Unit test for CRM-21436

7 years agoMerge pull request #11343 from agileware/CRM-21457
Eileen McNaughton [Fri, 1 Dec 2017 01:21:22 +0000 (14:21 +1300)]
Merge pull request #11343 from agileware/CRM-21457

CRM-21457: Setting receipt date to current date when requesting a receipt to be emailed on Credit card contribution form.

7 years agoMerge pull request #11354 from lcdservices/CRM-21501
Eileen McNaughton [Fri, 1 Dec 2017 00:13:12 +0000 (13:13 +1300)]
Merge pull request #11354 from lcdservices/CRM-21501

CRM-21501 bounce report date filter type fix

7 years agoCRM-21501 bounce report date filter type fix
Brian Shaughnessy [Thu, 30 Nov 2017 18:38:09 +0000 (13:38 -0500)]
CRM-21501 bounce report date filter type fix

7 years agoMerge pull request #11345 from colemanw/CRM-21497
colemanw [Thu, 30 Nov 2017 15:42:29 +0000 (10:42 -0500)]
Merge pull request #11345 from colemanw/CRM-21497

CRM-21497 - crmRouteBinder: add deep comparison option

7 years agoMerge pull request #11352 from JMAConsulting/CRM-21499
colemanw [Thu, 30 Nov 2017 14:13:05 +0000 (09:13 -0500)]
Merge pull request #11352 from JMAConsulting/CRM-21499

CRM-21499: Add filter to manage tags page

7 years agoCRM-21499: Add filter to manage tags page
deb.monish [Thu, 30 Nov 2017 13:22:57 +0000 (18:52 +0530)]
CRM-21499: Add filter to manage tags page

7 years agoMerge pull request #11348 from eileenmcnaughton/currency
colemanw [Thu, 30 Nov 2017 13:16:14 +0000 (08:16 -0500)]
Merge pull request #11348 from eileenmcnaughton/currency

CRM-21482 follow up notice fix - sync function signatures on getCurrency

7 years agoUnit test for CRM-21436
Jitendra Purohit [Tue, 28 Nov 2017 02:47:45 +0000 (08:17 +0530)]
Unit test for CRM-21436

7 years agoCRM-21468: mailing recipients field limits how many groups can be selected
deb.monish [Thu, 30 Nov 2017 10:01:41 +0000 (15:31 +0530)]
CRM-21468: mailing recipients field limits how many groups can be selected

7 years agoMerge pull request #11311 from mlutfy/crm21469
Eileen McNaughton [Thu, 30 Nov 2017 07:29:45 +0000 (20:29 +1300)]
Merge pull request #11311 from mlutfy/crm21469

CRM-21469: Fix removal from all groups from Edit Contact

7 years agoCRM-21457: Setting receipt date to current date when requesting a receipt to be email...
Alok Patel [Thu, 30 Nov 2017 05:51:08 +0000 (11:21 +0530)]
CRM-21457: Setting receipt date to current date when requesting a receipt to be emailed on Credit card contribution form.

7 years agoMerge pull request #11000 from JMAConsulting/CRM-20569-1
Eileen McNaughton [Thu, 30 Nov 2017 05:23:39 +0000 (18:23 +1300)]
Merge pull request #11000 from JMAConsulting/CRM-20569-1

CRM-20569: Add priceset validation on a partial payment use-case and other improvements

7 years agoCRM-21482 follow up notice fix - sync function signatures on getCurrency
eileen [Thu, 30 Nov 2017 05:22:30 +0000 (18:22 +1300)]
CRM-21482 follow up notice fix - sync function signatures on getCurrency

7 years agoMerge pull request #11347 from civicrm/4.7.28-rc
Eileen McNaughton [Wed, 29 Nov 2017 21:55:55 +0000 (10:55 +1300)]
Merge pull request #11347 from civicrm/4.7.28-rc

4.7.28 rc merge to master

7 years agoMerge pull request #11346 from seamuslee001/fix_mysql
Eileen McNaughton [Wed, 29 Nov 2017 21:55:29 +0000 (10:55 +1300)]
Merge pull request #11346 from seamuslee001/fix_mysql

Fix for mysql 5.7 crash due to not adding ANY_VALUE

7 years agoCRM-20545 - port extended reports metadata approach to adding columns
eileen [Tue, 14 Nov 2017 04:30:14 +0000 (17:30 +1300)]
CRM-20545 - port extended reports metadata approach to adding columns

7 years agoFix for mysql 5.7 crash due to not adding ANY_VALUE
Seamus Lee [Wed, 29 Nov 2017 20:40:52 +0000 (07:40 +1100)]
Fix for mysql 5.7 crash due to not adding ANY_VALUE

7 years agoMerge pull request #11208 from JMAConsulting/CRM-21363
Eileen McNaughton [Wed, 29 Nov 2017 20:56:37 +0000 (09:56 +1300)]
Merge pull request #11208 from JMAConsulting/CRM-21363

CRM-21363: Revert _supportFullGroupBy addition

7 years agoCRM-21497 - crmRouteBinder: add deep comparison option
Coleman Watts [Wed, 29 Nov 2017 19:39:41 +0000 (14:39 -0500)]
CRM-21497 - crmRouteBinder: add deep comparison option

7 years agoMerge pull request #10466 from kryptothesuperdog/master
colemanw [Wed, 29 Nov 2017 17:51:27 +0000 (12:51 -0500)]
Merge pull request #10466 from kryptothesuperdog/master

CRM-20681 Search automatically when switching options in Quicksearch

7 years agoCRM-20681 - more concise jQuery for search bar
colemanw [Wed, 29 Nov 2017 17:50:34 +0000 (12:50 -0500)]
CRM-20681 - more concise jQuery for search bar

7 years agoMerge pull request #11344 from eileenmcnaughton/currency
colemanw [Wed, 29 Nov 2017 17:40:26 +0000 (12:40 -0500)]
Merge pull request #11344 from eileenmcnaughton/currency

CRM-21482 follow up notice fix - sync function signatures on getCurrency

7 years agoMerge pull request #11007 from jitendrapurohit/importprogress
colemanw [Wed, 29 Nov 2017 17:38:57 +0000 (12:38 -0500)]
Merge pull request #11007 from jitendrapurohit/importprogress

CRM-21204 : Add progress bar for Contribution, membership and activity import

7 years agoCRM-21478 Using contribution status name instead of id
Samuel Vanhove [Wed, 29 Nov 2017 13:57:12 +0000 (08:57 -0500)]
CRM-21478 Using contribution status name instead of id

7 years agoadd ts and minor fixes
Jitendra Purohit [Wed, 29 Nov 2017 08:58:33 +0000 (14:28 +0530)]
add ts and minor fixes

7 years agoadditional changes
Jitendra Purohit [Wed, 27 Sep 2017 11:07:57 +0000 (16:37 +0530)]
additional changes

7 years agoAdd progress bar for all import process
Jitendra Purohit [Fri, 30 Jun 2017 08:35:31 +0000 (14:05 +0530)]
Add progress bar for all import process

7 years agominor fixes
deb.monish [Wed, 29 Nov 2017 08:21:35 +0000 (13:51 +0530)]
minor fixes

7 years agoCRM-20569: Add priceset validation on a partial payment use-case and other improvements
deb.monish [Tue, 19 Sep 2017 18:06:46 +0000 (23:36 +0530)]
CRM-20569: Add priceset validation on a partial payment use-case and other improvements

7 years agoMerge pull request #10962 from eileenmcnaughton/fitems
Monish Deb [Wed, 29 Nov 2017 08:01:39 +0000 (13:31 +0530)]
Merge pull request #10962 from eileenmcnaughton/fitems

CRM-19273: Changes to Event Selections on Pending (Pay Later) Contribution Not Creating Correct Financial Items Causing Imbalance in Accounting Batch Export

7 years agoCRM-21482 follow up notice fix - make signature a makes with inheriting abstract...
eileen [Wed, 29 Nov 2017 07:03:27 +0000 (20:03 +1300)]
CRM-21482 follow up notice fix - make signature a makes with inheriting abstract payment class.

I'd really have liked to removed $submittedValues from the AbstractEditPayment class
but it felt too risky since there are a lot of unpredictable params in there.

Only CRM_Contribute_Form_Contribution actually calls that line.

7 years agoCRM-19273 fix recording of financial items when fixes changing price set values
eileen [Wed, 15 Nov 2017 21:06:25 +0000 (10:06 +1300)]
CRM-19273 fix recording of financial items when fixes changing price set values

7 years agoCRM-19723 minor code simplification
eileen [Tue, 28 Nov 2017 07:05:58 +0000 (20:05 +1300)]
CRM-19723 minor code simplification

7 years agoCRM-19273 fix fatal error when re-editing submitted price sets
eileen [Mon, 27 Nov 2017 03:14:02 +0000 (16:14 +1300)]
CRM-19273 fix fatal error when re-editing submitted price sets

7 years agoMerge pull request #10986 from eileenmcnaughton/pp
Eileen McNaughton [Wed, 29 Nov 2017 04:34:20 +0000 (17:34 +1300)]
Merge pull request #10986 from eileenmcnaughton/pp

CRM-20800 fix fatal error up updating paypal contributions

7 years agoMerge pull request #11342 from civicrm/4.7.28-rc
Eileen McNaughton [Wed, 29 Nov 2017 04:21:02 +0000 (17:21 +1300)]
Merge pull request #11342 from civicrm/4.7.28-rc

4.7.28 rc merge to master

7 years agoMerge pull request #11339 from mlutfy/4.7.28-rc-crm21455
Eileen McNaughton [Wed, 29 Nov 2017 04:19:31 +0000 (17:19 +1300)]
Merge pull request #11339 from mlutfy/4.7.28-rc-crm21455

CRM-21455 supportsFullGroupBy: MariaDB 10.2 does not support ANY_VALUE

7 years agoMerge pull request #11341 from mlutfy/4.7.28-rc-crm21480
Eileen McNaughton [Wed, 29 Nov 2017 04:18:23 +0000 (17:18 +1300)]
Merge pull request #11341 from mlutfy/4.7.28-rc-crm21480

CRM-21480 FourSeven/updateContributionInvoiceNumber: fix for MariaDB …

7 years agoMerge pull request #11190 from wmortada/CRM-21344
Eileen McNaughton [Wed, 29 Nov 2017 04:17:28 +0000 (17:17 +1300)]
Merge pull request #11190 from wmortada/CRM-21344

CRM-21344 - Fix documentation links in installer error messages

7 years agoMerge pull request #11161 from agileware/CRM-20787
Eileen McNaughton [Wed, 29 Nov 2017 04:09:48 +0000 (17:09 +1300)]
Merge pull request #11161 from agileware/CRM-20787

CRM-20787: For a repeating Event series. Changing price set of main event, it should be copied to all repeating events if we select 'Every event' mode.

7 years agoMerge pull request #11318 from JMAConsulting/CRM-21477
Eileen McNaughton [Wed, 29 Nov 2017 03:35:27 +0000 (16:35 +1300)]
Merge pull request #11318 from JMAConsulting/CRM-21477

CRM-21477, fixed code to display buttons on Delete premium product form

7 years agoCRM-21480 FourSeven/updateContributionInvoiceNumber: fix for MariaDB 10.2.
Mathieu Lutfy [Wed, 29 Nov 2017 03:23:27 +0000 (22:23 -0500)]
CRM-21480 FourSeven/updateContributionInvoiceNumber: fix for MariaDB 10.2.

7 years agoCRM-21455 supportsFullGroupBy: MariaDB 10.2 does not support ANY_VALUE
Mathieu Lutfy [Wed, 29 Nov 2017 02:44:40 +0000 (21:44 -0500)]
CRM-21455 supportsFullGroupBy: MariaDB 10.2 does not support ANY_VALUE

7 years agoMerge pull request #11316 from totten/master-flex-token
Eileen McNaughton [Tue, 28 Nov 2017 07:15:01 +0000 (20:15 +1300)]
Merge pull request #11316 from totten/master-flex-token

CRM-21472 - Allow FlexMailer to take over token validation

7 years agoCRM-21472 - Flag methods made redundant by FlexMailer's validator
Tim Otten [Tue, 28 Nov 2017 05:31:19 +0000 (21:31 -0800)]
CRM-21472 - Flag methods made redundant by FlexMailer's validator

7 years agoCRM_Mailing - Flag methods made redundant by FlexMailer
Tim Otten [Tue, 28 Nov 2017 05:28:19 +0000 (21:28 -0800)]
CRM_Mailing - Flag methods made redundant by FlexMailer

7 years agoMerge pull request #11335 from civicrm/4.7.28-rc
Eileen McNaughton [Tue, 28 Nov 2017 03:21:51 +0000 (16:21 +1300)]
Merge pull request #11335 from civicrm/4.7.28-rc

Merge from rc

7 years agoCRM-21436: Fix exception on pay later contribution page. (#11317)
Jitendra Purohit [Tue, 28 Nov 2017 03:05:44 +0000 (08:35 +0530)]
CRM-21436: Fix exception on pay later contribution page. (#11317)

* CRM-21436: Fix exception on pay later contribution page.

* minor fix

* move test against master

* variable fix

7 years agoMerge pull request #11333 from samuelsov/CRM-21470b
Eileen McNaughton [Tue, 28 Nov 2017 02:24:32 +0000 (15:24 +1300)]
Merge pull request #11333 from samuelsov/CRM-21470b

CRM-21470 Ensure we don't have an empty locale

7 years agoMerge pull request #11329 from eileenmcnaughton/currency
colemanw [Tue, 28 Nov 2017 02:11:39 +0000 (21:11 -0500)]
Merge pull request #11329 from eileenmcnaughton/currency

Currency

7 years agoMerge pull request #11022 from eileenmcnaughton/components
Tim Otten [Tue, 28 Nov 2017 01:56:16 +0000 (17:56 -0800)]
Merge pull request #11022 from eileenmcnaughton/components

CRM-21218 Improve component statics flushing

7 years agoMerge pull request #10740 from eileenmcnaughton/def_country
Eileen McNaughton [Tue, 28 Nov 2017 01:43:49 +0000 (14:43 +1300)]
Merge pull request #10740 from eileenmcnaughton/def_country

CRM-19888 fix import to prefer default country when resolving states.

7 years agoMerge pull request #11332 from JMAConsulting/CRM-21486
colemanw [Mon, 27 Nov 2017 23:36:00 +0000 (18:36 -0500)]
Merge pull request #11332 from JMAConsulting/CRM-21486

CRM-21486: Support multiple test mail

7 years agoCRM-21470 Ensure we don't have an empty locale #2
Samuel Vanhove [Mon, 27 Nov 2017 21:33:57 +0000 (16:33 -0500)]
CRM-21470 Ensure we don't have an empty locale #2

7 years agoCRM-21470 Ensure we don't have an empty locale
Samuel Vanhove [Mon, 27 Nov 2017 21:22:38 +0000 (16:22 -0500)]
CRM-21470 Ensure we don't have an empty locale

7 years agoMerge pull request #11301 from jitendrapurohit/CRM-21456
Eileen McNaughton [Mon, 27 Nov 2017 21:18:22 +0000 (10:18 +1300)]
Merge pull request #11301 from jitendrapurohit/CRM-21456

CRM-21456 : Relationship end date not set when creating resolved cases

7 years agoCRM-21486: Support multiple test mail
deb.monish [Mon, 27 Nov 2017 16:57:45 +0000 (22:27 +0530)]
CRM-21486: Support multiple test mail

7 years agoMerge pull request #11330 from eileenmcnaughton/comm
Eileen McNaughton [Mon, 27 Nov 2017 03:16:33 +0000 (16:16 +1300)]
Merge pull request #11330 from eileenmcnaughton/comm

NFC, comments only