Kurund Jalmi [Tue, 28 May 2013 19:06:50 +0000 (12:06 -0700)]
Merge pull request #878 from pradpnayak/CRM-12470-masterFixes
-- CRM fixes for CRM-12470
Pradeep Nayak [Tue, 28 May 2013 17:39:59 +0000 (23:09 +0530)]
-- CRM fixes for CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
* CRM-12470-masterFixes:
http://issues.civicrm.org/jira/browse/CRM-12470-masterFixes
Kurund Jalmi [Tue, 28 May 2013 11:51:57 +0000 (04:51 -0700)]
Merge pull request #875 from yashodha/4.4
CRM-12697
yashodha [Tue, 28 May 2013 11:29:52 +0000 (16:59 +0530)]
CRM-12697
Kurund Jalmi [Tue, 28 May 2013 08:44:26 +0000 (14:14 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-28-14-04-12
Conflicts:
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
sql/civicrm_generated.mysql
Kurund Jalmi [Tue, 28 May 2013 07:41:27 +0000 (00:41 -0700)]
Merge pull request #868 from kurund/CRM-12681
worked on CRM-12681, fixed display of copy checkbox when billing block i...
Kurund Jalmi [Tue, 28 May 2013 07:41:10 +0000 (00:41 -0700)]
Merge pull request #869 from totten/cms-perms
CRM-12499 - Allow CMS-specific permission expressions
Kurund Jalmi [Tue, 28 May 2013 07:40:36 +0000 (00:40 -0700)]
Merge pull request #870 from colemanw/import
Rename CRM_Import -> CRM_Contact_Import CRM-11254
Kurund Jalmi [Tue, 28 May 2013 07:36:39 +0000 (00:36 -0700)]
Merge pull request #871 from colemanw/versionAlert
Add versionAlert setting CRM-12701
Kurund Jalmi [Tue, 28 May 2013 07:35:16 +0000 (00:35 -0700)]
Merge pull request #872 from eileenmcnaughton/master
a bit more formatting / whitespace
Kurund Jalmi [Tue, 28 May 2013 07:30:41 +0000 (00:30 -0700)]
Merge pull request #873 from ravishnair/CRM-12410QAfix
-- CRM-12410 Minor QA fix
Kurund Jalmi [Tue, 28 May 2013 07:29:03 +0000 (00:29 -0700)]
Merge pull request #874 from kurund/CRM-12705
applied patch for CRM-12705
Kurund Jalmi [Tue, 28 May 2013 07:28:30 +0000 (12:58 +0530)]
applied patch for CRM-12705
Ravish Nair [Tue, 28 May 2013 05:58:59 +0000 (11:28 +0530)]
-- CRM-12410 Minor QA fix
eileen [Tue, 28 May 2013 03:24:29 +0000 (15:24 +1200)]
a few more trailing space removals, //ids removals, tabs
Coleman Watts [Tue, 28 May 2013 03:06:47 +0000 (20:06 -0700)]
Add versionAlert setting CRM-12701
Coleman Watts [Tue, 28 May 2013 01:57:37 +0000 (18:57 -0700)]
Rename CRM_Import -> CRM_Contact_Import CRM-11254
----------------------------------------
* CRM-11254: Create parent class for import
http://issues.civicrm.org/jira/browse/CRM-11254
----------------------------------------
* CRM-11254:
http://issues.civicrm.org/jira/browse/CRM-11254
* CRM-11254::
http://issues.civicrm.org/jira/browse/CRM-11254:
Kurund Jalmi [Mon, 27 May 2013 15:14:39 +0000 (20:44 +0530)]
worked on CRM-12681, fixed display of copy checkbox when billing block is build without ajax
Kurund Jalmi [Mon, 27 May 2013 11:53:15 +0000 (04:53 -0700)]
Merge pull request #867 from pradpnayak/CRM-12665
-- removed cruft data for grant, worked on CRM-12665
Pradeep Nayak [Mon, 27 May 2013 10:12:28 +0000 (15:42 +0530)]
-- removed cruft data for grant, worked on CRM-12665
----------------------------------------
* CRM-12665: Remove unwanted files in Grant
http://issues.civicrm.org/jira/browse/CRM-12665
Kurund Jalmi [Mon, 27 May 2013 06:21:52 +0000 (23:21 -0700)]
Merge pull request #866 from kurund/CRM-12673
applied patch for CRM-12673
Kurund Jalmi [Mon, 27 May 2013 05:47:14 +0000 (11:17 +0530)]
applied patch for CRM-12673
dlobo [Sun, 26 May 2013 19:54:56 +0000 (12:54 -0700)]
Merge pull request #851 from eileenmcnaughton/CRM-12686
CRM-12686 add ability to set specific date as a default in Reports
dlobo [Sun, 26 May 2013 19:53:56 +0000 (12:53 -0700)]
Merge pull request #852 from eileenmcnaughton/CRM-12687
CRM-12687 make DAO field optional when defining report columns
dlobo [Sun, 26 May 2013 19:52:57 +0000 (12:52 -0700)]
Merge pull request #864 from eileenmcnaughton/CRM-12160
Crm 12160 -fix navigation upgrade errors
dlobo [Sun, 26 May 2013 19:50:13 +0000 (12:50 -0700)]
Merge pull request #857 from colemanw/is_test
Automatically filter test records on forced searches CRM-12610
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
Tim Otten [Sun, 26 May 2013 16:57:51 +0000 (09:57 -0700)]
Merge pull request #865 from eileenmcnaughton/master
remove tabs
eileen [Sun, 26 May 2013 11:04:08 +0000 (23:04 +1200)]
remove tabs (whitespace only)
eileen [Sun, 26 May 2013 10:37:54 +0000 (22:37 +1200)]
CRM-12160 menu fixes for 4.3
eileen [Wed, 20 Mar 2013 00:36:09 +0000 (13:36 +1300)]
CRM-12160 Fix domain on navigation inserts
Conflicts:
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
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
Tim Otten [Sat, 25 May 2013 05:12:58 +0000 (01:12 -0400)]
CRM-12499 - Allow users with 'access user profiles' access to userRecordUrl
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
Tim Otten [Sat, 25 May 2013 04:06:05 +0000 (00:06 -0400)]
CRM-12499 - CRM_Core_Permission_Joomla - Add translation
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
Tim Otten [Sat, 25 May 2013 04:01:36 +0000 (00:01 -0400)]
CRM-12499 - CRM_Core_Permission_Base::translatePermission
Add helper function translatePermission which translates an expression like
"administer CiviCRM", "cms:view user account", or "drupal:access user
profiles" into something understood by native CMS.
Use translatePermission as part of check() in D6, D7, WP.
Use placeholder permssions ALWAYS_ALLOW_PERMISSION and
ALWAYS_DENY_PERMISSION for select corner cases.
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
Tim Otten [Sat, 25 May 2013 03:57:12 +0000 (23:57 -0400)]
CRM-12499 - Add CRM_Utils_String::parsePrefix
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
yashodha [Sat, 25 May 2013 02:08:37 +0000 (07:38 +0530)]
CRM-12688
Coleman Watts [Fri, 24 May 2013 22:58:42 +0000 (18:58 -0400)]
Automatically filter test records on forced searches CRM-12610
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
Kurund Jalmi [Fri, 24 May 2013 18:51:38 +0000 (11:51 -0700)]
Merge pull request #855 from pratik-joshi/CRM-12524-fix
Crm 12524 fix
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)."
Pratik Joshi [Fri, 24 May 2013 12:29:15 +0000 (17:59 +0530)]
CRM-12524-fix : handled custom fields carry forward for recurring contributions
Pratik Joshi [Fri, 24 May 2013 12:24:47 +0000 (17:54 +0530)]
CRM-12524-fix : handled carry forward of campaign id, honor contact id, honor type fields for recurring contributions
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
Kurund Jalmi [Fri, 24 May 2013 06:43:24 +0000 (02:43 -0400)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-24-02-32-04
Conflicts:
CRM/Financial/Form/FinancialTypeAccount.php
sql/civicrm_generated.mysql
xml/templates/civicrm_navigation.tpl
Kurund Jalmi [Fri, 24 May 2013 06:07:50 +0000 (23:07 -0700)]
Merge pull request #847 from eileenmcnaughton/master
this file seems to have 2 version with different mixes of case in git - remove one!
Kurund Jalmi [Fri, 24 May 2013 05:56:00 +0000 (22:56 -0700)]
Merge pull request #849 from eileenmcnaughton/CRM-11356
CRM-11356 fix wording on 'greater' relative date and introduce 'current'...
Kurund Jalmi [Fri, 24 May 2013 04:45:23 +0000 (21:45 -0700)]
Merge pull request #853 from kurund/CRM-12425-fixes
CRM-12425, merged #792
Kurund Jalmi [Fri, 24 May 2013 04:44:12 +0000 (00:44 -0400)]
CRM-12425, merged #792
eileen [Fri, 24 May 2013 02:36:07 +0000 (14:36 +1200)]
CRM-12687 make DAO field optional when defining report columns
eileen [Thu, 23 May 2013 22:52:16 +0000 (10:52 +1200)]
CRM-12686 add ability to set specific date as a default
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...
eileen [Thu, 23 May 2013 21:15:50 +0000 (09:15 +1200)]
CRM-11356 fix wording on 'greater' relative date and introduce 'current' - ie. Current YTD
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
eileen [Thu, 23 May 2013 20:24:45 +0000 (08:24 +1200)]
remove example file with case sensitive filename issue
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:17:07 +0000 (10:17 -0700)]
Merge pull request #799 from eileenmcnaughton/CRM-12659
Crm 12659 add phone fields to pledge detail
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
Kurund Jalmi [Thu, 23 May 2013 16:48:40 +0000 (09:48 -0700)]
Merge pull request #844 from dlobo/CRM-12495
CRM-12495 - cleanup civicrm_task / task_status / project
Donald A. Lobo [Thu, 23 May 2013 16:43:05 +0000 (09:43 -0700)]
CRM-12495 - cleanup civicrm_task / task_status / project
----------------------------------------
* CRM-12495: Vestiges of "Tasks" features remain in tables `civicrm_task` and `civicrm_task_status`, and in a few classes
http://issues.civicrm.org/jira/browse/CRM-12495
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
Tim Otten [Thu, 23 May 2013 04:45:22 +0000 (21:45 -0700)]
Merge pull request #841 from totten/vendors-extdir-fix
CRM-12683 - Fix URL path for the "vendor" directory
Tim Otten [Thu, 23 May 2013 04:44:22 +0000 (00:44 -0400)]
CRM-12683 - Fix URL path for the "vendor" directory
----------------------------------------
* CRM-12683: Load extensions in "vendor" directory
http://issues.civicrm.org/jira/browse/CRM-12683
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
Kurund Jalmi [Thu, 23 May 2013 04:36:43 +0000 (21:36 -0700)]
Merge pull request #837 from totten/vendors-extdir
CRM-12683 - Load extensions in "vendor" directory
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 [Thu, 23 May 2013 01:06:48 +0000 (21:06 -0400)]
CRM-12683 - Fix NPE when an extension container disappears
----------------------------------------
* CRM-12683: Load extensions in "vendor" directory
http://issues.civicrm.org/jira/browse/CRM-12683
Tim Otten [Thu, 23 May 2013 01:06:10 +0000 (21:06 -0400)]
CRM-12683 - Load extensions in "vendor" directory
----------------------------------------
* CRM-12683: Load extensions in "vendor" directory
http://issues.civicrm.org/jira/browse/CRM-12683
Kurund Jalmi [Wed, 22 May 2013 23:47:28 +0000 (16:47 -0700)]
Merge pull request #594 from colemanw/v2api
Remove ApiV2 and other cruft
Coleman Watts [Wed, 22 May 2013 22:41:07 +0000 (17:41 -0500)]
Remove NYSS module CRM-9794
----------------------------------------
* CRM-9794:
http://issues.civicrm.org/jira/browse/CRM-9794
Coleman Watts [Wed, 22 May 2013 22:40:07 +0000 (17:40 -0500)]
Remove ICIRR module CRM-9794
----------------------------------------
* CRM-9794:
http://issues.civicrm.org/jira/browse/CRM-9794
Coleman Watts [Wed, 22 May 2013 22:38:44 +0000 (17:38 -0500)]
Remove giftaid CRM-9794
----------------------------------------
* CRM-9794:
http://issues.civicrm.org/jira/browse/CRM-9794
Coleman Watts [Wed, 1 May 2013 00:12:18 +0000 (17:12 -0700)]
Remove van module CRM-9794
----------------------------------------
* CRM-9794: Remove API v2
http://issues.civicrm.org/jira/browse/CRM-9794
Coleman Watts [Wed, 1 May 2013 00:11:42 +0000 (17:11 -0700)]
Remove v2 api CRM-9794
----------------------------------------
* CRM-9794: Remove API v2
http://issues.civicrm.org/jira/browse/CRM-9794
Tim Otten [Wed, 22 May 2013 21:39:49 +0000 (14:39 -0700)]
Merge pull request #836 from mlutfy/mkdrupaltest4
Remove patch to disable mails from PHP/drush
Mathieu Lutfy [Wed, 22 May 2013 21:29:16 +0000 (17:29 -0400)]
Remove patch to disable mails from PHP/drush, instead rely that the host will have a php.ini directive disabling sendmail. See: https://test.civicrm.org/job/CiviCRM-master-git/108/LABEL=debian6,SUITE=api_v3_AllTests/
dlobo [Wed, 22 May 2013 21:13:30 +0000 (14:13 -0700)]
Merge pull request #835 from dlobo/CRM-12197
CRM-12197 - fix notice
Donald A. Lobo [Wed, 22 May 2013 21:12:55 +0000 (14:12 -0700)]
CRM-12197 - fix notice
----------------------------------------
* CRM-12197: Overactive IDS causes test failure
http://issues.civicrm.org/jira/browse/CRM-12197
Tim Otten [Wed, 22 May 2013 20:24:05 +0000 (16:24 -0400)]
CRM_Core_BAO_CustomGroup::hasReachedMaxLimit - Fix warning
colemanw [Wed, 22 May 2013 20:15:18 +0000 (13:15 -0700)]
Merge pull request #833 from dlobo/CRM-12197
CRM-12197 - add skip IDS check permission
projects / civicrm-core.git / log