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
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
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
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)
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
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
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
Donald A. Lobo [Wed, 22 May 2013 19:21:38 +0000 (12:21 -0700)]
CRM-12197 - add skip IDS check permission
----------------------------------------
* CRM-12197: Overactive IDS causes test failure
http://issues.civicrm.org/jira/browse/CRM-12197
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
dlobo [Wed, 22 May 2013 16:09:11 +0000 (09:09 -0700)]
Merge pull request #830 from dlobo/CRM-10935
CRM-10935 - fix typo in xml
Donald A. Lobo [Wed, 22 May 2013 16:07:32 +0000 (09:07 -0700)]
CRM-10935
----------------------------------------
* CRM-10935: Create new Core Permission - CiviCRM: Access own Contact or both "CiviCRM: View own Contact" and "CiviCRM: Edit own Contact"
http://issues.civicrm.org/jira/browse/CRM-10935
Kurund Jalmi [Wed, 22 May 2013 16:04:10 +0000 (09:04 -0700)]
Merge pull request #829 from dlobo/CRM-10935
CRM-10935
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 [Wed, 22 May 2013 15:44:08 +0000 (08:44 -0700)]
Merge pull request #827 from lcdservices/CRM12417
CRM-12417 format activity date during import
Brian Shaughnessy [Wed, 22 May 2013 14:07:14 +0000 (10:07 -0400)]
CRM-12417 format activity date during import
deepak-srivastava [Wed, 22 May 2013 13:33:56 +0000 (06:33 -0700)]
Merge pull request #826 from deepak-srivastava/hr
notice fixes towards CRM-12623
Deepak Srivastava [Wed, 22 May 2013 13:25:24 +0000 (18:55 +0530)]
notice fixes towards CRM-12623
----------------------------------------
* CRM-12623: Create CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12623
Donald A. Lobo [Tue, 21 May 2013 23:03:14 +0000 (16:03 -0700)]
CRM-10935 - tweak so we dont display other tabs in summary if no access CiviCRM
----------------------------------------
* CRM-10935: Create new Core Permission - CiviCRM: Access own Contact or both "CiviCRM: View own Contact" and "CiviCRM: Edit own Contact"
http://issues.civicrm.org/jira/browse/CRM-10935
Donald A. Lobo [Tue, 21 May 2013 22:45:49 +0000 (15:45 -0700)]
CRM-10935
----------------------------------------
* CRM-10935: Create new Core Permission - CiviCRM: Access own Contact or both "CiviCRM: View own Contact" and "CiviCRM: Edit own Contact"
http://issues.civicrm.org/jira/browse/CRM-10935
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 19:56:15 +0000 (12:56 -0700)]
Merge pull request #819 from mlutfy/mkdrupaltest3
Always symlink to civicrm, since source directory may have another name, ex: civicrm43
Kurund Jalmi [Tue, 21 May 2013 18:40:33 +0000 (14:40 -0400)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-21-13-15-18
Conflicts:
.gitignore
CRM/Financial/Form/FinancialAccount.php
CRM/Financial/Form/FinancialTypeAccount.php
CRM/Grant/Controller/PaymentSearch.php
CRM/Grant/Page/GrantProgram.php
CRM/Grant/Page/Payment.php
CRM/Grant/Selector/PaymentSearch.php
CRM/Report/Form/Event/ParticipantListCount.php
CRM/Utils/Migrate/Export.php
CRM/Utils/Migrate/ExportJSON.php
sql/civicrm_generated.mysql
templates/CRM/Admin/Form/Preferences/Display.tpl
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
templates/CRM/Grant/Form/Search.tpl
Mathieu Lutfy [Tue, 21 May 2013 14:25:02 +0000 (10:25 -0400)]
Always symlink to civicrm, since source directory may have another name, ex: civicrm43
deepak-srivastava [Tue, 21 May 2013 13:34:14 +0000 (06:34 -0700)]
Merge pull request #818 from mlutfy/mkdrupaltest2
mk-drupal-test-site: added help text, option to restore .sql dump, and do not send welcome e-mail
Mathieu Lutfy [Tue, 21 May 2013 13:29:02 +0000 (09:29 -0400)]
Do not send the drupal welcome e-mail on site-install
Mathieu Lutfy [Tue, 21 May 2013 13:28:39 +0000 (09:28 -0400)]
Added help function, a bit more error checking, and allow to restore a .sql to be used on the test site.
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:21:17 +0000 (20:21 -0700)]
Merge pull request #803 from pratik-joshi/CRM-11310
fix for CRM-11310 : applied patch
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
projects / civicrm-core.git / log