dlobo [Fri, 17 May 2013 00:45:47 +0000 (17:45 -0700)]
Merge pull request #782 from dlobo/FormattingFixes
fix formatting
Donald A. Lobo [Fri, 17 May 2013 00:44:23 +0000 (17:44 -0700)]
fix formatting
Tim Otten [Thu, 16 May 2013 23:41:51 +0000 (19:41 -0400)]
CRM_Utils_Migrate_Export - Add toArray()
Unlike toXML(), this can be used with alternative serializations like json_encode() or var_export()
Tim Otten [Thu, 16 May 2013 23:35:48 +0000 (19:35 -0400)]
CRM_Utils_Migrate_Export - Formatting
Tim Otten [Thu, 16 May 2013 23:33:32 +0000 (19:33 -0400)]
CRM_Utils_Migrate_Export - Doc comment
Tim Otten [Thu, 16 May 2013 23:25:18 +0000 (19:25 -0400)]
CRM_Utils_Migrate_Export - Rename 'map' to 'idNameMap'
Tim Otten [Thu, 16 May 2013 23:23:36 +0000 (19:23 -0400)]
CRM_Utils_Migrate_Export - Rename local vars to match config vars
Tim Otten [Thu, 16 May 2013 23:19:47 +0000 (19:19 -0400)]
CRM-12647 - CRM_Utils_Migrate_Export - Move XML rendering logic from fetch() to toXML()
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 23:08:36 +0000 (19:08 -0400)]
CRM-12647 - Separate field-rewriting from XML encoding
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 22:51:21 +0000 (18:51 -0400)]
CRM-12647 - CRM_Utils_Migrate_Export - Extract renderKeyValueXML()
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 22:47:42 +0000 (18:47 -0400)]
CRM-12647 - Fix misnamed variable
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 22:46:39 +0000 (18:46 -0400)]
Cleanup
Tim Otten [Thu, 16 May 2013 22:45:45 +0000 (18:45 -0400)]
CRM-12647 - Simplify. Separate field-rewriting from XML encoding
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 22:43:21 +0000 (18:43 -0400)]
CRM-12647 - Separate field-rewriting from XML encoding
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 22:34:31 +0000 (18:34 -0400)]
CRM-12647 - CRM_Utils_Migrate_Export - Cleanup
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Dave Greenberg [Thu, 16 May 2013 22:19:16 +0000 (15:19 -0700)]
Merge pull request #780 from hbergin/CRM-12644
Update title and description of Contributions by Organization
Tim Otten [Thu, 16 May 2013 22:16:10 +0000 (18:16 -0400)]
CRM-12647 - CRM_Utils_Migrate_Export - Pull out various bits of static metadata
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Kurund Jalmi [Thu, 16 May 2013 21:49:08 +0000 (14:49 -0700)]
Merge pull request #779 from davecivicrm/CRM-12637
Applied patch from Helen Bergin to include multiple contributions in sam...
Tim Otten [Thu, 16 May 2013 21:45:06 +0000 (17:45 -0400)]
CRM-12647 - CRM_Utils_Migrate_Export - Cleanup
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
helen [Thu, 16 May 2013 21:41:47 +0000 (16:41 -0500)]
Update title and description of Contributions by Organization
Tim Otten [Thu, 16 May 2013 21:40:04 +0000 (17:40 -0400)]
CRM-12647 - CRM_Utils_Migrate_Export - Use htmlentities
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Dave Greenberg [Thu, 16 May 2013 21:16:43 +0000 (14:16 -0700)]
Applied patch from Helen Bergin to include multiple contributions in same year in totals. Also fixed fatal error for this report in 4.3 - getOperationPair needs to be defined as a static function.
Tim Otten [Thu, 16 May 2013 20:11:51 +0000 (16:11 -0400)]
CRM-12647 - CRM_Utils_Migrate_Export - Extract method addMappedXMLFields()
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 19:30:00 +0000 (15:30 -0400)]
CRM-12647 - CRM_Utils_Migrate - Extract constant for special delimiter
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 19:19:23 +0000 (15:19 -0400)]
CRM-12647 - CRM_Utils_Migrate_Export - Split run() into build() and toXML()
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Tim Otten [Thu, 16 May 2013 19:12:27 +0000 (15:12 -0400)]
CRM-12647 - CRM_Utils_Migrate - Autoformat
----------------------------------------
* CRM-12647: Customization export/import crashes on "&"
http://issues.civicrm.org/jira/browse/CRM-12647
Kurund Jalmi [Thu, 16 May 2013 17:48:57 +0000 (10:48 -0700)]
Merge pull request #778 from colemanw/quickSearch
Fix quicksearch by id CRM-12475
Kurund Jalmi [Thu, 16 May 2013 17:48:32 +0000 (10:48 -0700)]
Merge pull request #775 from kurund/CRM-12631
don't show navigation menu on joomla front-end, worked on CRM-12631
Kurund Jalmi [Thu, 16 May 2013 17:48:14 +0000 (10:48 -0700)]
Merge pull request #777 from pratik-joshi/CRM-12615-webtest
CRM-12615 qa: updated WebTest_Event_AddEventTest::testEventAddMultiplePa...
Coleman Watts [Thu, 16 May 2013 14:35:10 +0000 (09:35 -0500)]
Fix quicksearch by id CRM-12475
Pratik Joshi [Thu, 16 May 2013 13:07:07 +0000 (18:37 +0530)]
CRM-12618 webtest updation: added checking in WebTest_Event_AddEventTest::testEventAddMultipleParticipant test case
Pratik Joshi [Thu, 16 May 2013 11:14:12 +0000 (16:44 +0530)]
CRM-12615 qa: updated WebTest_Event_AddEventTest::testEventAddMultipleParticipant test case
deepak-srivastava [Thu, 16 May 2013 09:30:26 +0000 (02:30 -0700)]
Merge pull request #776 from deepak-srivastava/ninja
CRM-12641
Deepak Srivastava [Thu, 16 May 2013 09:24:08 +0000 (14:54 +0530)]
CRM-12641
Kurund Jalmi [Thu, 16 May 2013 05:37:49 +0000 (01:37 -0400)]
don't show navigation menu on joomla front-end, worked on CRM-12631
Kurund Jalmi [Thu, 16 May 2013 04:48:37 +0000 (21:48 -0700)]
Merge pull request #774 from kurund/CRM-12514
CRM-12514 expose petitions on activity search along with surveys
Kurund Jalmi [Thu, 16 May 2013 04:46:47 +0000 (00:46 -0400)]
CRM-12514 expose petitions on activity search along with surveys
Kurund Jalmi [Thu, 16 May 2013 03:57:30 +0000 (23:57 -0400)]
removed obsolete code
Kurund Jalmi [Thu, 16 May 2013 03:41:37 +0000 (20:41 -0700)]
Merge pull request #770 from davecivicrm/CRM-12618
CRM-12618 This includes Nicolas Ganivet patch to prevent editing of even...
Kurund Jalmi [Thu, 16 May 2013 03:39:11 +0000 (20:39 -0700)]
Merge pull request #772 from davecivicrm/CRM-12470_typofix
CRM-12470. Typo fixes in status messages
Kurund Jalmi [Thu, 16 May 2013 03:37:36 +0000 (20:37 -0700)]
Merge pull request #773 from totten/merge-rest
CRM-12613 - Forward port REST.php
Tim Otten [Thu, 16 May 2013 02:34:31 +0000 (22:34 -0400)]
CRM-12613 - Forward port REST.php
This file had been held back from normal merge-forward due to
merge-conflicts. Investigating upstream/master, it seems that there were
two changes that may have been source of conflict:
*
2ede60ec - This is formatting change and a bad-commit of a debug code
*
c5f77b41 - This is a real functional change but was backported (and
further fixed) in 4.3, so 4.3's version is better.
----------------------------------------
* CRM-12613: Resolve merge of REST.php (4.3=>master)
http://issues.civicrm.org/jira/browse/CRM-12613
Dave Greenberg [Thu, 16 May 2013 02:09:44 +0000 (19:09 -0700)]
CRM-12470. Typo fixes in status messages
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
Dave Greenberg [Thu, 16 May 2013 02:06:25 +0000 (19:06 -0700)]
Merge pull request #771 from davecivicrm/CRM-10771
Help for multi-record custom data set incorrectly says they can not be u...
Dave Greenberg [Thu, 16 May 2013 02:03:28 +0000 (19:03 -0700)]
Help for multi-record custom data set incorrectly says they can not be used in profiles. This changed in 4.3 due to CRM-10771.
----------------------------------------
* CRM-10771: Multiple-record Custom Data Sets in Profiles
http://issues.civicrm.org/jira/browse/CRM-10771
Dave Greenberg [Thu, 16 May 2013 01:40:53 +0000 (18:40 -0700)]
CRM-12618 This includes Nicolas Ganivet patch to prevent editing of event fee for paid additional participants, and fix to hide Record Payment checkbox for them as well.
----------------------------------------
* CRM-12618: Event registration edit screen for additional registrants is incorrect
http://issues.civicrm.org/jira/browse/CRM-12618
Kurund Jalmi [Wed, 15 May 2013 23:27:24 +0000 (19:27 -0400)]
removed obsolete code
colemanw [Wed, 15 May 2013 22:47:03 +0000 (15:47 -0700)]
Merge pull request #753 from pratik-joshi/CRM-12570-fix
CRM-12570 fix
Kurund Jalmi [Wed, 15 May 2013 22:40:06 +0000 (15:40 -0700)]
Merge pull request #764 from davecivicrm/CRM-12614
Crm 12614
Kurund Jalmi [Wed, 15 May 2013 22:39:09 +0000 (15:39 -0700)]
Merge pull request #765 from totten/gitignore-allcoretables
gitignore - Change path for AllCoreTables
Kurund Jalmi [Wed, 15 May 2013 22:38:36 +0000 (15:38 -0700)]
Merge pull request #767 from eileenmcnaughton/CRM-12628
CRM-12628 rename non-standard MailingGroup DAO instead of hack. Also add...
Kurund Jalmi [Wed, 15 May 2013 22:38:04 +0000 (15:38 -0700)]
Merge pull request #768 from pradpnayak/CRM-12470
Crm 12470
Kurund Jalmi [Wed, 15 May 2013 22:37:30 +0000 (15:37 -0700)]
Merge pull request #769 from pradpnayak/CRM-12492
-- fixed status msg for CRM-12492
Kurund Jalmi [Wed, 15 May 2013 22:36:31 +0000 (15:36 -0700)]
Merge pull request #766 from eileenmcnaughton/test-fix
Test fixes (contribution soft credit, tweaks on previous fixes)
Pradeep Nayak [Wed, 15 May 2013 22:31:13 +0000 (04:01 +0530)]
-- fixed status msg for CRM-12492
----------------------------------------
* CRM-12492: Prevent deletion of last AR financial account, and of A/R relationship for Financial Type
http://issues.civicrm.org/jira/browse/CRM-12492
Pradeep Nayak [Wed, 15 May 2013 22:26:06 +0000 (03:56 +0530)]
-- worked on CRM-12470 and fixed formatting
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
Pradeep Nayak [Wed, 15 May 2013 22:25:10 +0000 (03:55 +0530)]
--worked on CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
eileen [Wed, 15 May 2013 22:20:17 +0000 (10:20 +1200)]
CRM-12628 rename non-standard MailingGroup DAO instead of hack. Also add BAO for standardisation
eileen [Wed, 15 May 2013 21:50:27 +0000 (09:50 +1200)]
CRM-7954 fix on prev, copy & paste error in new BAO for membershipBlock
eileen [Wed, 15 May 2013 21:47:12 +0000 (09:47 +1200)]
opps removed too much debug :-(
eileen [Wed, 15 May 2013 21:35:32 +0000 (09:35 +1200)]
CRM-11320 fix error in test
eileen [Wed, 15 May 2013 21:28:02 +0000 (09:28 +1200)]
CRM-12463 fix test broken by soft credit restructure / make api stable
Tim Otten [Wed, 15 May 2013 20:03:19 +0000 (16:03 -0400)]
gitignore - Change path for AllCoreTables
Dave Greenberg [Wed, 15 May 2013 19:44:48 +0000 (12:44 -0700)]
CRM-12614 adding empty mysql.tpl file for 4.3.4 release. Seems like this is still required in order to user postUpgradeMessage function for a release.
----------------------------------------
* CRM-12614: Password required again for CLI cron
http://issues.civicrm.org/jira/browse/CRM-12614
Dave Greenberg [Wed, 15 May 2013 19:43:28 +0000 (12:43 -0700)]
CRM-12614. Add postUpgradeMessage for 4.3.4 which warns system admins that cli.php now requires a password.
----------------------------------------
* CRM-12614: Password required again for CLI cron
http://issues.civicrm.org/jira/browse/CRM-12614
Kurund Jalmi [Wed, 15 May 2013 17:08:31 +0000 (10:08 -0700)]
Merge pull request #763 from kurund/notice-fixes
notice fixes
Kurund Jalmi [Wed, 15 May 2013 17:07:08 +0000 (13:07 -0400)]
notice fixes
Kurund Jalmi [Wed, 15 May 2013 16:57:34 +0000 (09:57 -0700)]
Merge pull request #762 from kurund/notice-fixes
notice fixes
Kurund Jalmi [Wed, 15 May 2013 16:56:23 +0000 (12:56 -0400)]
notice fixes
Kurund Jalmi [Wed, 15 May 2013 16:18:16 +0000 (09:18 -0700)]
Merge pull request #761 from adamwight/api_autoloaded
Register and use the autoloader during API calls
Adam Roses Wight [Wed, 15 May 2013 15:59:02 +0000 (08:59 -0700)]
Register and use the autoloader during API calls
Kurund Jalmi [Wed, 15 May 2013 15:13:17 +0000 (08:13 -0700)]
Merge pull request #760 from JoeMurray/CRM-12603
fix arg passed to hook
Joe Murray [Wed, 15 May 2013 14:50:54 +0000 (10:50 -0400)]
fix arg passed to hook
----------------------------------------
* CRM-12603: grant pre hook invoked with wrong arg
http://issues.civicrm.org/jira/browse/CRM-12603
Kurund Jalmi [Wed, 15 May 2013 14:21:07 +0000 (07:21 -0700)]
Merge pull request #746 from kurund/CRM-12540
CRM-12540, removed Search Results link and obsolete code
Kurund Jalmi [Wed, 15 May 2013 14:19:51 +0000 (07:19 -0700)]
Merge pull request #751 from pratik-joshi/CRM-12378-improvement
fix for CRM-12378 comment : WebTest_Member_StandaloneAddTest.testAjaxCus...
Kurund Jalmi [Wed, 15 May 2013 14:17:49 +0000 (07:17 -0700)]
Merge pull request #750 from ravishnair/webtest-fix
-- webtest-fix related to issue CRM-12397 and fix for other failing tests
Kurund Jalmi [Wed, 15 May 2013 14:17:15 +0000 (07:17 -0700)]
Merge pull request #752 from eileenmcnaughton/test-fix
Test fixes including activity contact api, mailing contact api, soft contribution api
Kurund Jalmi [Wed, 15 May 2013 14:13:15 +0000 (07:13 -0700)]
Merge pull request #758 from yashodha/CRM-12615
CRM-12615
Kurund Jalmi [Wed, 15 May 2013 14:11:56 +0000 (07:11 -0700)]
Merge pull request #757 from pradpnayak/CRM-12492
-- worked on CRM-12492
eileen [Wed, 15 May 2013 14:03:29 +0000 (02:03 +1200)]
remove debug
eileen [Wed, 15 May 2013 14:02:41 +0000 (02:02 +1200)]
CRM-11320 this makes the api stable from 4.2 to 4.3
eileen [Wed, 15 May 2013 13:49:13 +0000 (01:49 +1200)]
remove some references to debug from tests
eileen [Wed, 15 May 2013 13:46:13 +0000 (01:46 +1200)]
CRM-12547 , CRM-12357 add a test for getCount
eileen [Wed, 15 May 2013 12:16:57 +0000 (00:16 +1200)]
CRM-12509 default custom group api to is_active =1
eileen [Wed, 15 May 2013 12:14:57 +0000 (00:14 +1200)]
CRM-12392 further problems arising from non-std BAO-naming
eileen [Wed, 15 May 2013 11:54:43 +0000 (23:54 +1200)]
CRM-12628 hack to deal with poorly named BAO class
eileen [Wed, 15 May 2013 10:54:25 +0000 (22:54 +1200)]
CRM12547, CRM-12357 fix Mailing Contact api to comply with api conformance tests
fix includes -
- using spec function to provide documentation, enforce required fields, provide default, enforce options
- using standard api function to process 'limit', 'sort' etc
- skipping checks for getByID because in this area the api cannot be made standard
NOTE that the default limit has been set to the api default (25). Making
this non standard for a particular use-case doesn't make sense.
Preferred calling method is
$params['options' => array('sort' => 'contact_id DESC', 'limit' => 50,
'offset' => 200)
re-fix mailing contact api
eileen [Wed, 15 May 2013 09:42:15 +0000 (21:42 +1200)]
CRM-12545 fix tests broken by work on activity contact restructuring
eileen [Wed, 15 May 2013 13:49:29 +0000 (01:49 +1200)]
add soft credit api examples
yashodha [Wed, 15 May 2013 13:25:59 +0000 (18:55 +0530)]
CRM-12615
Pradeep Nayak [Wed, 15 May 2013 12:37:51 +0000 (18:07 +0530)]
-- worked on CRM-12492
----------------------------------------
* CRM-12492: Prevent deletion of last AR financial account, and of A/R relationship for Financial Type
http://issues.civicrm.org/jira/browse/CRM-12492
Pratik Joshi [Wed, 15 May 2013 08:42:42 +0000 (14:12 +0530)]
CRM-12570 fix
eileen [Wed, 15 May 2013 08:13:13 +0000 (20:13 +1200)]
fix contribution soft del function
Pratik Joshi [Wed, 15 May 2013 06:29:15 +0000 (11:59 +0530)]
fix for CRM-12378 comment : WebTest_Member_StandaloneAddTest.testAjaxCustomGroupLoad was failing (https://test.civicrm.org/job/CiviCRM-4.3-WebTest-git/LABEL=ubuntu1204,SUITE=WebTest_AllTests/24/)
Ravish Nair [Wed, 15 May 2013 06:28:33 +0000 (11:58 +0530)]
-- webtest-fix related to issue CRM-12397 and fix for other failing tests
Tim Otten [Wed, 15 May 2013 05:46:16 +0000 (22:46 -0700)]
Merge pull request #749 from eileenmcnaughton/test-fix
CRM-12626 Fix test by no validating arrays passed into string fields
eileen [Wed, 15 May 2013 05:34:09 +0000 (17:34 +1200)]
CRM-12626 Fix test by no validating arrays passed into string fields
Kurund Jalmi [Wed, 15 May 2013 04:53:07 +0000 (21:53 -0700)]
Merge pull request #747 from dlobo/CRM-12624
CRM-12624
Tim Otten [Wed, 15 May 2013 04:52:45 +0000 (21:52 -0700)]
Merge pull request #748 from adamwight/fix_entity_name
Fix an error in
4d1d7ac - get short name from classname
Adam Roses Wight [Wed, 15 May 2013 04:43:01 +0000 (21:43 -0700)]
Fix an error in
4d1d7ac - get short name from classname