civicrm-core.git
9 years agoadd patch for drupal 8 install
Eileen McNaughton [Wed, 22 Jul 2015 05:03:51 +0000 (17:03 +1200)]
add patch for drupal 8 install

This should not affect other drupal versions as they will have VERSION defined - reading the code shows that is implicit in existing assumptions

9 years agodrupal 8 template
Eileen McNaughton [Wed, 22 Jul 2015 04:59:07 +0000 (16:59 +1200)]
drupal 8 template

9 years agoadd d8 to candidtate - this might not be final plan, but gets setup.sh to 'chug along'
Eileen [Fri, 10 Jul 2015 02:32:42 +0000 (14:32 +1200)]
add d8 to candidtate - this might not be final plan, but gets setup.sh to 'chug along'

9 years agoMerge pull request #6168 from eileenmcnaughton/payment_token
Eileen McNaughton [Wed, 8 Jul 2015 20:47:14 +0000 (08:47 +1200)]
Merge pull request #6168 from eileenmcnaughton/payment_token

API payment_token test re-order setup to allow rollback to work

9 years agoMerge pull request #6059 from johanv/CRM-16701-saved_search_api
Eileen McNaughton [Wed, 8 Jul 2015 20:28:47 +0000 (08:28 +1200)]
Merge pull request #6059 from johanv/CRM-16701-saved_search_api

PR for CRM-16701: Saved Search API

9 years agoMerge pull request #5654 from yourcelf/master
colemanw [Wed, 8 Jul 2015 19:12:54 +0000 (15:12 -0400)]
Merge pull request #5654 from yourcelf/master

CRM-16294: Support map loading under https

9 years agoMerge pull request #6127 from colemanw/CRM-16426
colemanw [Wed, 8 Jul 2015 18:14:38 +0000 (14:14 -0400)]
Merge pull request #6127 from colemanw/CRM-16426

CRM-16426 - Remove support for minified files without the full version

9 years agoMerge pull request #6171 from sudhabisht/CRMTestFixmaster
Yashodha Chaku [Wed, 8 Jul 2015 15:46:33 +0000 (21:16 +0530)]
Merge pull request #6171 from sudhabisht/CRMTestFixmaster

Webtest Fix

9 years agoFormat Fix
Sudha Bisht [Wed, 8 Jul 2015 14:26:30 +0000 (19:56 +0530)]
Format Fix

9 years agoMerge pull request #6163 from josephlacey/datatables-update
Monish Deb [Wed, 8 Jul 2015 14:23:23 +0000 (19:53 +0530)]
Merge pull request #6163 from josephlacey/datatables-update

CRM-16742: Fixing Activity Dashlet bug related to DataTables migration

9 years agoWebtest Fix
Sudha Bisht [Wed, 8 Jul 2015 14:05:51 +0000 (19:35 +0530)]
Webtest Fix

9 years agoMerge pull request #5614 from JKingsnorth/CRM-16270
Kurund Jalmi [Wed, 8 Jul 2015 11:33:07 +0000 (17:03 +0530)]
Merge pull request #5614 from JKingsnorth/CRM-16270

CRM-16270: Add 'Use - Edit Mode' action for profiles

9 years agoMerge pull request #5605 from sfe-ev/fix-upgrade-option_value
Kurund Jalmi [Wed, 8 Jul 2015 11:30:18 +0000 (17:00 +0530)]
Merge pull request #5605 from sfe-ev/fix-upgrade-option_value

Upgrade: Fix `value` for added `option_value` entries in various places

9 years agoMerge pull request #6043 from AronNovak/rest-array
Kurund Jalmi [Wed, 8 Jul 2015 11:01:36 +0000 (16:31 +0530)]
Merge pull request #6043 from AronNovak/rest-array

CRM_Utils_REST: better datastructure support, constant list for instance

9 years agoMerge pull request #6045 from AronNovak/CMSUser
Kurund Jalmi [Wed, 8 Jul 2015 11:00:04 +0000 (16:30 +0530)]
Merge pull request #6045 from AronNovak/CMSUser

CRM_Core_BAO_CMSUser - do not set time limit for PHP CLI environment

9 years agoMerge pull request #6167 from eileenmcnaughton/master
Eileen McNaughton [Wed, 8 Jul 2015 09:14:27 +0000 (21:14 +1200)]
Merge pull request #6167 from eileenmcnaughton/master

Fix e-notice & add tests around where e-notice was

9 years agoAPI payment_token test re-order setup to allow rollback to work
eileenmcnaughton [Wed, 8 Jul 2015 09:14:07 +0000 (09:14 +0000)]
API payment_token test re-order setup to allow rollback to work

9 years agotest fix, reflect changed BAO function in test, note this function is also
eileenmcnaughton [Wed, 8 Jul 2015 08:39:58 +0000 (08:39 +0000)]
test fix, reflect changed BAO function in test, note this function is also
tested through form submit functions - e.g CRM_Member_Form_MembershipTest

9 years agoFix e-notice & add tests around where e-notice was
eileenmcnaughton [Wed, 8 Jul 2015 07:48:51 +0000 (07:48 +0000)]
Fix e-notice & add tests around where e-notice was

9 years agoMerge pull request #6165 from eileenmcnaughton/test
Eileen McNaughton [Wed, 8 Jul 2015 03:05:33 +0000 (15:05 +1200)]
Merge pull request #6165 from eileenmcnaughton/test

fix misnaming on new test class

9 years agofix misnaming on new test class
Eileen McNaughton [Wed, 8 Jul 2015 03:04:57 +0000 (15:04 +1200)]
fix misnaming on new test class

9 years agoMerge pull request #6164 from colemanw/CRM-16354
colemanw [Tue, 7 Jul 2015 18:56:52 +0000 (14:56 -0400)]
Merge pull request #6164 from colemanw/CRM-16354

CRM-16354 Upgrade CKEditor to v4.5

9 years agoCRM-16354 Upgrade CKEditor to v4.5
Coleman Watts [Tue, 7 Jul 2015 18:54:30 +0000 (14:54 -0400)]
CRM-16354 Upgrade CKEditor to v4.5

9 years agoCRM-16742: Fixing Activity Dashlet bug related to DataTables migration
Joseph Lacey [Tue, 7 Jul 2015 14:44:18 +0000 (10:44 -0400)]
CRM-16742: Fixing Activity Dashlet bug related to DataTables migration

----------------------------------------
* CRM-16742: dashlet error on dmaster
  https://issues.civicrm.org/jira/browse/CRM-16742

9 years agoMerge pull request #6149 from eileenmcnaughton/master
Eileen McNaughton [Tue, 7 Jul 2015 12:23:05 +0000 (00:23 +1200)]
Merge pull request #6149 from eileenmcnaughton/master

CRM-16800 add unit test for membership renewal backoffice form

9 years agoMerge pull request #6154 from sudhabisht/mQA
Monish Deb [Mon, 6 Jul 2015 19:33:11 +0000 (01:03 +0530)]
Merge pull request #6154 from sudhabisht/mQA

CRM test fix

9 years agoMerge pull request #6155 from rohankatkar/webtest_master
Monish Deb [Mon, 6 Jul 2015 19:32:23 +0000 (01:02 +0530)]
Merge pull request #6155 from rohankatkar/webtest_master

Webtests fix for master

9 years agoWebtests fix for master
Web Access [Mon, 6 Jul 2015 14:22:58 +0000 (19:52 +0530)]
Webtests fix for master

9 years agoCRM test fix
Sudha Bisht [Mon, 6 Jul 2015 14:04:36 +0000 (19:34 +0530)]
CRM test fix

9 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49
kurund [Mon, 6 Jul 2015 09:12:10 +0000 (14:42 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49

9 years agophpcs fix
Eileen McNaughton [Mon, 6 Jul 2015 03:23:01 +0000 (15:23 +1200)]
phpcs fix

9 years agoCRM-16800 towards fixing recurring error,
Eileen McNaughton [Mon, 6 Jul 2015 03:21:07 +0000 (15:21 +1200)]
CRM-16800 towards fixing recurring error,
I am trying to figure out what part of this function membership form needs to share as the form has 2 paths
depending on recurring or otherwise. Ideally the create membership function would be used in both cases & recurring
which is a small part of the shared function, could be handled separately

9 years agoremove unused variables
Eileen McNaughton [Mon, 6 Jul 2015 01:43:58 +0000 (13:43 +1200)]
remove unused variables

9 years agoMerge pull request #6146 from KarinG/patch-8
Eileen McNaughton [Mon, 6 Jul 2015 01:35:17 +0000 (13:35 +1200)]
Merge pull request #6146 from KarinG/patch-8

Edit <title> to avoid clash with other field

9 years agophpcs fixes
Eileen McNaughton [Mon, 6 Jul 2015 01:33:27 +0000 (13:33 +1200)]
phpcs fixes

9 years agoCRM-16800 add unit test for membership renewal backoffice form
Eileen McNaughton [Mon, 6 Jul 2015 01:27:01 +0000 (13:27 +1200)]
CRM-16800 add unit test for membership renewal backoffice form

9 years agoMerge pull request #6148 from eileenmcnaughton/master
Eileen McNaughton [Mon, 6 Jul 2015 01:24:46 +0000 (13:24 +1200)]
Merge pull request #6148 from eileenmcnaughton/master

CRM-16800 4.7 regression fix + unit test on correct line items for back office member…

9 years agoCRM-16800 4.7 regression on correct line items for back office membership by credit...
Eileen McNaughton [Mon, 6 Jul 2015 00:50:37 +0000 (12:50 +1200)]
CRM-16800 4.7 regression on correct line items for back office membership by credit card

9 years agoEdit <title> to avoid clash with other field
Karin Gerritsen [Sun, 5 Jul 2015 22:01:13 +0000 (16:01 -0600)]
Edit <title> to avoid clash with other field

Both processor_id and payment_processor_id have <title>Payment Processor</title>. This causes issues with imports into the recurring series table (using Eileen's CSV importer) - as the field mapping is stored by title and will always select the first match - even if you previously selected 'the second Payment Processor' <title>. Renaming the <title> for processor_id to Processor ID. Leaving the payment_processor_id <title> as is: Payment Processor

9 years agoMerge pull request #6144 from eileenmcnaughton/master
Eileen McNaughton [Sun, 5 Jul 2015 21:17:56 +0000 (09:17 +1200)]
Merge pull request #6144 from eileenmcnaughton/master

Rationalise if statement

9 years agoMerge pull request #6140 from colemanw/CRM-16643
colemanw [Sun, 5 Jul 2015 15:58:09 +0000 (11:58 -0400)]
Merge pull request #6140 from colemanw/CRM-16643

CRM-16643 - Deprecate 'setvalue' api action & switch editable default to 'create'

9 years agoRationalise if statement
Eileen McNaughton [Sun, 5 Jul 2015 14:07:55 +0000 (02:07 +1200)]
Rationalise if statement

9 years agoMerge pull request #6143 from eileenmcnaughton/CRM-16788
Eileen McNaughton [Sun, 5 Jul 2015 13:08:49 +0000 (01:08 +1200)]
Merge pull request #6143 from eileenmcnaughton/CRM-16788

CRM-16788 add test to check recurring created

9 years agophpcs
Eileen McNaughton [Sun, 5 Jul 2015 12:36:30 +0000 (00:36 +1200)]
phpcs

9 years agoCRM-16788 phpcs
Eileen McNaughton [Sun, 5 Jul 2015 12:20:21 +0000 (00:20 +1200)]
CRM-16788 phpcs

9 years agoCRM-16788 formatting fixes
Eileen McNaughton [Sun, 5 Jul 2015 11:21:10 +0000 (23:21 +1200)]
CRM-16788 formatting fixes

9 years agoCRM-16788 add test to check recurring created
Eileen McNaughton [Sun, 5 Jul 2015 11:09:45 +0000 (23:09 +1200)]
CRM-16788 add test to check recurring created
(This does appear to be working - but on renewal form not so much, this form is adding the test to prepare to fix the other form)

9 years agoMerge pull request #6142 from eileenmcnaughton/CRM-16799
Eileen McNaughton [Sun, 5 Jul 2015 10:49:33 +0000 (22:49 +1200)]
Merge pull request #6142 from eileenmcnaughton/CRM-16799

CRM-16799 Contribution.get api - support 'is_test'

9 years agoCRM-16799 Contribution.get api - support 'is_test'
eileenmcnaughton [Sun, 5 Jul 2015 08:16:48 +0000 (08:16 +0000)]
CRM-16799 Contribution.get api - support 'is_test'
It would probably be more correct to accept is_test & make contribution_test an alias of that for backwards compatibility, but this
is the quick version which at least supports the 'right' param

9 years agoCRM-16643 - Deprecate 'setvalue' api action & switch editable default to 'create'
Coleman Watts [Sat, 4 Jul 2015 02:22:49 +0000 (22:22 -0400)]
CRM-16643 - Deprecate 'setvalue' api action & switch editable default to 'create'

9 years agoMerge branch '4.6' into master
Coleman Watts [Sat, 4 Jul 2015 02:00:22 +0000 (22:00 -0400)]
Merge branch '4.6' into master

9 years agoMerge pull request #6138 from colemanw/CRM-16643
colemanw [Sat, 4 Jul 2015 01:56:43 +0000 (21:56 -0400)]
Merge pull request #6138 from colemanw/CRM-16643

CRM-16643 - Add 'setvalue' deprecation warning to api explorer

9 years agoCRM-16643 - Add 'setvalue' deprecation warning to api explorer
Coleman Watts [Fri, 3 Jul 2015 20:40:59 +0000 (16:40 -0400)]
CRM-16643 - Add 'setvalue' deprecation warning to api explorer

9 years agoMerge pull request #6134 from colemanw/CRM-16584
colemanw [Fri, 3 Jul 2015 20:20:44 +0000 (16:20 -0400)]
Merge pull request #6134 from colemanw/CRM-16584

CRM-16584 - Improve bounce management with Mandrilla SMTP

9 years agoWhitespace fix
Coleman Watts [Fri, 3 Jul 2015 15:31:13 +0000 (11:31 -0400)]
Whitespace fix

9 years agoCRM-16584 - Improve bounce management with Mandrilla SMTP
Olivier [Fri, 3 Jul 2015 14:05:41 +0000 (10:05 -0400)]
CRM-16584 - Improve bounce management with Mandrilla SMTP

9 years agoMerge pull request #6129 from colemanw/CRM-16793
colemanw [Fri, 3 Jul 2015 13:37:24 +0000 (09:37 -0400)]
Merge pull request #6129 from colemanw/CRM-16793

CRM-16793 - Fix editing group names

9 years agoMerge pull request #6132 from colemanw/CRM-16795
colemanw [Fri, 3 Jul 2015 13:31:33 +0000 (09:31 -0400)]
Merge pull request #6132 from colemanw/CRM-16795

CRM-16795 - Fix z-index conflict btw WP admin bar and popups

9 years agoCRM-16795 - Fix z-index conflict btw WP admin bar and popups
Coleman Watts [Fri, 3 Jul 2015 13:28:41 +0000 (09:28 -0400)]
CRM-16795 - Fix z-index conflict btw WP admin bar and popups

9 years agoMerge pull request #6124 from sudhabisht/46qa
Monish Deb [Fri, 3 Jul 2015 09:43:08 +0000 (15:13 +0530)]
Merge pull request #6124 from sudhabisht/46qa

Webtest Failure

9 years agoMerge pull request #6130 from civicrm/revert-6117-CRM-16735.4.6
Yashodha Chaku [Fri, 3 Jul 2015 08:43:23 +0000 (14:13 +0530)]
Merge pull request #6130 from civicrm/revert-6117-CRM-16735.4.6

Revert "CRM-16735: PCP notification email should not be sent when con…

9 years agoRevert "CRM-16735: PCP notification email should not be sent when contributio…"
Yashodha Chaku [Fri, 3 Jul 2015 12:21:33 +0000 (17:51 +0530)]
Revert "CRM-16735: PCP notification email should not be sent when contributio…"

9 years agoFormat Fixs
Sudha Bisht [Fri, 3 Jul 2015 07:06:37 +0000 (12:36 +0530)]
Format Fixs

9 years agoFormat fix
Sudha Bisht [Thu, 2 Jul 2015 15:06:20 +0000 (20:36 +0530)]
Format fix

9 years agoRemoved unwanted code
Sudha Bisht [Thu, 2 Jul 2015 14:47:32 +0000 (20:17 +0530)]
Removed unwanted code

9 years agoWebtest Fix
Sudha Bisht [Thu, 2 Jul 2015 14:39:45 +0000 (20:09 +0530)]
Webtest Fix

9 years agoMerge pull request #6117 from yashodha/CRM-16735.4.6
Yashodha Chaku [Fri, 3 Jul 2015 06:48:42 +0000 (12:18 +0530)]
Merge pull request #6117 from yashodha/CRM-16735.4.6

CRM-16735: PCP notification email should not be sent when contributio…

9 years agoCRM-16426 - Don't hard-fail if non-mini file is not where we expect
Coleman Watts [Fri, 3 Jul 2015 00:59:16 +0000 (20:59 -0400)]
CRM-16426 - Don't hard-fail if non-mini file is not where we expect

9 years agoCRM-16793 - Fix editing group names
Coleman Watts [Fri, 3 Jul 2015 00:34:44 +0000 (20:34 -0400)]
CRM-16793 - Fix editing group names

9 years agoMerge pull request #6111 from colemanw/CRM-11856
colemanw [Fri, 3 Jul 2015 00:19:09 +0000 (20:19 -0400)]
Merge pull request #6111 from colemanw/CRM-11856

CRM-11856 - Add help text when creating a smart group

9 years agoMerge branch 'onlyjob-master'
Tim Otten [Thu, 2 Jul 2015 22:22:45 +0000 (15:22 -0700)]
Merge branch 'onlyjob-master'

Conflicts:
composer.json

9 years agoMerge pull request #6123 from eileenmcnaughton/CRM-16788
Eileen McNaughton [Thu, 2 Jul 2015 20:52:49 +0000 (08:52 +1200)]
Merge pull request #6123 from eileenmcnaughton/CRM-16788

CRM-16788 regression on membership backoffice not showing auto-renew

9 years agoMerge pull request #6128 from colemanw/CRM-16676
colemanw [Thu, 2 Jul 2015 16:53:19 +0000 (12:53 -0400)]
Merge pull request #6128 from colemanw/CRM-16676

CRM-16676 - Fix custom data target containers

9 years agoMerge pull request #6122 from marcov4lente/CRM-16789
Dave Greenberg [Thu, 2 Jul 2015 16:50:19 +0000 (09:50 -0700)]
Merge pull request #6122 from marcov4lente/CRM-16789

CRM-16789 Invoice attachements when tax rate is 0.

9 years agoCRM-16676 - Fix custom data target containers
Coleman Watts [Thu, 2 Jul 2015 16:46:51 +0000 (12:46 -0400)]
CRM-16676 - Fix custom data target containers

9 years agoCRM-16426 - Remove support for minified files without the full version
Coleman Watts [Thu, 2 Jul 2015 15:57:22 +0000 (11:57 -0400)]
CRM-16426 - Remove support for minified files without the full version

9 years agoMerge pull request #6125 from colemanw/CRM-16426-2
colemanw [Thu, 2 Jul 2015 14:55:35 +0000 (10:55 -0400)]
Merge pull request #6125 from colemanw/CRM-16426-2

CRM-16426 - Rename jquery.ui.datepicker.validation

9 years agoCRM-16426 - Rename jquery.ui.datepicker.validation
Coleman Watts [Thu, 2 Jul 2015 14:53:50 +0000 (10:53 -0400)]
CRM-16426 - Rename jquery.ui.datepicker.validation

9 years agofix formatting
Eileen McNaughton [Thu, 2 Jul 2015 13:04:17 +0000 (01:04 +1200)]
fix formatting

9 years agoCRM-16788 regression on membership backoffice not showing auto-renew
Eileen McNaughton [Thu, 2 Jul 2015 12:50:14 +0000 (00:50 +1200)]
CRM-16788 regression on membership backoffice not showing auto-renew

9 years agoCRM-16789 Invoice attachements when tax rate is 0
Marco Valente [Thu, 2 Jul 2015 11:33:55 +0000 (12:33 +0100)]
CRM-16789 Invoice attachements when tax rate is 0

Correcting the issue: Event or contribution payment invoices is not being sent when
the tax amount is 0 or evaluates to false.

9 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-02-11-04-42
kurund [Thu, 2 Jul 2015 05:36:12 +0000 (11:06 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-02-11-04-42

Conflicts:
tests/phpunit/api/v3/SyntaxConformanceTest.php

9 years agoMerge pull request #6119 from monishdeb/CRM-16782
Monish Deb [Wed, 1 Jul 2015 21:53:35 +0000 (03:23 +0530)]
Merge pull request #6119 from monishdeb/CRM-16782

CRM-16782 fix - Fatal error on using IN/NOT IN operator on contribution and membership fields

9 years agoWebtest fix
monishdeb [Wed, 1 Jul 2015 21:51:15 +0000 (03:21 +0530)]
Webtest fix

9 years agoMerge pull request #6118 from sudhabisht/46webtest
Monish Deb [Wed, 1 Jul 2015 18:52:34 +0000 (00:22 +0530)]
Merge pull request #6118 from sudhabisht/46webtest

Webtest Fix

9 years agoCRM-16782 fix - Fatal error on using IN/NOT IN operator on contribution and membershi...
monishdeb [Wed, 1 Jul 2015 14:32:14 +0000 (20:02 +0530)]
CRM-16782 fix - Fatal error on using IN/NOT IN operator on contribution and membership fields

https://issues.civicrm.org/jira/browse/CRM-16782

9 years agoMerge pull request #6116 from rohankatkar/webtest4.6
Monish Deb [Wed, 1 Jul 2015 14:01:57 +0000 (19:31 +0530)]
Merge pull request #6116 from rohankatkar/webtest4.6

Webtest fix - 4.6

9 years agoMerge pull request #6115 from monishdeb/master
Monish Deb [Wed, 1 Jul 2015 14:01:45 +0000 (19:31 +0530)]
Merge pull request #6115 from monishdeb/master

CRM-16780 fix - Fatal Error on Relationship Edit page

9 years agoWebtest Fix
Sudha Bisht [Wed, 1 Jul 2015 13:59:24 +0000 (19:29 +0530)]
Webtest Fix

9 years agoline spacing fix
yashodha [Wed, 1 Jul 2015 13:48:13 +0000 (19:18 +0530)]
line spacing fix

9 years agoCRM-16735: PCP notification email should not be sent when contribution record is...
yashodha [Wed, 1 Jul 2015 11:40:36 +0000 (17:10 +0530)]
CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added

----------------------------------------
* CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
  https://issues.civicrm.org/jira/browse/CRM-16735

9 years agoCRM-16735: PCP notification email should not be sent when contribution record is...
yashodha [Wed, 1 Jul 2015 10:54:43 +0000 (16:24 +0530)]
CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added

----------------------------------------
* CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
  https://issues.civicrm.org/jira/browse/CRM-16735

9 years agoMerge pull request #6113 from laryn/patch-2
Kurund Jalmi [Wed, 1 Jul 2015 09:25:08 +0000 (14:55 +0530)]
Merge pull request #6113 from laryn/patch-2

Add warning about backing up database before import - CRM-16778

9 years agoMerge pull request #6088 from eileenmcnaughton/CRM-16473
Eileen McNaughton [Wed, 1 Jul 2015 08:52:05 +0000 (20:52 +1200)]
Merge pull request #6088 from eileenmcnaughton/CRM-16473

CRM-16473 api:user Add user.get api

9 years agoformat fixes
monishdeb [Wed, 1 Jul 2015 07:44:56 +0000 (13:14 +0530)]
format fixes

9 years agoWebtest fix - 4.6
Web Access [Wed, 1 Jul 2015 07:14:47 +0000 (12:44 +0530)]
Webtest fix - 4.6

9 years agoCRM-16780 fix - Fatal Error on Relationship Edit page
monishdeb [Wed, 1 Jul 2015 07:07:21 +0000 (12:37 +0530)]
CRM-16780 fix - Fatal Error on Relationship Edit page

https://issues.civicrm.org/jira/browse/CRM-16780

9 years agoMerge pull request #6106 from monishdeb/master
Monish Deb [Wed, 1 Jul 2015 04:48:38 +0000 (10:18 +0530)]
Merge pull request #6106 from monishdeb/master

CRM-14588 fix - Non Local Date format used in membership thank you an…

9 years agoMerge pull request #6109 from rohankatkar/CRM--16745
Monish Deb [Wed, 1 Jul 2015 04:38:38 +0000 (10:08 +0530)]
Merge pull request #6109 from rohankatkar/CRM--16745

CRM-16745: Payment Instrument/Payment Method should offer a multi-select option when searching for Contrbutions

9 years agocleanup uf match in custom data test
Eileen McNaughton [Wed, 1 Jul 2015 02:03:20 +0000 (14:03 +1200)]
cleanup uf match in custom data test