civicrm-core.git
11 years agoUpdate FourThree.php
Dave Greenberg [Mon, 21 Oct 2013 19:45:29 +0000 (12:45 -0700)]
Update FourThree.php

Typo fix (mising -> missing).

11 years agoMerge pull request #1819 from pradpnayak/CRM-13446
Dave Greenberg [Mon, 21 Oct 2013 19:43:54 +0000 (12:43 -0700)]
Merge pull request #1819 from pradpnayak/CRM-13446

Crm 13446

11 years agoUpdate FourThree.php
Pradeep Nayak [Mon, 21 Oct 2013 14:24:38 +0000 (19:54 +0530)]
Update FourThree.php

11 years ago-- CRM-13446, fixed upgrade if current version is less then 4.3
Pradeep Nayak [Mon, 21 Oct 2013 14:14:52 +0000 (19:44 +0530)]
-- CRM-13446, fixed upgrade if current version is less then 4.3

----------------------------------------
* CRM-13446: Add ON DELETE Options for constraints fails
  http://issues.civicrm.org/jira/browse/CRM-13446

11 years agoMerge pull request #1807 from totten/4.3-mk-drupal-test-site-setup-conf
Kurund Jalmi [Mon, 21 Oct 2013 10:52:28 +0000 (03:52 -0700)]
Merge pull request #1807 from totten/4.3-mk-drupal-test-site-setup-conf

mk-drupal-test-site - When writing out setup.conf, include CIVISOURCEDIR

11 years agoMerge pull request #1816 from pradpnayak/CRM-13446
colemanw [Sat, 19 Oct 2013 18:17:43 +0000 (11:17 -0700)]
Merge pull request #1816 from pradpnayak/CRM-13446

CRM-13446

11 years agoCRM-13446
Pradeep Nayak [Sat, 19 Oct 2013 13:17:15 +0000 (18:47 +0530)]
CRM-13446

----------------------------------------
* CRM-13446: Add ON DELETE Options for constraints fails
  http://issues.civicrm.org/jira/browse/CRM-13446

11 years agomk-drupal-test-site - When writing out setup.conf, include both the old SVNROOT and...
Tim Otten [Thu, 17 Oct 2013 12:29:04 +0000 (17:59 +0530)]
mk-drupal-test-site - When writing out setup.conf, include both the old SVNROOT and the new CIVISOURCEDIR

11 years agoMerge pull request #1803 from dlobo/CRM-13554
dlobo [Wed, 16 Oct 2013 19:49:34 +0000 (12:49 -0700)]
Merge pull request #1803 from dlobo/CRM-13554

CRM-13554 - Fix typos in mass conversion

11 years agoMerge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-13554
Donald A. Lobo [Wed, 16 Oct 2013 19:46:15 +0000 (12:46 -0700)]
Merge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-13554

11 years agoCRM-13554
Donald A. Lobo [Wed, 16 Oct 2013 19:45:02 +0000 (12:45 -0700)]
CRM-13554

----------------------------------------
* CRM-13554: Improve string validation in the query engine
  http://issues.civicrm.org/jira/browse/CRM-13554

11 years agoMerge pull request #1802 from dlobo/CRM-13554
dlobo [Wed, 16 Oct 2013 19:35:42 +0000 (12:35 -0700)]
Merge pull request #1802 from dlobo/CRM-13554

CRM-13554

11 years agoCRM-13554
Donald A. Lobo [Wed, 16 Oct 2013 19:35:06 +0000 (12:35 -0700)]
CRM-13554

----------------------------------------
* CRM-13554: Improve string validation in the query engine
  http://issues.civicrm.org/jira/browse/CRM-13554

11 years agoMerge pull request #1788 from totten/4.3-ofc-delete
dlobo [Mon, 14 Oct 2013 14:19:26 +0000 (07:19 -0700)]
Merge pull request #1788 from totten/4.3-ofc-delete

CRM-13572 - Upgrader - Delete OFC file and/or display message

11 years agoCRM-13572 - Upgrader - Delete OFC file and/or display message
Tim Otten [Sat, 12 Oct 2013 15:45:18 +0000 (16:45 +0100)]
CRM-13572 - Upgrader - Delete OFC file and/or display message

----------------------------------------
* CRM-13572:
  http://issues.civicrm.org/jira/browse/CRM-13572

11 years agoCRM-13572 - Upgrader - Display pre-upgrade message about OFC
Tim Otten [Sat, 12 Oct 2013 14:36:51 +0000 (15:36 +0100)]
CRM-13572 - Upgrader - Display pre-upgrade message about OFC

----------------------------------------
* CRM-13572:
  http://issues.civicrm.org/jira/browse/CRM-13572

11 years agoMerge pull request #1758 from dlobo/CRM-13554
Kurund Jalmi [Wed, 9 Oct 2013 10:32:04 +0000 (03:32 -0700)]
Merge pull request #1758 from dlobo/CRM-13554

CRM-13554

11 years agoMerge pull request #1762 from eileenmcnaughton/4.3
Kurund Jalmi [Wed, 9 Oct 2013 10:24:07 +0000 (03:24 -0700)]
Merge pull request #1762 from eileenmcnaughton/4.3

CRM-13487 fix on d6 authentication

11 years agoCRM-13487 fix on d6 authentication
Eileen [Tue, 8 Oct 2013 20:19:42 +0000 (09:19 +1300)]
CRM-13487 fix on d6 authentication

----------------------------------------
* CRM-13487: User Authentication Bug in Drupal 6
  http://issues.civicrm.org/jira/browse/CRM-13487

11 years agoCRM-13554 - validate values of order by
Donald A. Lobo [Tue, 8 Oct 2013 14:53:59 +0000 (15:53 +0100)]
CRM-13554 - validate values of order by

----------------------------------------
* CRM-13554: Improve string validation in the query engine
  http://issues.civicrm.org/jira/browse/CRM-13554

11 years agoCRM-13554 - validate values of limit and offset
Donald A. Lobo [Tue, 8 Oct 2013 14:24:29 +0000 (15:24 +0100)]
CRM-13554 - validate values of limit and offset

----------------------------------------
* CRM-13554: Improve string validation in the query engine
  http://issues.civicrm.org/jira/browse/CRM-13554

11 years agoCRM-13554
Donald A. Lobo [Tue, 8 Oct 2013 12:23:55 +0000 (13:23 +0100)]
CRM-13554

----------------------------------------
* CRM-13554: Improve string validation in the query engine
  http://issues.civicrm.org/jira/browse/CRM-13554

11 years agoMerge pull request #1739 from dlobo/CRM-13491
Kurund Jalmi [Mon, 7 Oct 2013 12:15:02 +0000 (05:15 -0700)]
Merge pull request #1739 from dlobo/CRM-13491

CRM-13491 - add rounding to javascript values

11 years agoMerge pull request #1744 from davecivicrm/CRM-13442b
Kurund Jalmi [Mon, 7 Oct 2013 11:20:31 +0000 (04:20 -0700)]
Merge pull request #1744 from davecivicrm/CRM-13442b

CRM-13442 - Adding warning for 4.3 when admin switches from Redirect DB ...

11 years agoCRM-13442 - Adding warning for 4.3 when admin switches from Redirect DB mode to a...
Dave Greenberg [Sun, 6 Oct 2013 21:57:20 +0000 (22:57 +0100)]
CRM-13442 - Adding warning for 4.3 when admin switches from Redirect DB mode to a live mode telling them to check for Scheduled test mailings.

----------------------------------------
* CRM-13442: Update Outbound Email help text
  http://issues.civicrm.org/jira/browse/CRM-13442

11 years agoCRM-13491 - add rounding to javascript values
Donald A. Lobo [Sun, 6 Oct 2013 15:08:57 +0000 (16:08 +0100)]
CRM-13491 - add rounding to javascript values

----------------------------------------
* CRM-13491: Cannot create contributions using a priceset for certain dollar amounts.
  http://issues.civicrm.org/jira/browse/CRM-13491

11 years agoMerge pull request #1737 from dlobo/CRM-13444
dlobo [Sun, 6 Oct 2013 12:45:53 +0000 (05:45 -0700)]
Merge pull request #1737 from dlobo/CRM-13444

CRM-13444 - ensure all logged mails are marked as completed

11 years agoCRM-13444 - ensure all logged mails are marked as completed
Donald A. Lobo [Sun, 6 Oct 2013 12:44:49 +0000 (13:44 +0100)]
CRM-13444 - ensure all logged mails are marked as completed

----------------------------------------
* CRM-13444: Implement UI for setting which writes email output to disk and review implementation for Redirect to DB setting
  http://issues.civicrm.org/jira/browse/CRM-13444

11 years agoMerge pull request #1735 from colemanw/4.3
colemanw [Sun, 6 Oct 2013 12:37:50 +0000 (05:37 -0700)]
Merge pull request #1735 from colemanw/4.3

CRM-13446 - Upgrade - Abort if orphaned contribution recur

11 years agoCRM-13446 - Upgrade - Don't translate very technical messages
Coleman Watts [Sun, 6 Oct 2013 12:36:43 +0000 (13:36 +0100)]
CRM-13446 - Upgrade - Don't translate very technical messages

11 years agoCRM-13446 - Upgrade - Abort if orphaned contribution recur
Coleman Watts [Sun, 6 Oct 2013 12:27:36 +0000 (13:27 +0100)]
CRM-13446 - Upgrade - Abort if orphaned contribution recur

11 years agoUpdate version to 4.3.8
CiviCRM [Wed, 2 Oct 2013 13:23:12 +0000 (06:23 -0700)]
Update version to 4.3.8

11 years agoCRM-13460 - CRM_Utils_RuleTest - Remove dead code
Tim Otten [Tue, 1 Oct 2013 23:41:15 +0000 (01:41 +0200)]
CRM-13460 - CRM_Utils_RuleTest - Remove dead code

----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
  http://issues.civicrm.org/jira/browse/CRM-13460

11 years agoMerge branch 'CRM-13460' of git://github.com/dlobo/civicrm-core into pull-request...
Tim Otten [Tue, 1 Oct 2013 23:37:57 +0000 (01:37 +0200)]
Merge branch 'CRM-13460' of git://github.com/dlobo/civicrm-core into pull-request-1708

11 years agoMerge pull request #1720 from kurund/CRM-13476
Kurund Jalmi [Tue, 1 Oct 2013 13:41:09 +0000 (06:41 -0700)]
Merge pull request #1720 from kurund/CRM-13476

CRM-13476, IE 8 related fixes for advance search

11 years agofixes for CRM-13476
kurund [Tue, 1 Oct 2013 13:38:17 +0000 (14:38 +0100)]
fixes for CRM-13476

----------------------------------------
* CRM-13476: In IE8, accordion controls do not work for Advanced Search form
  http://issues.civicrm.org/jira/browse/CRM-13476

11 years agoMerge pull request #1716 from dlobo/CRM-13355
Kurund Jalmi [Tue, 1 Oct 2013 13:22:03 +0000 (06:22 -0700)]
Merge pull request #1716 from dlobo/CRM-13355

CRM-13355 - add support to allow retrieval of non-public events also

11 years agoCRM-13355 - add support to retrieve non-public events
Donald A. Lobo [Mon, 30 Sep 2013 22:23:05 +0000 (15:23 -0700)]
CRM-13355 - add support to retrieve non-public events

----------------------------------------
* CRM-13355: CiviDiscount Codes Should Be Available on Non-Public Events
  http://issues.civicrm.org/jira/browse/CRM-13355

11 years agoCRM-13460 - Add is_numeric checks and test coverage
Donald A. Lobo [Fri, 27 Sep 2013 21:20:12 +0000 (14:20 -0700)]
CRM-13460 - Add is_numeric checks and test coverage

----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
  http://issues.civicrm.org/jira/browse/CRM-13460

11 years agoCRM-13460 - Add is_numeric checks and test coverage
Donald A. Lobo [Fri, 27 Sep 2013 21:03:04 +0000 (14:03 -0700)]
CRM-13460 - Add is_numeric checks and test coverage

----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
  http://issues.civicrm.org/jira/browse/CRM-13460

11 years agoCRM-13460 - Add is_numeric checks and test coverage
Donald A. Lobo [Fri, 27 Sep 2013 21:01:13 +0000 (14:01 -0700)]
CRM-13460 - Add is_numeric checks and test coverage

----------------------------------------
* CRM-13460: Make the numeric rule checks stricter
  http://issues.civicrm.org/jira/browse/CRM-13460

11 years agoUpdate version to 4.3.7
CiviCRM [Wed, 25 Sep 2013 17:58:38 +0000 (10:58 -0700)]
Update version to 4.3.7

11 years agoMerge pull request #1693 from pradpnayak/CRM-13446
colemanw [Wed, 25 Sep 2013 16:53:40 +0000 (09:53 -0700)]
Merge pull request #1693 from pradpnayak/CRM-13446

--CRM-13446, fixed Upgrade code for fatal error if civicrm_financial_acc...

11 years agoMerge pull request #1694 from pradpnayak/CRM-13340
colemanw [Wed, 25 Sep 2013 16:51:52 +0000 (09:51 -0700)]
Merge pull request #1694 from pradpnayak/CRM-13340

-- CRM-13340, this PR should be merged in 4.3, but merged in master so s...

11 years ago-- CRM-13340, this PR should be merged in 4.3, but merged in master so sending it...
Pradeep Nayak [Wed, 25 Sep 2013 10:08:58 +0000 (15:38 +0530)]
-- CRM-13340, this PR should be merged in 4.3, but merged in master so sending it again for 4.3 branch.

----------------------------------------
* CRM-13340: upgrading to (unreleased) 4.3.6 gets sql error on some sites
  http://issues.civicrm.org/jira/browse/CRM-13340

11 years ago--CRM-13446, fixed Upgrade code for fatal error if civicrm_financial_account.contact_...
Pradeep Nayak [Wed, 25 Sep 2013 10:02:31 +0000 (15:32 +0530)]
--CRM-13446, fixed Upgrade code for fatal error if civicrm_financial_account.contact_id is NOT NULL by default.

----------------------------------------
* CRM-13446: Add ON DELETE Options for constraints fails
  http://issues.civicrm.org/jira/browse/CRM-13446

11 years agoMerge pull request #1686 from pradpnayak/CRM-13421
Dave Greenberg [Tue, 24 Sep 2013 18:21:51 +0000 (11:21 -0700)]
Merge pull request #1686 from pradpnayak/CRM-13421

CRM-13421, fixed lineitem array for mail template for event

11 years agoMerge pull request #1681 from pratik-joshi/v43
dlobo [Tue, 24 Sep 2013 15:59:56 +0000 (08:59 -0700)]
Merge pull request #1681 from pratik-joshi/v43

webtest fixes

11 years agoMerge pull request #1685 from monishdeb/43Webtestfixes
dlobo [Tue, 24 Sep 2013 15:58:43 +0000 (08:58 -0700)]
Merge pull request #1685 from monishdeb/43Webtestfixes

WebTest fixed for v4.3

11 years agoMerge pull request #1674 from systopia/CRM-13440
dlobo [Tue, 24 Sep 2013 15:57:27 +0000 (08:57 -0700)]
Merge pull request #1674 from systopia/CRM-13440

proposed patch for CRM-13440

11 years agoCRM-13421, fixed lineitem array for mail template for event
Pradeep Nayak [Tue, 24 Sep 2013 14:23:36 +0000 (19:53 +0530)]
CRM-13421, fixed lineitem array for mail template for event

----------------------------------------
* CRM-13421: Off-line Contribution Receipt Line-Items Garbled
  http://issues.civicrm.org/jira/browse/CRM-13421

11 years agoWebtest fixes for 43
monishdeb [Tue, 24 Sep 2013 14:16:49 +0000 (19:46 +0530)]
Webtest fixes for 43

11 years agowebtest fix for WebTest_Contribute_PCPAddTest::testPCPAdd
Pratik Joshi [Tue, 24 Sep 2013 12:43:49 +0000 (18:13 +0530)]
webtest fix for WebTest_Contribute_PCPAddTest::testPCPAdd

11 years agofix for webtest : WebTest_Contribute_OnlineContributionTest::testOnlineContributionAdd
Pratik Joshi [Tue, 24 Sep 2013 12:31:23 +0000 (18:01 +0530)]
fix for webtest : WebTest_Contribute_OnlineContributionTest::testOnlineContributionAdd

11 years agomore test fixes : WebTest_Contribute_ContributionPageAddTest::testContributionPageSep...
Pratik Joshi [Tue, 24 Sep 2013 11:24:59 +0000 (16:54 +0530)]
more test fixes : WebTest_Contribute_ContributionPageAddTest::testContributionPageSeparatePaymentPayLater

11 years agowebtest fixes
Pratik Joshi [Tue, 24 Sep 2013 10:40:14 +0000 (16:10 +0530)]
webtest fixes

11 years agoMerge pull request #1670 from systopia/CRM-13428
Dave Greenberg [Mon, 23 Sep 2013 22:36:54 +0000 (15:36 -0700)]
Merge pull request #1670 from systopia/CRM-13428

prosed fix for CRM-13428

11 years agoMerge pull request #1675 from deepak-srivastava/logs
deepak-srivastava [Mon, 23 Sep 2013 13:56:16 +0000 (06:56 -0700)]
Merge pull request #1675 from deepak-srivastava/logs

CRM-13302 - webtest fix - WebTest_Contact_CustomDataAddTest

11 years agoCRM-13302 - webtest fix - WebTest_Contact_CustomDataAddTest
Deepak Srivastava [Mon, 23 Sep 2013 13:55:04 +0000 (19:25 +0530)]
CRM-13302 - webtest fix - WebTest_Contact_CustomDataAddTest

11 years agoproposed patch for CRM-13440
systopia [Mon, 23 Sep 2013 09:50:39 +0000 (11:50 +0200)]
proposed patch for CRM-13440

11 years agoMerge pull request #1666 from pradpnayak/CRM-13231
Dave Greenberg [Fri, 20 Sep 2013 23:15:25 +0000 (16:15 -0700)]
Merge pull request #1666 from pradpnayak/CRM-13231

Crm 13231

11 years agoprosed fix for CRM-13428
systopia [Fri, 20 Sep 2013 08:56:12 +0000 (10:56 +0200)]
prosed fix for CRM-13428

11 years agoMerge pull request #1665 from davecivicrm/CRM-13231
colemanw [Thu, 19 Sep 2013 16:20:30 +0000 (09:20 -0700)]
Merge pull request #1665 from davecivicrm/CRM-13231

CRM-13231 - Fix warning in postUpgradeMessage for missing cost of sales ...

11 years ago-- CRM-13231, minor fix to form rule
Pradeep Nayak [Thu, 19 Sep 2013 11:53:39 +0000 (17:23 +0530)]
-- CRM-13231, minor fix to form rule

----------------------------------------
* CRM-13231: Incremental upgrade 4.3.4 fails if no COGS and EXP default account set
  http://issues.civicrm.org/jira/browse/CRM-13231

11 years ago--CRM-13231, added upgrade script to add default COGS account if aren't present
Pradeep Nayak [Thu, 19 Sep 2013 08:37:42 +0000 (14:07 +0530)]
--CRM-13231, added upgrade script to add default COGS account if aren't present

----------------------------------------
* CRM-13231: Incremental upgrade 4.3.4 fails if no COGS and EXP default account set
  http://issues.civicrm.org/jira/browse/CRM-13231

11 years agoCRM-13231 - Fix warning in postUpgradeMessage for missing cost of sales linkage....
Dave Greenberg [Thu, 19 Sep 2013 01:48:29 +0000 (18:48 -0700)]
CRM-13231 - Fix warning in postUpgradeMessage for missing cost of sales linkage. Add link to wiki page for instructions on fixing.

----------------------------------------
* CRM-13231: Incremental upgrade 4.3.4 fails if no COGS and EXP default account set
  http://issues.civicrm.org/jira/browse/CRM-13231

11 years agoMerge pull request #1663 from pradpnayak/CRM-13231
Dave Greenberg [Thu, 19 Sep 2013 01:34:31 +0000 (18:34 -0700)]
Merge pull request #1663 from pradpnayak/CRM-13231

Crm 13231

11 years ago--CRM-13231, fixed upgrade issue, created default COGS and EXP account if arent prese...
Pradeep Nayak [Wed, 18 Sep 2013 14:36:52 +0000 (20:06 +0530)]
--CRM-13231, fixed upgrade issue, created default COGS and EXP account if arent present, added form rule to check if financial type has
expense account configured when recording fees and also payment processor

----------------------------------------
* CRM-13231: Incremental upgrade 4.3.4 fails if no COGS and EXP default account set
  http://issues.civicrm.org/jira/browse/CRM-13231

11 years agoMerge pull request #1637 from deepak-srivastava/logs
deepak-srivastava [Fri, 13 Sep 2013 18:00:51 +0000 (11:00 -0700)]
Merge pull request #1637 from deepak-srivastava/logs

CRM-13302 - php 5.3 error fix

11 years agoCRM-13302 - php 5.3 error fix
Deepak Srivastava [Fri, 13 Sep 2013 17:58:57 +0000 (23:28 +0530)]
CRM-13302 - php 5.3 error fix

11 years agoMerge pull request #1635 from deepak-srivastava/logs
deepak-srivastava [Fri, 13 Sep 2013 10:08:12 +0000 (03:08 -0700)]
Merge pull request #1635 from deepak-srivastava/logs

CRM-13302 - improve detection of log columns that require rebuilding, and rebuilding mechanism

11 years agoCRM-13302
Deepak Srivastava [Fri, 13 Sep 2013 08:34:07 +0000 (14:04 +0530)]
CRM-13302

11 years agoCRM-13302
Deepak Srivastava [Thu, 12 Sep 2013 13:25:36 +0000 (18:55 +0530)]
CRM-13302

11 years agoCRM-13302
Deepak Srivastava [Thu, 12 Sep 2013 12:06:08 +0000 (17:36 +0530)]
CRM-13302

11 years agoMerge pull request #1465 from colemanw/CRM-12840
Kurund Jalmi [Wed, 28 Aug 2013 14:36:44 +0000 (07:36 -0700)]
Merge pull request #1465 from colemanw/CRM-12840

DO NOT MERGE patch for CRM-12840 by Jamie McClelland

11 years agoMerge pull request #1493 from davecivicrm/CRM-13257
Kurund Jalmi [Fri, 23 Aug 2013 10:05:14 +0000 (03:05 -0700)]
Merge pull request #1493 from davecivicrm/CRM-13257

Crm 13257 Fixes for hard-coded relationship type for Employee and Household, including new web test.

11 years agoAdd webtest for creating a Current Employer and checking view relationship to make...
Dave Greenberg [Thu, 22 Aug 2013 22:27:51 +0000 (15:27 -0700)]
Add webtest for creating a Current Employer and checking view relationship to make sure field is present and set.

11 years agoCRM-13257 fixes for hard-coded relationship type for Employee and Household Member.
Dave Greenberg [Thu, 22 Aug 2013 18:59:50 +0000 (11:59 -0700)]
CRM-13257 fixes for hard-coded relationship type for Employee and Household Member.

----------------------------------------
* CRM-13257: Hard-coded relationship type for employer-employee relationship causing Current Employer checkbox to be hidden AND invalid sample data
  http://issues.civicrm.org/jira/browse/CRM-13257

11 years agoDO NOT MERGE patch for CRM-12840 by Jamie McClelland
Coleman Watts [Tue, 20 Aug 2013 03:33:32 +0000 (20:33 -0700)]
DO NOT MERGE patch for CRM-12840 by Jamie McClelland

11 years agoMerge pull request #1451 from davecivicrm/CRM-13235
Kurund Jalmi [Mon, 19 Aug 2013 06:21:26 +0000 (23:21 -0700)]
Merge pull request #1451 from davecivicrm/CRM-13235

CRM-13235

11 years agoCRM-13235
Dave Greenberg [Fri, 16 Aug 2013 20:23:35 +0000 (13:23 -0700)]
CRM-13235

----------------------------------------
* CRM-13235: Custom event name badges cannot be created as extensions
  http://issues.civicrm.org/jira/browse/CRM-13235

11 years agoMerge pull request #1414 from pradpnayak/CRM-13088
Dave Greenberg [Tue, 13 Aug 2013 19:08:12 +0000 (12:08 -0700)]
Merge pull request #1414 from pradpnayak/CRM-13088

-- worked and fixed for CRM-13088
Tested 4.2.9 -> 4.3.6 upgrade. Constraint is present.

11 years agoMerge pull request #1425 from pratik-joshi/CRM-13213
Kurund Jalmi [Tue, 13 Aug 2013 15:31:02 +0000 (08:31 -0700)]
Merge pull request #1425 from pratik-joshi/CRM-13213

CRM-13213 : updated joomla cms code for fetching UF locale

11 years agoCRM-13213 : updated joomla cms code for fetching UF locale
Pratik Joshi [Tue, 13 Aug 2013 12:58:51 +0000 (18:28 +0530)]
CRM-13213 : updated joomla cms code for fetching UF locale

11 years agoMerge pull request #1413 from sfe-ev/4.3.6-upgrade_fix
Kurund Jalmi [Tue, 13 Aug 2013 09:06:51 +0000 (02:06 -0700)]
Merge pull request #1413 from sfe-ev/4.3.6-upgrade_fix

Fix localisation error in DB upgrade script

11 years agoMerge pull request #1396 from pratik-joshi/CRM-13115
Kurund Jalmi [Tue, 13 Aug 2013 08:49:59 +0000 (01:49 -0700)]
Merge pull request #1396 from pratik-joshi/CRM-13115

CRM-13115 fix

11 years ago-- added missed constraint, fixed for CRM-13088
Pradeep Nayak [Tue, 13 Aug 2013 07:55:35 +0000 (13:25 +0530)]
-- added missed constraint, fixed for CRM-13088

----------------------------------------
* CRM-13088: civicrm_contribution_product schema inconsistent in fresh installs vs upgrades
  http://issues.civicrm.org/jira/browse/CRM-13088

11 years ago-- worked and fixed for CRM-13088
Pradeep Nayak [Tue, 13 Aug 2013 05:27:17 +0000 (10:57 +0530)]
-- worked and fixed for CRM-13088

----------------------------------------
* CRM-13088: civicrm_contribution_product schema inconsistent in fresh installs vs upgrades
  http://issues.civicrm.org/jira/browse/CRM-13088

11 years agoFix localisation error in DB upgrade script
Olaf Buddenhagen [Tue, 13 Aug 2013 04:05:26 +0000 (06:05 +0200)]
Fix localisation error in DB upgrade script

The upgrade script for 4.3.6 has a hard-coded lookup for the 'Credit
Card' payment_instrument, but uses the (default) `label` column for the
lookup, which is localised -- i.e. the upgrade fails fatally on any
setup where the 'Credit Card' label is translated.

Fix by using the non-localised `name` column instead.

11 years agoFix undefined function js error
Coleman Watts [Mon, 12 Aug 2013 22:40:10 +0000 (15:40 -0700)]
Fix undefined function js error

11 years agoMerge pull request #1395 from pradpnayak/CRM-13094
Dave Greenberg [Mon, 12 Aug 2013 18:36:05 +0000 (11:36 -0700)]
Merge pull request #1395 from pradpnayak/CRM-13094

-- fixed for CRM-13094.
Ran upgrade from 4.2 and confirmed presence of UI_contribution_recur_payment_instrument_id constraint after upgrade.

11 years agoCRM-13115 fix
Pratik Joshi [Mon, 12 Aug 2013 11:01:17 +0000 (16:31 +0530)]
CRM-13115 fix

11 years ago-- fixed for CRM-13094
Pradeep Nayak [Mon, 12 Aug 2013 10:45:21 +0000 (16:15 +0530)]
-- fixed for CRM-13094

----------------------------------------
* CRM-13094: civicrm_contribution_recur schema inconsistent in fresh installs vs upgrades
  http://issues.civicrm.org/jira/browse/CRM-13094

11 years agoMerge pull request #1386 from kurund/CRM-13170-fixes
Dave Greenberg [Mon, 12 Aug 2013 00:49:04 +0000 (17:49 -0700)]
Merge pull request #1386 from kurund/CRM-13170-fixes

CRM-13170, fixes for contribution search to respect batch criteria

11 years agoMerge pull request #1131 from GiantRobot/4.3-CRM-13017
Kurund Jalmi [Sat, 10 Aug 2013 12:57:35 +0000 (05:57 -0700)]
Merge pull request #1131 from GiantRobot/4.3-CRM-13017

CRM-13017

11 years agoCRM-13170, fixed the query to respect batch criteria
kurund [Sat, 10 Aug 2013 12:18:53 +0000 (17:48 +0530)]
CRM-13170, fixed the query to respect batch criteria

----------------------------------------
* CRM-13170: Search Contribution by Batch no longer works since change to DB
  http://issues.civicrm.org/jira/browse/CRM-13170

11 years agoCRM-13170, fixed select to show all batches
kurund [Sat, 10 Aug 2013 11:09:46 +0000 (16:39 +0530)]
CRM-13170, fixed select to show all batches

----------------------------------------
* CRM-13170: Search Contribution by Batch no longer works since change to DB
  http://issues.civicrm.org/jira/browse/CRM-13170

11 years agoMerge pull request #1378 from davecivicrm/CRM-12869
Kurund Jalmi [Fri, 9 Aug 2013 17:45:59 +0000 (10:45 -0700)]
Merge pull request #1378 from davecivicrm/CRM-12869

  CRM-12869 This is a temporary fix from Eileen which prevents the over-writing of email address

11 years agoMerge pull request #1383 from pratik-joshi/CRM-13143-fix
Dave Greenberg [Fri, 9 Aug 2013 16:36:22 +0000 (09:36 -0700)]
Merge pull request #1383 from pratik-joshi/CRM-13143-fix

CRM-13143 contact reference field issue fix : the referencing for customIdObj was incorrect i.e. it was refering to corrupt element object, thus 'id' value was not getting stored in the correct element object so the formRule error was thrown of 'Invalid C

11 years agoCRM-13143 contact reference field issue fix : the referencing for customIdObj was...
Pratik Joshi [Fri, 9 Aug 2013 14:23:12 +0000 (19:53 +0530)]
CRM-13143 contact reference field issue fix : the referencing for customIdObj was incorrect i.e. it was refering to corrupt element object, thus 'id' value was not getting stored in the correct element object so the formRule error was thrown of 'Invalid Contact ...' as the submission required numeric id