dlobo [Sun, 26 May 2013 19:43:10 +0000 (12:43 -0700)]
Merge pull request #860 from yashodha/CRM-12688
CRM-12688
Tim Otten [Sun, 26 May 2013 17:01:24 +0000 (10:01 -0700)]
Merge pull request #863 from eileenmcnaughton/CRM-11320
Crm 11320 - make api stable for 4.3
eileen [Wed, 15 May 2013 21:35:32 +0000 (09:35 +1200)]
CRM-11320 fix error in test
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
Conflicts:
api/v3/Contribution.php
yashodha [Sun, 26 May 2013 05:53:11 +0000 (11:23 +0530)]
CRM-12688
dlobo [Sun, 26 May 2013 00:52:33 +0000 (17:52 -0700)]
Merge pull request #862 from dlobo/CRM-10682
CRM-10692 - commit andrew hunt patch. rework in next commit
Donald A. Lobo [Sun, 26 May 2013 00:51:37 +0000 (17:51 -0700)]
CRM-10692 - commit andrew hunt patch. rework in next commit
----------------------------------------
* CRM-10692: unable to override /CRM/Core/Utils.php from extension
http://issues.civicrm.org/jira/browse/CRM-10692
yashodha [Sat, 25 May 2013 02:08:37 +0000 (07:38 +0530)]
CRM-12688
dlobo [Fri, 24 May 2013 20:57:47 +0000 (13:57 -0700)]
Merge pull request #856 from dlobo/CRM-12594
CRM-12594 - Fix typo in warning message
Donald A. Lobo [Fri, 24 May 2013 20:57:01 +0000 (13:57 -0700)]
CRM-12594
----------------------------------------
* CRM-12594: Wrong texts in UI
http://issues.civicrm.org/jira/browse/CRM-12594
Donald A. Lobo [Fri, 24 May 2013 20:54:39 +0000 (13:54 -0700)]
CRM-12594
----------------------------------------
* CRM-12594: Wrong texts in UI
http://issues.civicrm.org/jira/browse/CRM-12594
Dave Greenberg [Fri, 24 May 2013 16:33:30 +0000 (09:33 -0700)]
Merge pull request #854 from yashodha/CRM-12688
CRM-12688
Yash - the help needs to be clearer, since I "think" you said the behavior is that reminders are limited to participants who have the selected status(es) AND meet the Limit Recipients criteria. Maybe something like "Only send reminders to participants with the status(es) selected above AND who match this criteria. If you select Manual Recipients - only those people will receive the reminder (AND only if they are ALSO participants with the selected status)."
yashodha [Fri, 24 May 2013 10:55:19 +0000 (16:25 +0530)]
CRM-12688
yashodha [Fri, 24 May 2013 10:21:17 +0000 (15:51 +0530)]
CRM-12688
dlobo [Thu, 23 May 2013 22:27:18 +0000 (15:27 -0700)]
Merge pull request #850 from dlobo/CRM-12685
CRM-12685 - Fix Pakistan state names
Donald A. Lobo [Thu, 23 May 2013 22:25:54 +0000 (15:25 -0700)]
CRM-12685 - Fix Pakistan state names
----------------------------------------
* CRM-12685: Incorrect list for States in Pakistan
http://issues.civicrm.org/jira/browse/CRM-12685
Dave Greenberg [Thu, 23 May 2013 21:15:52 +0000 (14:15 -0700)]
Merge pull request #848 from davecivicrm/CRM-12655-generated
CRM-12655 removed inline escape chars for single quotes. Rebuilt civicrm...
Dave Greenberg [Thu, 23 May 2013 21:10:51 +0000 (14:10 -0700)]
CRM-12655 removed inline escape chars for single quotes. Rebuilt civicrm_generated.mysql.
----------------------------------------
* CRM-12655: Translatable report instance titles
http://issues.civicrm.org/jira/browse/CRM-12655
Kurund Jalmi [Thu, 23 May 2013 20:28:27 +0000 (13:28 -0700)]
Merge pull request #843 from pradpnayak/CRM-12680
-- fixed for CRM-12680, line items were not created properly when trying...
Kurund Jalmi [Thu, 23 May 2013 20:28:00 +0000 (13:28 -0700)]
Merge pull request #846 from pradpnayak/CRM-12498
--reverting code since regression issue faced on online contribution page...
Pradeep Nayak [Thu, 23 May 2013 19:47:10 +0000 (01:17 +0530)]
--everting code since regression issue faced on online contribution page for payment processor, CRM-12498
----------------------------------------
* CRM-12498: API contribution.create/update DB Error: constraint violation
http://issues.civicrm.org/jira/browse/CRM-12498
Dave Greenberg [Thu, 23 May 2013 19:34:26 +0000 (12:34 -0700)]
Merge pull request #810 from hbergin/CRM-12655
CRM-12655: Add translation wrappers to report instance title and description.
Also need to rebuild generated.mysql and remove \ inline ecsaping of single quotes - I will add this as a separate PR.
dlobo [Thu, 23 May 2013 17:15:12 +0000 (10:15 -0700)]
Merge pull request #838 from colemanw/CRM-10573
Restore timezone handling CRM-10573
dlobo [Thu, 23 May 2013 17:03:44 +0000 (10:03 -0700)]
Merge pull request #840 from colemanw/is_test
Fix searching for test records CRM-12610
Pradeep Nayak [Thu, 23 May 2013 14:19:12 +0000 (19:49 +0530)]
-- fixed for CRM-12680, line items were not created properly when trying to submit credit card contribution
----------------------------------------
* CRM-12680: Contribution of multiple financial types in single field creates unbalanced transaction
http://issues.civicrm.org/jira/browse/CRM-12680
Kurund Jalmi [Thu, 23 May 2013 13:29:42 +0000 (06:29 -0700)]
Merge pull request #842 from pratik-joshi/api-test-fixes
minor api test fixes WRT https://test.civicrm.org/job/CiviCRM-4.3-git/LABEL=...
Pratik Joshi [Thu, 23 May 2013 09:51:13 +0000 (15:21 +0530)]
minor test fixes WRT https://test.civicrm.org/job/CiviCRM-4.3-git/LABEL=debian6,SUITE=api_v3_AllTests/lastCompletedBuild/testReport/ failure result
Kurund Jalmi [Thu, 23 May 2013 04:37:01 +0000 (21:37 -0700)]
Merge pull request #834 from totten/hasReachedMaxLimit-warning
CRM_Core_BAO_CustomGroup::hasReachedMaxLimit - Fix warning
Coleman Watts [Thu, 23 May 2013 03:10:11 +0000 (22:10 -0500)]
Fix the same thing in 4 other places CRM-12610
Coleman Watts [Thu, 23 May 2013 02:43:34 +0000 (21:43 -0500)]
Fix assumption about test records CRM-12610
colemanw [Thu, 23 May 2013 02:05:15 +0000 (19:05 -0700)]
Merge pull request #839 from colemanw/CRM-12670
Fix image CRM-12670
Coleman Watts [Thu, 23 May 2013 02:03:13 +0000 (21:03 -0500)]
Fix image CRM-12670
Coleman Watts [Thu, 23 May 2013 01:12:56 +0000 (20:12 -0500)]
Restore timezone handling CRM-10573
Tim Otten [Wed, 22 May 2013 20:24:05 +0000 (16:24 -0400)]
CRM_Core_BAO_CustomGroup::hasReachedMaxLimit - Fix warning
dlobo [Wed, 22 May 2013 18:32:57 +0000 (11:32 -0700)]
Merge pull request #832 from dlobo/MiscFixes
Suppress WP Access Control link from admin pages in all CMS
Donald A. Lobo [Wed, 22 May 2013 18:31:58 +0000 (11:31 -0700)]
Suppress WP Access Control link from admin pages in all CMS
dlobo [Wed, 22 May 2013 18:21:33 +0000 (11:21 -0700)]
Merge pull request #831 from dlobo/CRM-12594
CRM-12594 - Fix references to menu items
Kurund Jalmi [Wed, 22 May 2013 16:11:51 +0000 (09:11 -0700)]
Merge pull request #828 from dlobo/CRM-12678
CRM-12678
Donald A. Lobo [Wed, 22 May 2013 15:53:55 +0000 (08:53 -0700)]
CRM-12678
----------------------------------------
* CRM-12678: PseudoConstant.php on line 122 returns value not reference
http://issues.civicrm.org/jira/browse/CRM-12678
Kurund Jalmi [Tue, 21 May 2013 21:18:09 +0000 (14:18 -0700)]
Merge pull request #821 from dlobo/CRM-12674
CRM-12674
Kurund Jalmi [Tue, 21 May 2013 21:12:21 +0000 (17:12 -0400)]
CRM-12466, layout fixes
Donald A. Lobo [Tue, 21 May 2013 21:10:21 +0000 (14:10 -0700)]
CRM-12674
----------------------------------------
* CRM-12674: WordPress updateConfigBackend is confused about URL
http://issues.civicrm.org/jira/browse/CRM-12674
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
helen [Mon, 20 May 2013 17:10:08 +0000 (12:10 -0500)]
Add translation wrappers to report instance title and description columns.
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
projects / civicrm-core.git / log