Kurund Jalmi [Tue, 21 May 2013 19:56:40 +0000 (12:56 -0700)]
Merge pull request #817 from pradpnayak/CRM-12470
-- fixed notice errors for CRM-12470
Pradeep Nayak [Fri, 31 May 2013 08:16:53 +0000 (13:46 +0530)]
-- fixed notice errors for CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
Kurund Jalmi [Tue, 21 May 2013 04:12:13 +0000 (21:12 -0700)]
Merge pull request #816 from kurund/pradpnayak-CRM-12470
manually merging https://github.com/civicrm/civicrm-core/pull/802
Kurund Jalmi [Tue, 21 May 2013 03:42:27 +0000 (23:42 -0400)]
Merge branch 'CRM-12470' of git://github.com/pradpnayak/civicrm-core into pradpnayak-CRM-12470
Conflicts:
CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
Kurund Jalmi [Tue, 21 May 2013 03:22:54 +0000 (20:22 -0700)]
Merge pull request #815 from kurund/CRM-12466
CRM-12466, add configuration for displaying smart groups in Contact Summary > Groups tab
Kurund Jalmi [Tue, 21 May 2013 03:20:51 +0000 (20:20 -0700)]
Merge pull request #811 from davecivicrm/CRM-12510
CRM-12510. There were no webtests for copying a contribution page or cop...
Kurund Jalmi [Tue, 21 May 2013 03:19:56 +0000 (20:19 -0700)]
Merge pull request #807 from pradpnayak/CRM-12665
-- worked on CRM-12665
Pradeep Nayak [Thu, 30 May 2013 15:49:28 +0000 (21:19 +0530)]
-- worked on CRM-12665
----------------------------------------
* CRM-12665: Remove unwanted files in Grant
http://issues.civicrm.org/jira/browse/CRM-12665
Kurund Jalmi [Tue, 21 May 2013 03:19:05 +0000 (20:19 -0700)]
Merge pull request #812 from dlobo/NoticeFixes
fix more php5.3 notices
Kurund Jalmi [Tue, 21 May 2013 03:18:41 +0000 (20:18 -0700)]
Merge pull request #813 from dlobo/CRM-12646
CRM-12646
Kurund Jalmi [Tue, 21 May 2013 01:53:04 +0000 (21:53 -0400)]
CRM-12466, upgrade related fixes
Kurund Jalmi [Tue, 21 May 2013 01:34:17 +0000 (21:34 -0400)]
CRM-12466, re-generate data for changes in civicrm_data.tpl
Kurund Jalmi [Tue, 21 May 2013 00:45:02 +0000 (20:45 -0400)]
CRM-12466, added smart group pane
Kurund Jalmi [Mon, 20 May 2013 04:07:52 +0000 (00:07 -0400)]
more work on CRM-12466
Kurund Jalmi [Mon, 20 May 2013 03:53:46 +0000 (23:53 -0400)]
more work on CRM-12466, added new files for contact smart group
Kurund Jalmi [Sun, 19 May 2013 02:33:03 +0000 (22:33 -0400)]
template cleanip
Kurund Jalmi [Fri, 17 May 2013 20:55:32 +0000 (16:55 -0400)]
remove obsolete code
Kurund Jalmi [Fri, 17 May 2013 06:09:38 +0000 (02:09 -0400)]
CRM-12466, layout fix and added inline help
Kurund Jalmi [Fri, 17 May 2013 06:01:08 +0000 (02:01 -0400)]
CRM-12466 fixed default option for new installs
Kurund Jalmi [Fri, 17 May 2013 05:35:22 +0000 (01:35 -0400)]
CRM-12466, fixed saving of radio options
Kurund Jalmi [Fri, 17 May 2013 05:31:34 +0000 (01:31 -0400)]
CRM-12466, worked on form building
Kurund Jalmi [Fri, 17 May 2013 05:22:31 +0000 (01:22 -0400)]
tempalate cleanup
Kurund Jalmi [Fri, 17 May 2013 05:14:51 +0000 (01:14 -0400)]
CRM-12466, added option group and values for contact smart group view options
Kurund Jalmi [Fri, 17 May 2013 04:33:56 +0000 (00:33 -0400)]
code cleanup
Dave Greenberg [Mon, 20 May 2013 21:12:39 +0000 (14:12 -0700)]
Merge pull request #804 from pradpnayak/CRM-12498
--fixed for CRM-12498, added condition to check valid contribution statu...
Ran the complete api v3 Contribution unit test w/o errors after applying this patch.
Donald A. Lobo [Mon, 20 May 2013 21:02:35 +0000 (14:02 -0700)]
CRM-12646
----------------------------------------
* CRM-12646: Suppress the ability to edit custom data unless the user has edit rights on the contact.
http://issues.civicrm.org/jira/browse/CRM-12646
Dave Greenberg [Mon, 20 May 2013 20:39:50 +0000 (13:39 -0700)]
Merge pull request #795 from colemanw/is_test
Fix for contributions only CRM-12610
Donald A. Lobo [Mon, 20 May 2013 20:39:30 +0000 (13:39 -0700)]
fix more php5.3 notices
Dave Greenberg [Mon, 20 May 2013 20:22:18 +0000 (13:22 -0700)]
CRM-12510. There were no webtests for copying a contribution page or copying an event. Adding them.
----------------------------------------
* CRM-12510: Copy Contribution Page does not copy associated quick-config price set
http://issues.civicrm.org/jira/browse/CRM-12510
Kurund Jalmi [Mon, 20 May 2013 19:49:25 +0000 (12:49 -0700)]
Merge pull request #808 from dlobo/NoticeFixes
handle global variable $language not being set, restructure code a bit
dlobo [Mon, 20 May 2013 18:08:38 +0000 (11:08 -0700)]
Merge pull request #809 from dlobo/CRM-12667
CRM-12667
Donald A. Lobo [Mon, 20 May 2013 18:07:52 +0000 (11:07 -0700)]
CRM-12667
----------------------------------------
* CRM-12667: Tell a Friend causes error: "You do not have permission to access this page"
http://issues.civicrm.org/jira/browse/CRM-12667
Donald A. Lobo [Mon, 20 May 2013 17:57:32 +0000 (10:57 -0700)]
CRM-12667
----------------------------------------
* CRM-12667: Tell a Friend causes error: "You do not have permission to access this page"
http://issues.civicrm.org/jira/browse/CRM-12667
Donald A. Lobo [Mon, 20 May 2013 16:04:26 +0000 (09:04 -0700)]
handle global variable $language not being set, restructure code a bit
dlobo [Mon, 20 May 2013 14:04:21 +0000 (07:04 -0700)]
Merge pull request #805 from Edzelopez/CRM-12664
CRM-12664 --Fix for Grant Delete notification
Edsel [Mon, 20 May 2013 12:29:03 +0000 (17:59 +0530)]
CRM-12664 --Fix for Grant Delete notification
Pradeep Nayak [Mon, 20 May 2013 10:59:34 +0000 (16:29 +0530)]
--fixed for CRM-12498, added condition to check valid contribution status change and throw error if invalid
----------------------------------------
* CRM-12498: API contribution.create/update DB Error: constraint violation
http://issues.civicrm.org/jira/browse/CRM-12498
Pradeep Nayak [Mon, 20 May 2013 08:11:42 +0000 (13:41 +0530)]
--fixed webtest, crm test and upgrade script for CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
Tim Otten [Mon, 20 May 2013 04:53:08 +0000 (21:53 -0700)]
Merge pull request #801 from totten/migrate-tweaks
CRM-12621 - Migrate tweaks
Tim Otten [Mon, 20 May 2013 04:35:50 +0000 (00:35 -0400)]
CRM_Utils_Migrate_Import - Extract runXmlElement() for use with dynamic XML. Add docs.
Tim Otten [Mon, 20 May 2013 03:32:13 +0000 (23:32 -0400)]
CRM_Utils_Migrate_Import - Fix static warning
Tim Otten [Mon, 20 May 2013 01:57:53 +0000 (21:57 -0400)]
CRM_Utils_Migrate_Export - Allow cherry-picking of CustomGroups for export
Kurund Jalmi [Sun, 19 May 2013 23:51:17 +0000 (16:51 -0700)]
Merge pull request #798 from pradpnayak/CRM-12510
-- fixed for CRM-12510
Pradeep Nayak [Sun, 19 May 2013 19:42:39 +0000 (01:12 +0530)]
-- fixed for CRM-12510
----------------------------------------
* CRM-12510: Copy Contribution Page does not copy associated quick-config price set
http://issues.civicrm.org/jira/browse/CRM-12510
Kurund Jalmi [Sun, 19 May 2013 05:52:36 +0000 (22:52 -0700)]
Merge pull request #796 from kurund/CRM-12589
reverted bad merge
cb9721555f0f1f044ca688c66461ab59b69bbe41
Kurund Jalmi [Sun, 19 May 2013 05:50:52 +0000 (01:50 -0400)]
Kurund Jalmi [Sun, 19 May 2013 05:32:33 +0000 (22:32 -0700)]
Merge pull request #794 from colemanw/tinymce
Possible fix for CRM-12589
Coleman Watts [Sat, 18 May 2013 23:26:40 +0000 (18:26 -0500)]
Fix for contributions only CRM-12610
Coleman Watts [Sat, 18 May 2013 22:55:47 +0000 (17:55 -0500)]
Possible fix for CRM-12589
Kurund Jalmi [Sat, 18 May 2013 13:47:13 +0000 (06:47 -0700)]
Merge pull request #789 from davecivicrm/CRM-12643
CRM-12643 Add instance of renamed Contribuition Aggregate Report to meta...
dlobo [Sat, 18 May 2013 00:53:49 +0000 (17:53 -0700)]
Merge pull request #790 from JoeMurray/CRM-12657
fix crmaccordions to crmAccordions
Joe Murray [Sat, 18 May 2013 00:47:45 +0000 (20:47 -0400)]
fix crmaccordions to crmAccordions
----------------------------------------
* CRM-12657: fix crmAccordions in Grant Search
http://issues.civicrm.org/jira/browse/CRM-12657
Dave Greenberg [Fri, 17 May 2013 23:26:41 +0000 (16:26 -0700)]
CRM-12643 Add instance of renamed Contribuition Aggregate Report to meta-data, renamed report template, rebuilt civicrm_generated.mysql.
----------------------------------------
* CRM-12643: Add instance of "Contribution Aggregate by Relationship" report to new installs
http://issues.civicrm.org/jira/browse/CRM-12643
Kurund Jalmi [Fri, 17 May 2013 19:17:30 +0000 (12:17 -0700)]
Merge pull request #786 from davecivicrm/CRM-12654
CRM-12654 unset invalid and non-relevant contribution statuses in Batch ...
Dave Greenberg [Fri, 17 May 2013 17:43:49 +0000 (10:43 -0700)]
CRM-12654 unset invalid and non-relevant contribution statuses in Batch Entry status dropdown. Array now matches New Contribution form.
----------------------------------------
* CRM-12654: Invalid contribution statuses are include in Batch Data Entry dropdown
http://issues.civicrm.org/jira/browse/CRM-12654
Kurund Jalmi [Fri, 17 May 2013 17:35:33 +0000 (10:35 -0700)]
Merge pull request #783 from dlobo/CRM-12648
CRM 12648
Kurund Jalmi [Fri, 17 May 2013 17:15:28 +0000 (10:15 -0700)]
Merge pull request #785 from yashodha/4.3
CRM-12583
yashodha [Fri, 17 May 2013 14:56:20 +0000 (20:26 +0530)]
CRM-12583
Kurund Jalmi [Fri, 17 May 2013 03:49:49 +0000 (20:49 -0700)]
Merge pull request #781 from totten/decouple-fix-exporter
CRM-12647 - Fix XML encoding; decouple exporter and XML encoder
Donald A. Lobo [Fri, 17 May 2013 01:10:37 +0000 (18:10 -0700)]
CRM-12648
----------------------------------------
* CRM-12648: CiviCRM mailing (or other scheduled jobs) do not seem to fire when triggered via wget
http://issues.civicrm.org/jira/browse/CRM-12648
Donald A. Lobo [Fri, 17 May 2013 00:55:52 +0000 (17:55 -0700)]
CRM-12648
----------------------------------------
* CRM-12648: CiviCRM mailing (or other scheduled jobs) do not seem to fire when triggered via wget
http://issues.civicrm.org/jira/browse/CRM-12648
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
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
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
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
projects / civicrm-core.git / log