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

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 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

11 years agoCRM-12869 This is a temporary fix from Eileen which prevents the over-write. However...
Dave Greenberg [Thu, 8 Aug 2013 23:31:58 +0000 (16:31 -0700)]
CRM-12869 This is a temporary fix from Eileen which prevents the over-write. However it also prevents the billing address from being saved for the payee, and requires the user to know that they need to manually replace the billing field values with the payer data. In general I do not think this record payment from a differnet contact feature  is production-ready (even though it is part of 4.3). Selecting a different payer should reload the the billing address fields with the payer info.

----------------------------------------
* CRM-12869: Record Payment from different contact causes email and address to be altered in contacts record
  http://issues.civicrm.org/jira/browse/CRM-12869

11 years agoMerge pull request #1340 from kurund/CRM-13156
Kurund Jalmi [Mon, 5 Aug 2013 18:05:26 +0000 (11:05 -0700)]
Merge pull request #1340 from kurund/CRM-13156

CRM-13156, fixed incorrect property name

11 years agoCRM-13156, fixed the wrong property
kurund [Mon, 5 Aug 2013 18:03:51 +0000 (23:33 +0530)]
CRM-13156, fixed the wrong property

----------------------------------------
* CRM-13156: CRM_Core_BAO_EntityTag::getEntitiesByTag enumerates for incorrect field
  http://issues.civicrm.org/jira/browse/CRM-13156

11 years agoMerge pull request #1336 from kurund/CRM-13096
Kurund Jalmi [Mon, 5 Aug 2013 06:29:26 +0000 (23:29 -0700)]
Merge pull request #1336 from kurund/CRM-13096

CRM-13096, drop unwanted table civicrm_official_receipt

11 years agoCRM-13096, drop unwanted table civicrm_official_receipt
kurund [Mon, 5 Aug 2013 06:26:59 +0000 (11:56 +0530)]
CRM-13096, drop unwanted table civicrm_official_receipt

----------------------------------------
* CRM-13096: Table civicrm_official_receipt missing from upgrades
  http://issues.civicrm.org/jira/browse/CRM-13096

11 years agoMerge pull request #1334 from kurund/CRM-13078
Kurund Jalmi [Mon, 5 Aug 2013 05:13:56 +0000 (22:13 -0700)]
Merge pull request #1334 from kurund/CRM-13078

CRM-13078

11 years agoCRM-13078, typo fixes
kurund [Mon, 5 Aug 2013 05:12:22 +0000 (10:42 +0530)]
CRM-13078, typo fixes

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoMerge pull request #1294 from kurund/CRM-13078
Dave Greenberg [Fri, 2 Aug 2013 20:43:43 +0000 (13:43 -0700)]
Merge pull request #1294 from kurund/CRM-13078

CRM-13078, batch entry fixes
Tested the remaining exceptions. Form rule displays properly now and checkmark icon displayed when error condition is corrected.

11 years agoCRM-13078, fixed to show correct icon and to hide error messages
kurund [Fri, 2 Aug 2013 19:43:19 +0000 (01:13 +0530)]
CRM-13078, fixed to show correct icon and to hide error messages

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoCRM-13078, fixed error message for contact autocomplete
kurund [Fri, 2 Aug 2013 12:09:59 +0000 (17:39 +0530)]
CRM-13078, fixed error message for contact autocomplete

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoCRM-13078 fixed race condition and error alert
kurund [Fri, 2 Aug 2013 12:08:20 +0000 (17:38 +0530)]
CRM-13078 fixed race condition and error alert

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoMerge pull request #1297 from eileenmcnaughton/4.3
Dave Greenberg [Wed, 31 Jul 2013 23:09:52 +0000 (16:09 -0700)]
Merge pull request #1297 from eileenmcnaughton/4.3

CRM-13016 wrong version of this fn in 4.3

11 years agoCRM-13016 wrong version of this fn in 4.3
eileen [Wed, 31 Jul 2013 22:43:17 +0000 (10:43 +1200)]
CRM-13016 wrong version of this fn in 4.3

11 years agoMerge pull request #1255 from mlutfy/4.3-crm12446
dlobo [Wed, 31 Jul 2013 20:58:41 +0000 (13:58 -0700)]
Merge pull request #1255 from mlutfy/4.3-crm12446

CRM-12446 : support for extension translation (with native gettext only, for now)

11 years agoMerge pull request #1245 from tttp/crm-13091
dlobo [Wed, 31 Jul 2013 20:56:49 +0000 (13:56 -0700)]
Merge pull request #1245 from tttp/crm-13091

Start the session on rest.php

11 years agoCRM-13078, optimization
kurund [Wed, 31 Jul 2013 15:51:54 +0000 (21:21 +0530)]
CRM-13078, optimization

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoCRM-13078, fixed update of js icon
kurund [Wed, 31 Jul 2013 15:13:00 +0000 (20:43 +0530)]
CRM-13078, fixed update of js icon

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoMerge pull request #1287 from pratik-joshi/CRM-13035-fix
Kurund Jalmi [Wed, 31 Jul 2013 10:06:39 +0000 (03:06 -0700)]
Merge pull request #1287 from pratik-joshi/CRM-13035-fix

CRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_DAO_Contribution

11 years agoMerge pull request #1283 from davecivicrm/CRM-13124
Kurund Jalmi [Wed, 31 Jul 2013 10:00:18 +0000 (03:00 -0700)]
Merge pull request #1283 from davecivicrm/CRM-13124

Crm -13124 Payment processor name missing from confirmation message

11 years agoCRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_...
Pratik Joshi [Wed, 31 Jul 2013 08:35:01 +0000 (14:05 +0530)]
CRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_DAO_Contribution

11 years agoCRM-13124 Smarty variable for processor name was no longer correct in templates/CRM...
Dave Greenberg [Wed, 31 Jul 2013 00:41:19 +0000 (17:41 -0700)]
CRM-13124 Smarty variable for processor name was no longer correct in templates/CRM/Contribute/Form/Contribution/Confirm.tpl

----------------------------------------
* CRM-13124: Payment processor name missing from confirmation message
  http://issues.civicrm.org/jira/browse/CRM-13124

11 years agoMerge pull request #1219 from kurund/CRM-13078
Dave Greenberg [Mon, 29 Jul 2013 18:51:41 +0000 (11:51 -0700)]
Merge pull request #1219 from kurund/CRM-13078

CRM-13078
These commits improve things - you can't submit w/ invalid contact ID. Still a problem w/ error icon updating when user fixes the 'invalid contact id' situation. Kurund will investigate and submit addtional fixes as needed.

11 years agoCRM-13078, whitespace fixes and template cleanup
kurund [Sat, 27 Jul 2013 17:24:41 +0000 (22:54 +0530)]
CRM-13078, whitespace fixes and template cleanup

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoCRM-13078, help text fix
CiviCRM [Sat, 27 Jul 2013 16:15:26 +0000 (21:45 +0530)]
CRM-13078, help text fix

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoCRM-13078, js fixes to show correct row icon
CiviCRM [Sat, 27 Jul 2013 16:02:34 +0000 (21:32 +0530)]
CRM-13078, js fixes to show correct row icon

----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
  http://issues.civicrm.org/jira/browse/CRM-13078

11 years agoMerge pull request #1247 from dlobo/CRM-13057
Kurund Jalmi [Sat, 27 Jul 2013 13:49:25 +0000 (06:49 -0700)]
Merge pull request #1247 from dlobo/CRM-13057

CRM-13057

11 years agoMerge pull request #1235 from yashodha/4.3.CRM-13105
Kurund Jalmi [Sat, 27 Jul 2013 12:58:37 +0000 (05:58 -0700)]
Merge pull request #1235 from yashodha/4.3.CRM-13105

CRM-13105

11 years agoMerge pull request #1242 from colemanw/searchBuilderJs
colemanw [Fri, 26 Jul 2013 20:21:41 +0000 (13:21 -0700)]
Merge pull request #1242 from colemanw/searchBuilderJs

Refactor search builder js to better handle different operators

11 years agoCRM-12446 : support for extension translation (with native gettext only, for now)
Mathieu Lutfy [Fri, 26 Jul 2013 16:27:16 +0000 (12:27 -0400)]
CRM-12446 : support for extension translation (with native gettext only, for now)

11 years agoMerge branch 'CRM-13014' of git://github.com/eileenmcnaughton/civicrm-core into pull...
Tim Otten [Fri, 26 Jul 2013 03:01:19 +0000 (20:01 -0700)]
Merge branch 'CRM-13014' of git://github.com/eileenmcnaughton/civicrm-core into pull-request-1139

Conflicts:
CRM/Utils/System/Base.php
CRM/Utils/System/Drupal.php
CRM/Utils/System/Drupal6.php

Also: Update comments

----------------------------------------
* CRM-13014: CiviMobile fatal on non-d7 -Need a UF function for login authenticate
  http://issues.civicrm.org/jira/browse/CRM-13014

11 years agoCRM-13057
Donald A. Lobo [Thu, 25 Jul 2013 22:29:36 +0000 (15:29 -0700)]
CRM-13057

----------------------------------------
* CRM-13057: Replies to mailings processed through SOAP are failing
  http://issues.civicrm.org/jira/browse/CRM-13057

11 years agoMerge pull request #1244 from mlutfy/4.3-ts
Tim Otten [Thu, 25 Jul 2013 20:17:43 +0000 (13:17 -0700)]
Merge pull request #1244 from mlutfy/4.3-ts

Semi-fix {ts} usage: the mix of js/smarty here isn't very practical.

11 years agoSemi-fix {ts} usage: the mix of js/smarty here isn't very practical. Will be fixed...
Mathieu Lutfy [Thu, 25 Jul 2013 18:45:16 +0000 (14:45 -0400)]
Semi-fix {ts} usage: the mix of js/smarty here isn't very practical. Will be fixed when the js is split out in a separate file eventually.

11 years agoStart the session on rest.php, so it avoids impossible to find side effects. Trust...
Xavier Dutoit [Thu, 25 Jul 2013 12:25:06 +0000 (14:25 +0200)]
Start the session on rest.php, so it avoids impossible to find side effects. Trust me, I lost hours on that one: civi needs a session.

11 years agoRefactor search builder js to better handle different operators CRM-13032
Coleman Watts [Thu, 25 Jul 2013 04:47:10 +0000 (21:47 -0700)]
Refactor search builder js to better handle different operators CRM-13032

11 years agoMerge pull request #1233 from pradpnayak/CRM-13060
Dave Greenberg [Wed, 24 Jul 2013 22:36:42 +0000 (15:36 -0700)]
Merge pull request #1233 from pradpnayak/CRM-13060

--worked on CRM-13060
Patched and tested - price_set.financial_type_id is now also set when creating and updating financial type under Manage Events.

11 years agoMerge pull request #1237 from totten/4.3-find-files
Tim Otten [Wed, 24 Jul 2013 18:00:06 +0000 (11:00 -0700)]
Merge pull request #1237 from totten/4.3-find-files

CRM-13108 - CRM_Utils_File - Fix warning

11 years agoCRM-13108 - CRM_Utils_File - Performance fix
Tim Otten [Wed, 24 Jul 2013 17:57:33 +0000 (10:57 -0700)]
CRM-13108 - CRM_Utils_File - Performance fix

----------------------------------------
* CRM-13108: Warnings when extensions is installed
  http://issues.civicrm.org/jira/browse/CRM-13108

11 years agoCRM-13108 - Fix warning in CRM_Utils_File::findFiles (from rubofvil)
Tim Otten [Wed, 24 Jul 2013 17:41:23 +0000 (10:41 -0700)]
CRM-13108 - Fix warning in CRM_Utils_File::findFiles (from rubofvil)

Note: According to http://php.net/glob, the return result varies by
platform; sometimes it returns array(), and sometimes it returns FALSE.
The patch should work with either case.

----------------------------------------
* CRM-13108: Warnings when extensions is installed
  http://issues.civicrm.org/jira/browse/CRM-13108

11 years agoCRM-13105
yashodha [Wed, 24 Jul 2013 13:29:59 +0000 (18:59 +0530)]
CRM-13105

11 years agoMerge pull request #1232 from pradpnayak/CRM-12844
Dave Greenberg [Wed, 24 Jul 2013 13:24:03 +0000 (06:24 -0700)]
Merge pull request #1232 from pradpnayak/CRM-12844

-- worked on CRM-12844

11 years ago--worked on CRM-13060
Pradeep Nayak [Wed, 24 Jul 2013 10:34:18 +0000 (16:04 +0530)]
--worked on CRM-13060

----------------------------------------
* CRM-13060: Changing the Financial Type for Contribution pages and Events does not update the Financial Type selected for Price Sets and Price Field values
  http://issues.civicrm.org/jira/browse/CRM-13060

11 years ago-- worked on CRM-12844
Pradeep Nayak [Wed, 24 Jul 2013 07:39:35 +0000 (13:09 +0530)]
-- worked on CRM-12844

----------------------------------------
* CRM-12844: Automated recurring contribution "civicrm_line_item" records have wrong financial type id
  http://issues.civicrm.org/jira/browse/CRM-12844

11 years agoMerge pull request #1228 from totten/4.3-hook-reentrancy
Tim Otten [Tue, 23 Jul 2013 23:44:41 +0000 (16:44 -0700)]
Merge pull request #1228 from totten/4.3-hook-reentrancy

CRM-13103 - Fix hook re-entrancy

11 years agoCRM-13103 - Fix reentrant hook invocations
Tim Otten [Tue, 23 Jul 2013 23:05:43 +0000 (16:05 -0700)]
CRM-13103 - Fix reentrant hook invocations

----------------------------------------
* CRM-13103: Hook execution terminates prematurely
  http://issues.civicrm.org/jira/browse/CRM-13103

11 years agoCRM-13103 - CRM_Utils_HookTest
Tim Otten [Tue, 23 Jul 2013 22:23:50 +0000 (15:23 -0700)]
CRM-13103 - CRM_Utils_HookTest

Add unit test in which one hook calls another. Note that this unit-test
doesn't actually reproduce the issue for me (eg it incorrectly shows the
test as passing on code that doesn't work for me in real situations), but
it's still valuable in that it gives us better test coverage.

----------------------------------------
* CRM-13103: Hook execution terminates prematurely
  http://issues.civicrm.org/jira/browse/CRM-13103

11 years agoMerge pull request #1101 from totten/4.3-CRM-11160-msg
Dave Greenberg [Tue, 23 Jul 2013 23:13:50 +0000 (16:13 -0700)]
Merge pull request #1101 from totten/4.3-CRM-11160-msg

CRM-11160 - verifySSL - Display warning next to this config option

11 years agoMerge pull request #1213 from yashodha/4.3.CRM-12451
Kurund Jalmi [Tue, 23 Jul 2013 18:22:45 +0000 (11:22 -0700)]
Merge pull request #1213 from yashodha/4.3.CRM-12451

CRM-12451

11 years agoMerge pull request #1210 from pradpnayak/CRM-13065
Dave Greenberg [Tue, 23 Jul 2013 17:59:55 +0000 (10:59 -0700)]
Merge pull request #1210 from pradpnayak/CRM-13065

-- fixed for CRM-13065

11 years agoMerge pull request #1223 from davecivicrm/CRM-13101
Tim Otten [Tue, 23 Jul 2013 17:31:37 +0000 (10:31 -0700)]
Merge pull request #1223 from davecivicrm/CRM-13101

CRM-13101 fix typo in widget css.

11 years agoCRM-13101 fix typo in widget css.
Dave Greenberg [Tue, 23 Jul 2013 16:42:08 +0000 (09:42 -0700)]
CRM-13101 fix typo in widget css.

----------------------------------------
* CRM-13101: Typo in contribution widget generated css for .crm-amounts
  http://issues.civicrm.org/jira/browse/CRM-13101

11 years agoCRM-13078, added a check to validate the contact id if value is set for that particul...
CiviCRM [Tue, 23 Jul 2013 04:44:05 +0000 (10:14 +0530)]
CRM-13078, added a check to validate the contact id if value is set for that particular row

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

11 years agoremoved unwanted db call CRM-13078
CiviCRM [Tue, 23 Jul 2013 04:23:38 +0000 (09:53 +0530)]
removed unwanted db call CRM-13078

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

11 years agonotice fixes
CiviCRM [Tue, 23 Jul 2013 04:18:03 +0000 (09:48 +0530)]
notice fixes

11 years agoMerge pull request #1208 from pradpnayak/CRM-13060
Dave Greenberg [Mon, 22 Jul 2013 17:04:43 +0000 (10:04 -0700)]
Merge pull request #1208 from pradpnayak/CRM-13060

--fixed for CRM-13060

11 years agoCRM-12451
yashodha [Mon, 22 Jul 2013 06:44:33 +0000 (12:14 +0530)]
CRM-12451