civicrm-core.git
10 years agoMerge pull request #1296 from dlobo/CRM-13090
dlobo [Wed, 31 Jul 2013 20:49:47 +0000 (13:49 -0700)]
Merge pull request #1296 from dlobo/CRM-13090

fix patch for CRM-13090

10 years agofix patch for CRM-13090
Donald A. Lobo [Wed, 31 Jul 2013 20:48:52 +0000 (13:48 -0700)]
fix patch for CRM-13090

----------------------------------------
* CRM-13090: New Petition/Survey form validation - enforce unique constraint on ActivityType-Campaign-Title
  http://issues.civicrm.org/jira/browse/CRM-13090

10 years agoMerge pull request #1295 from totten/master-isprimary-tables
Tim Otten [Wed, 31 Jul 2013 20:36:09 +0000 (13:36 -0700)]
Merge pull request #1295 from totten/master-isprimary-tables

CRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions

10 years agoCRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions
Tim Otten [Wed, 31 Jul 2013 20:32:54 +0000 (13:32 -0700)]
CRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions

----------------------------------------
* CRM-13075: Mark is_primary for HRJob records
  http://issues.civicrm.org/jira/browse/CRM-13075

10 years agoMerge pull request #1217 from samuelsov/CRM-10606
Dave Greenberg [Wed, 31 Jul 2013 19:12:04 +0000 (12:12 -0700)]
Merge pull request #1217 from samuelsov/CRM-10606

CRM-10606 Remove specific code for upgrade from 2.0 to 2.1

10 years agoMerge pull request #1291 from monishdeb/CRM-8813
Kurund Jalmi [Wed, 31 Jul 2013 15:53:51 +0000 (08:53 -0700)]
Merge pull request #1291 from monishdeb/CRM-8813

CRM-8813 Message Template fix

10 years agoCRM-8813 Message Template fix
monishdeb [Wed, 31 Jul 2013 15:51:44 +0000 (21:21 +0530)]
CRM-8813 Message Template fix

----------------------------------------
* CRM-8813: Fix token insert cursor placement issue in Plain Text message body on IE 8
  http://issues.civicrm.org/jira/browse/CRM-8813

10 years agoMerge pull request #1289 from monishdeb/CRM-8813
Kurund Jalmi [Wed, 31 Jul 2013 14:38:27 +0000 (07:38 -0700)]
Merge pull request #1289 from monishdeb/CRM-8813

CRM-8813 fix

10 years agoCRM-8813 fix
monishdeb [Wed, 31 Jul 2013 14:32:28 +0000 (20:02 +0530)]
CRM-8813 fix

----------------------------------------
* CRM-8813: Fix token insert cursor placement issue in Plain Text message body on IE 8
  http://issues.civicrm.org/jira/browse/CRM-8813

10 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16
kurund [Wed, 31 Jul 2013 11:19:54 +0000 (16:49 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16

Conflicts:
CRM/Contact/Form/Task/Batch.php
CRM/Contribute/Form/Task/Batch.php
CRM/Event/Form/ManageEvent/Fee.php
CRM/Price/BAO/LineItem.php
CRM/Utils/System/Base.php
templates/CRM/Batch/Form/Entry.tpl

10 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

10 years agoMerge pull request #1286 from monishdeb/CRM-12270
Kurund Jalmi [Wed, 31 Jul 2013 10:04:01 +0000 (03:04 -0700)]
Merge pull request #1286 from monishdeb/CRM-12270

CRM-12270 fix

10 years agoMerge pull request #1288 from monishdeb/CRM-12186
Kurund Jalmi [Wed, 31 Jul 2013 10:02:10 +0000 (03:02 -0700)]
Merge pull request #1288 from monishdeb/CRM-12186

CRM-12186 fix

10 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

10 years agoCRM-12186 fix
monishdeb [Wed, 31 Jul 2013 09:57:41 +0000 (15:27 +0530)]
CRM-12186 fix

----------------------------------------
* CRM-12186: Fonts in new profile editor preview mode are too small and wrapped.
  http://issues.civicrm.org/jira/browse/CRM-12186

10 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

10 years agoCRM-12270 fix
monishdeb [Wed, 31 Jul 2013 08:07:14 +0000 (13:37 +0530)]
CRM-12270 fix

----------------------------------------
* CRM-12270: Batch Change Participant Status task sends confirmation email and marks contribution completed when participant status is updated FROM "Pending Pay Later" to "Attended" or "Registered"
  http://issues.civicrm.org/jira/browse/CRM-12270

10 years agoMerge pull request #1285 from kurund/CRM-12814
Kurund Jalmi [Wed, 31 Jul 2013 07:36:20 +0000 (00:36 -0700)]
Merge pull request #1285 from kurund/CRM-12814

CRM-12814, fixed the total issue, code cleanup and notice fixes

10 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

10 years agoCRM-12814, fixed the total issue, code cleanup and notice fixes
kurund [Tue, 30 Jul 2013 22:18:32 +0000 (03:48 +0530)]
CRM-12814, fixed the total issue, code cleanup and notice fixes

----------------------------------------
* CRM-12814: mailings tab slow performance
  http://issues.civicrm.org/jira/browse/CRM-12814

10 years agoUpdate Layout.hlp
Dave Greenberg [Tue, 30 Jul 2013 19:23:52 +0000 (12:23 -0700)]
Update Layout.hlp

fixed duplicate id in htxt tag.

10 years agoMerge pull request #1282 from colemanw/getLabel
colemanw [Tue, 30 Jul 2013 17:29:04 +0000 (10:29 -0700)]
Merge pull request #1282 from colemanw/getLabel

More robust ways to get pseudoconstant labels and names CRM-12464

10 years agoMore robust ways to get pseudoconstant labels and names CRM-12464
Coleman Watts [Tue, 30 Jul 2013 16:52:33 +0000 (09:52 -0700)]
More robust ways to get pseudoconstant labels and names CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

10 years agoMerge pull request #1281 from deepak-srivastava/softcredits
deepak-srivastava [Tue, 30 Jul 2013 16:15:29 +0000 (09:15 -0700)]
Merge pull request #1281 from deepak-srivastava/softcredits

CRM-13061, soft credits - aggregate columns, filters and stats

10 years agoCRM-13061, soft credits - aggregate columns, filters and stats
Deepak Srivastava [Tue, 30 Jul 2013 15:03:31 +0000 (20:33 +0530)]
CRM-13061, soft credits - aggregate columns, filters and stats

----------------------------------------
* CRM-13061: Add Soft Credits to Contribution Summary Report
  http://issues.civicrm.org/jira/browse/CRM-13061

10 years agoMerge pull request #1276 from davecivicrm/CRM-12963
Kurund Jalmi [Tue, 30 Jul 2013 07:00:06 +0000 (00:00 -0700)]
Merge pull request #1276 from davecivicrm/CRM-12963

Crm 12963 adding help and fixing typos and markup

10 years agoMerge pull request #1278 from totten/master-reporttestcase-2
Tim Otten [Tue, 30 Jul 2013 05:23:17 +0000 (22:23 -0700)]
Merge pull request #1278 from totten/master-reporttestcase-2

CRM-12622 - Misc fixes/enhancements

10 years agoCRM-12622 - Report testing - Multiple fixes/enhancements:
Tim Otten [Tue, 30 Jul 2013 05:18:11 +0000 (22:18 -0700)]
CRM-12622 - Report testing - Multiple fixes/enhancements:

 * Use only non-international (ASCII) characters. The international characters break when executing multiple tests.
 * Drop temporary tables created by Contribute/Detail report. They break when executing multiple tess.
 * Add positive and negative test cases to CRM_Report_Form_TestCaseTest. The tests evolved originally within DetailTest, but tey look redundant/silly in DetailTest. Put them in a new class where it's clearer that we're testing the framework (and DetailTest is just an example)

----------------------------------------
* CRM-12622: Create framework for example report data files
  http://issues.civicrm.org/jira/browse/CRM-12622

10 years agoCRM-12622 - CiviUnitTestCase - Promote sethtmlGlobals
Tim Otten [Tue, 30 Jul 2013 04:19:53 +0000 (21:19 -0700)]
CRM-12622 - CiviUnitTestCase - Promote sethtmlGlobals

When defining multiple cases in CRM_Report_Form_Contribute_Detail, the
second case fails due to an uninitialized (lost?) global.
api_v3_UFFieldTest seems to have a work-around.

```
1) CRM_Report_Form_Contribute_DetailTest::testReportOutput with data set #1 ('CRM_Report_Form_Contribute_Detail', array(array('first_name', 'email', 'total_amount'), array('gte', 50)), 'fixtures/dataset.sql', 'fixtures/report.csv')
Undefined index: _HTML_QuickForm_registered_rules

/Applications/MAMP/htdocs/sites/all/modules/civicrm/packages/HTML/QuickForm/RuleRegistry.php:122
/Applications/MAMP/htdocs/sites/all/modules/civicrm/packages/HTML/QuickForm/RuleRegistry.php:98
/Applications/MAMP/htdocs/sites/all/modules/civicrm/packages/HTML/QuickForm.php:389
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Core/Form.php:187
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Core/Form.php:156
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Report/Form.php:256
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Report/Form/Contribute/Detail.php:362
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Core/Controller.php:426
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Core/Controller/Simple.php:79
/Applications/MAMP/htdocs/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviReportTestCase.php:43
/Applications/MAMP/htdocs/sites/all/modules/civicrm/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php:105
/Applications/MAMP/htdocs/sites/all/modules/civicrm/tools/scripts/phpunit:75
```

----------------------------------------
* CRM-12622: Create framework for example report data files
  http://issues.civicrm.org/jira/browse/CRM-12622

10 years agoCRM_Utils_GlobalStack - Allow top-level vars
Tim Otten [Tue, 30 Jul 2013 04:15:28 +0000 (21:15 -0700)]
CRM_Utils_GlobalStack - Allow top-level vars

10 years agoMerge pull request #1277 from totten/master-reporttestcase
Tim Otten [Tue, 30 Jul 2013 03:36:47 +0000 (20:36 -0700)]
Merge pull request #1277 from totten/master-reporttestcase

CRM-12622 - Fix regresion in CRM_Report_Form_Contribute_DetailTest

10 years agoCleanup/Autoformat
Tim Otten [Tue, 30 Jul 2013 03:35:22 +0000 (20:35 -0700)]
Cleanup/Autoformat

10 years agoCRM-12622 - Extract assertCsvArraysEqual
Tim Otten [Tue, 30 Jul 2013 03:33:49 +0000 (20:33 -0700)]
CRM-12622 - Extract assertCsvArraysEqual

----------------------------------------
* CRM-12622: Create framework for example report data files
  http://issues.civicrm.org/jira/browse/CRM-12622

10 years agoCRM_Report_Form_Contribute_DetailTest - Update ($ vs USD)
Tim Otten [Tue, 30 Jul 2013 03:21:44 +0000 (20:21 -0700)]
CRM_Report_Form_Contribute_DetailTest - Update ($ vs USD)

10 years agoCRM-12622 - CiviReportTestCase - Set missing global variables
Tim Otten [Tue, 30 Jul 2013 03:18:47 +0000 (20:18 -0700)]
CRM-12622 - CiviReportTestCase - Set missing global variables

----------------------------------------
* CRM-12622: Create framework for example report data files
  http://issues.civicrm.org/jira/browse/CRM-12622

10 years agoMerge pull request #1270 from ravishnair/CRM-13037
Tim Otten [Mon, 29 Jul 2013 23:47:49 +0000 (16:47 -0700)]
Merge pull request #1270 from ravishnair/CRM-13037

-- CRM-13037 fix for Navigating among tabs produces wrong popups

10 years agoCRM-12963 adding help
Dave Greenberg [Mon, 29 Jul 2013 22:30:49 +0000 (15:30 -0700)]
CRM-12963 adding help

----------------------------------------
* CRM-12963: Event Badge Improvements
  http://issues.civicrm.org/jira/browse/CRM-12963

10 years agoCRM-12963 Adding help for badges, changing field label to be consistent w our termino...
Dave Greenberg [Mon, 29 Jul 2013 22:19:50 +0000 (15:19 -0700)]
CRM-12963 Adding help for badges, changing field label to be consistent w our terminology, use standard Add New markup.

----------------------------------------
* CRM-12963: Event Badge Improvements
  http://issues.civicrm.org/jira/browse/CRM-12963

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

10 years agoMerge pull request #1274 from davecivicrm/CRM-13117
Kurund Jalmi [Mon, 29 Jul 2013 17:38:25 +0000 (10:38 -0700)]
Merge pull request #1274 from davecivicrm/CRM-13117

CRM-13117 remove references to Global Settings menu item.

10 years agoMerge pull request #1273 from colemanw/bool
Kurund Jalmi [Mon, 29 Jul 2013 17:30:31 +0000 (10:30 -0700)]
Merge pull request #1273 from colemanw/bool

Remove unused T_BOOL constant

10 years agoPass context from pseudoconstant getKey/getValue CRM-12464
Coleman Watts [Mon, 29 Jul 2013 17:29:56 +0000 (10:29 -0700)]
Pass context from pseudoconstant getKey/getValue CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

10 years agoRemove unused T_BOOL constant
Coleman Watts [Mon, 29 Jul 2013 16:28:01 +0000 (09:28 -0700)]
Remove unused T_BOOL constant

10 years agoMerge pull request #1105 from colemanw/prevNext
colemanw [Mon, 29 Jul 2013 16:12:37 +0000 (09:12 -0700)]
Merge pull request #1105 from colemanw/prevNext

Search optimizations: prevnext cache improvements

10 years agoTest fix
Coleman Watts [Mon, 29 Jul 2013 04:18:59 +0000 (21:18 -0700)]
Test fix

10 years agoMerge pull request #1271 from deepak-srivastava/revisions
deepak-srivastava [Mon, 29 Jul 2013 10:36:45 +0000 (03:36 -0700)]
Merge pull request #1271 from deepak-srivastava/revisions

CRM-12915, fixed dailog output for empty response

10 years agoCRM-12915, fixed dailog output for empty response
Deepak Srivastava [Mon, 29 Jul 2013 10:32:24 +0000 (16:02 +0530)]
CRM-12915, fixed dailog output for empty response

----------------------------------------
* CRM-12915: Improve layout of revision-history for multi-row CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12915

10 years agoMerge pull request #1259 from kurund/eval-fixes
Kurund Jalmi [Mon, 29 Jul 2013 10:06:22 +0000 (03:06 -0700)]
Merge pull request #1259 from kurund/eval-fixes

component export was broken due to eval cleanup, this should fix

10 years agoMerge pull request #1267 from yashodha/4.4.CRM-12849
Kurund Jalmi [Mon, 29 Jul 2013 10:06:00 +0000 (03:06 -0700)]
Merge pull request #1267 from yashodha/4.4.CRM-12849

worked on CRM-12849

10 years agoMerge pull request #1268 from pratik-joshi/CRM-13112-qa-fix
Kurund Jalmi [Mon, 29 Jul 2013 10:05:07 +0000 (03:05 -0700)]
Merge pull request #1268 from pratik-joshi/CRM-13112-qa-fix

-- CRM-13112 : is share handling on confirm petition page which can be visited after email verification

10 years agoMerge pull request #1269 from yashodha/4.4.CRM-13092
Kurund Jalmi [Mon, 29 Jul 2013 10:04:30 +0000 (03:04 -0700)]
Merge pull request #1269 from yashodha/4.4.CRM-13092

CRM-13092

10 years ago-- indentation fix
Ravish Nair [Mon, 29 Jul 2013 10:03:34 +0000 (15:33 +0530)]
-- indentation fix

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

10 years ago-- CRM-13037 fix for Navigating among tabs produces wrong popups
Ravish Nair [Mon, 29 Jul 2013 09:42:45 +0000 (15:12 +0530)]
-- CRM-13037 fix for Navigating among tabs produces wrong popups

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

10 years agoCRM-13092
yashodha [Mon, 29 Jul 2013 08:36:31 +0000 (14:06 +0530)]
CRM-13092

10 years agoCRM-13092
yashodha [Mon, 29 Jul 2013 08:06:51 +0000 (13:36 +0530)]
CRM-13092

10 years ago-- CRM-13112 : is share handling on confirm petition page which can be visited after...
Pratik Joshi [Mon, 29 Jul 2013 07:48:08 +0000 (13:18 +0530)]
-- CRM-13112 : is share handling on confirm petition page which can be visited after email verification

10 years agoworked on CRM-12849
yashodha [Mon, 29 Jul 2013 05:30:02 +0000 (11:00 +0530)]
worked on CRM-12849

10 years agoMerge pull request #1262 from eileenmcnaughton/CRM-13072-more-upgrades
Tim Otten [Mon, 29 Jul 2013 02:07:25 +0000 (19:07 -0700)]
Merge pull request #1262 from eileenmcnaughton/CRM-13072-more-upgrades

Crm 13072 more upgrades

10 years agoMerge pull request #1266 from totten/master-bb-ismodified-fix
Tim Otten [Mon, 29 Jul 2013 01:34:08 +0000 (18:34 -0700)]
Merge pull request #1266 from totten/master-bb-ismodified-fix

CRM-12923 - crm.backbon.js - Fix bug

10 years agoCRM-12923 - crm.backbon.js - Fix bug
Tim Otten [Mon, 29 Jul 2013 01:11:57 +0000 (18:11 -0700)]
CRM-12923 - crm.backbon.js - Fix bug

----------------------------------------
* CRM-12923: Create HTML prototype of "Job Position" UI
  http://issues.civicrm.org/jira/browse/CRM-12923

10 years agoMerge pull request #1265 from totten/master-bb-ismodified
Tim Otten [Sun, 28 Jul 2013 22:07:31 +0000 (15:07 -0700)]
Merge pull request #1265 from totten/master-bb-ismodified

CRM-12923 - crm.backbone.js - Add isModified (in addition to isSaved)

10 years agoCRM-12923 - crm.backbone.js - Add isModified (in addition to isSaved)
Tim Otten [Sun, 28 Jul 2013 22:05:16 +0000 (15:05 -0700)]
CRM-12923 - crm.backbone.js - Add isModified (in addition to isSaved)

----------------------------------------
* CRM-12923: Create HTML prototype of "Job Position" UI
  http://issues.civicrm.org/jira/browse/CRM-12923

10 years agoCRM-13072 tidy up of examples, syntax conformance debug
eileen [Sun, 28 Jul 2013 19:44:17 +0000 (07:44 +1200)]
CRM-13072 tidy up of examples, syntax conformance debug

10 years agoMerge pull request #1264 from colemanw/pseudo
colemanw [Sun, 28 Jul 2013 19:45:06 +0000 (12:45 -0700)]
Merge pull request #1264 from colemanw/pseudo

Support additional option lists - state, country, boolean CRM-12464

10 years agoCRM-13117 remove references to Global Settings menu item.
Dave Greenberg [Sun, 28 Jul 2013 19:06:48 +0000 (12:06 -0700)]
CRM-13117 remove references to Global Settings menu item.

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

10 years agoMerge pull request #1263 from deepak-srivastava/revisions
deepak-srivastava [Sun, 28 Jul 2013 14:36:23 +0000 (07:36 -0700)]
Merge pull request #1263 from deepak-srivastava/revisions

CRM-12915, common js file for CiviHR to load revisions inside a tab

10 years agoCRM-12915, common js file for CiviHR to load revisions inside a tab
Deepak Srivastava [Sun, 28 Jul 2013 14:33:36 +0000 (20:03 +0530)]
CRM-12915, common js file for CiviHR to load revisions inside a tab

----------------------------------------
* CRM-12915: Improve layout of revision-history for multi-row CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12915

10 years agoCRM-13072 more test class upgrades
eileen [Sun, 28 Jul 2013 10:12:59 +0000 (22:12 +1200)]
CRM-13072 more test class upgrades

10 years agoCRM-13072 remove require_once
eileen [Sun, 28 Jul 2013 10:09:00 +0000 (22:09 +1200)]
CRM-13072 remove require_once

10 years agoCRM-13072 a bit of extra getcount error handling
eileen [Sun, 28 Jul 2013 10:02:56 +0000 (22:02 +1200)]
CRM-13072 a bit of extra getcount error handling

10 years agoCRM-13072 Update examples
eileen [Sun, 28 Jul 2013 09:58:02 +0000 (21:58 +1200)]
CRM-13072 Update examples

10 years agoCRM-13072 further tweak on example formatter
eileen [Sat, 27 Jul 2013 22:46:45 +0000 (10:46 +1200)]
CRM-13072 further tweak on example formatter

10 years agoCRM-13072 update example template
eileen [Sat, 27 Jul 2013 22:31:57 +0000 (10:31 +1200)]
CRM-13072 update example template

10 years agoCRM-13072 fix non return on civicrm_api3 wrapper - how did that sneak in?
eileen [Sat, 27 Jul 2013 22:30:37 +0000 (10:30 +1200)]
CRM-13072 fix non return on civicrm_api3 wrapper - how did that sneak in?

10 years agoCRM-13072 fix documentMe to not show debug fields on nested items
eileen [Sat, 27 Jul 2013 21:57:00 +0000 (09:57 +1200)]
CRM-13072 fix documentMe to not show debug fields on nested items

10 years agoSupport additional option lists - state, country, boolean CRM-12464
Coleman Watts [Sat, 27 Jul 2013 21:06:49 +0000 (14:06 -0700)]
Support additional option lists - state, country, boolean CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

10 years agoMerge pull request #1261 from kurund/CRM-12994
Kurund Jalmi [Sat, 27 Jul 2013 20:02:40 +0000 (13:02 -0700)]
Merge pull request #1261 from kurund/CRM-12994

CRM-12994, Premiums Section disabled, yet asking for No Thank You Title

10 years agoCRM-12994, js cleanup
kurund [Sat, 27 Jul 2013 20:00:22 +0000 (01:30 +0530)]
CRM-12994, js cleanup

----------------------------------------
* CRM-12994: Premiums Section disabled, yet asking for No Thank You Title
  http://issues.civicrm.org/jira/browse/CRM-12994

10 years agotemplate cleanup
kurund [Sat, 27 Jul 2013 19:32:47 +0000 (01:02 +0530)]
template cleanup

10 years agoMerge pull request #1260 from aadityawalawalkar/CRM-12994
Kurund Jalmi [Sat, 27 Jul 2013 19:21:51 +0000 (12:21 -0700)]
Merge pull request #1260 from aadityawalawalkar/CRM-12994

CRM-12994 fix and web test

10 years agoMerge pull request #1214 from davecivicrm/CRM-12788
Kurund Jalmi [Sat, 27 Jul 2013 19:05:19 +0000 (12:05 -0700)]
Merge pull request #1214 from davecivicrm/CRM-12788

CRM-12788 MembershipBlock.tpl was missing the conditional to display mul...

10 years agoMerge pull request #1216 from davecivicrm/CRM-13062
Kurund Jalmi [Sat, 27 Jul 2013 19:01:57 +0000 (12:01 -0700)]
Merge pull request #1216 from davecivicrm/CRM-13062

CRM-13062 Fix various typos and obsolete admin menu paths.

10 years agoMerge pull request #1227 from PalanteJon/for-real-2
Kurund Jalmi [Sat, 27 Jul 2013 19:00:53 +0000 (12:00 -0700)]
Merge pull request #1227 from PalanteJon/for-real-2

fixes CRM-13050 - incorporates Kurund's suggestion to use  CRM_Core_DAO::VALUE_SEPARATOR

10 years agoMerge pull request #1238 from sfe-ev/CRM-12995_amend
Kurund Jalmi [Sat, 27 Jul 2013 18:58:20 +0000 (11:58 -0700)]
Merge pull request #1238 from sfe-ev/CRM-12995_amend

Amend CRM-12995 fix

10 years agocomponent export was broken due to eval cleanup, this should fix
kurund [Sat, 27 Jul 2013 18:29:42 +0000 (23:59 +0530)]
component export was broken due to eval cleanup, this should fix

10 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

10 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

10 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

10 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

10 years agoMerge pull request #1226 from kurund/CRM-11137
Kurund Jalmi [Sat, 27 Jul 2013 12:59:11 +0000 (05:59 -0700)]
Merge pull request #1226 from kurund/CRM-11137

CRM-11137

10 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

10 years agoMerge pull request #1243 from yashodha/4.4.CRM-13112
Kurund Jalmi [Sat, 27 Jul 2013 12:58:01 +0000 (05:58 -0700)]
Merge pull request #1243 from yashodha/4.4.CRM-13112

CRM-13112

10 years agoCRM-13072 set domain default for UF_Match on BAO layer rather than requiring on api
eileen [Sat, 27 Jul 2013 12:10:11 +0000 (00:10 +1200)]
CRM-13072 set domain default for UF_Match on BAO layer rather than requiring on api

10 years agoCRM-13072 test related cleanups - handled getcount on priceset (hackily), simplify...
eileen [Sat, 27 Jul 2013 12:04:20 +0000 (00:04 +1200)]
CRM-13072 test related cleanups - handled getcount on priceset (hackily), simplify membership, whitespace, declare price_field_id as a required field on price_field_value

10 years agoCRM-13072 more test upgrades
eileen [Sat, 27 Jul 2013 11:58:38 +0000 (23:58 +1200)]
CRM-13072 more test upgrades

10 years agoMerge pull request #1257 from davecivicrm/CRM-13110
Tim Otten [Sat, 27 Jul 2013 02:26:03 +0000 (19:26 -0700)]
Merge pull request #1257 from davecivicrm/CRM-13110

CRM-13110

10 years agoMerge pull request #1258 from totten/master-callapissuccess
Tim Otten [Sat, 27 Jul 2013 02:24:21 +0000 (19:24 -0700)]
Merge pull request #1258 from totten/master-callapissuccess

CiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls

10 years agoCiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls
Tim Otten [Sat, 27 Jul 2013 02:03:31 +0000 (19:03 -0700)]
CiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls

10 years agoComment fix and using self:: for all on line 2153
Dave Greenberg [Fri, 26 Jul 2013 23:47:24 +0000 (16:47 -0700)]
Comment fix and using self:: for all on line 2153

10 years agoFixed bug where delete membership task does not also delete related memberships....
Dave Greenberg [Fri, 26 Jul 2013 23:36:41 +0000 (16:36 -0700)]
Fixed bug where delete membership task does not also delete related memberships. Created a new del method in Membership BAO.