Dave Greenberg [Fri, 15 Mar 2013 19:24:32 +0000 (12:24 -0700)]
CRM-12119 replaced demo_processor with new dummy_processor file which creates dummy (test) type payment processors and sets sample event and contribution pages to use those. Also links dummy processors to appropriate financial account.
Kurund Jalmi [Fri, 15 Mar 2013 10:14:44 +0000 (03:14 -0700)]
Merge pull request #155 from deepak-srivastava/master
CRM-12119, added demo processor to generated data
Deepak Srivastava [Fri, 15 Mar 2013 09:28:54 +0000 (14:58 +0530)]
adding demo processor to generated data
Kurund Jalmi [Fri, 15 Mar 2013 05:38:52 +0000 (22:38 -0700)]
Merge pull request #152 from davecivicrm/CRM-12013
Fix notice due to missing param in foreach loop on lineItem array in ParticipantView::preProcess().
Kurund Jalmi [Fri, 15 Mar 2013 05:38:30 +0000 (22:38 -0700)]
Merge pull request #153 from twomice/CRM-12013
Fix CRM-12013: Fixed PHP warnings.
Kurund Jalmi [Fri, 15 Mar 2013 05:38:11 +0000 (22:38 -0700)]
Merge pull request #154 from colemanw/CRM-12120
Crm 12120
Coleman Watts [Fri, 15 Mar 2013 04:42:34 +0000 (21:42 -0700)]
Alter quicksearch to redirect to advanced search CRM-12120
Allen Shaw [Fri, 15 Mar 2013 03:36:43 +0000 (22:36 -0500)]
Fix CRM-12013: Fixed PHP warnings.
Coleman Watts [Fri, 15 Mar 2013 03:16:16 +0000 (20:16 -0700)]
Whitespace cleanup
Dave Greenberg [Thu, 14 Mar 2013 22:03:58 +0000 (15:03 -0700)]
Fix notice due to missing param in array loop.
colemanw [Thu, 14 Mar 2013 19:09:44 +0000 (12:09 -0700)]
Merge pull request #151 from pradpnayak/CRM-12065
--upgrade script for CRM-12065
Pradeep Nayak [Thu, 14 Mar 2013 19:01:47 +0000 (00:31 +0530)]
--upgrade script for CRM-12065
Tim Otten [Thu, 14 Mar 2013 17:50:34 +0000 (10:50 -0700)]
Merge pull request #142 from colemanw/CRM-12029b
Javascript improvements
colemanw [Thu, 14 Mar 2013 16:54:12 +0000 (09:54 -0700)]
Merge pull request #147 from deepak-srivastava/crm
towards webtest fixes
colemanw [Thu, 14 Mar 2013 16:19:36 +0000 (09:19 -0700)]
Merge pull request #149 from pratik-joshi/more-webtest-fixes
minor webtest fix
colemanw [Thu, 14 Mar 2013 16:18:32 +0000 (09:18 -0700)]
Merge pull request #150 from yashodha/webtest-fixes
webtest fixes
colemanw [Thu, 14 Mar 2013 16:12:51 +0000 (09:12 -0700)]
Merge pull request #146 from pratik-joshi/webtest-fixes
minor webtest fix for error : 'civicrm-footer' element not found
colemanw [Thu, 14 Mar 2013 16:07:58 +0000 (09:07 -0700)]
Merge pull request #148 from tttp/bugfix
CRM-12102 Redirect from civicrm/ajax/doc to civicrm/api/explorer
Pratik Joshi [Thu, 14 Mar 2013 14:08:02 +0000 (19:38 +0530)]
more test fix
Pratik Joshi [Thu, 14 Mar 2013 13:39:54 +0000 (19:09 +0530)]
more test fixes
yashodha [Thu, 14 Mar 2013 13:39:21 +0000 (19:09 +0530)]
webtest fixes
Pratik Joshi [Thu, 14 Mar 2013 13:11:42 +0000 (18:41 +0530)]
minor webtest fix
Xavier Dutoit [Thu, 14 Mar 2013 12:44:20 +0000 (13:44 +0100)]
CRM-12102 Redirect from civicrm/ajax/doc to civicrm/api/explorer
Pratik Joshi [Thu, 14 Mar 2013 12:19:01 +0000 (17:49 +0530)]
webtest fix
Deepak Srivastava [Thu, 14 Mar 2013 12:11:07 +0000 (17:41 +0530)]
towards webtest fixes
Pratik Joshi [Thu, 14 Mar 2013 11:19:38 +0000 (16:49 +0530)]
minor test fix
Deepak Srivastava [Thu, 14 Mar 2013 11:01:19 +0000 (16:31 +0530)]
towards webtest fixes
Pratik Joshi [Thu, 14 Mar 2013 10:58:37 +0000 (16:28 +0530)]
minor webtest fix for error : 'civicrm-footer' element not found
Tim Otten [Thu, 14 Mar 2013 10:14:35 +0000 (03:14 -0700)]
Merge pull request #145 from pratik-joshi/CRM-12062-minor-bug-fix
CRM-12062 : minor bug found by failing test case WebTest_Event_AddEventTest::testAddPaidEventNoTemplate
Pratik Joshi [Thu, 14 Mar 2013 08:46:08 +0000 (14:16 +0530)]
CRM-12062 : minor bug found by failing test case WebTest_Event_AddEventTest::testAddPaidEventNoTemplate
colemanw [Thu, 14 Mar 2013 00:59:38 +0000 (17:59 -0700)]
Merge pull request #141 from pradpnayak/CRM-12065
-- fixed formatting, static errors and replaced contribution_type to fin...
colemanw [Thu, 14 Mar 2013 00:07:50 +0000 (17:07 -0700)]
Merge pull request #143 from dlobo/CRM-11281
CRM-11281
Donald A. Lobo [Wed, 13 Mar 2013 23:32:48 +0000 (16:32 -0700)]
CRM-11281
Donald A. Lobo [Wed, 13 Mar 2013 21:17:10 +0000 (14:17 -0700)]
CRM-11281
Coleman Watts [Wed, 13 Mar 2013 21:14:56 +0000 (14:14 -0700)]
Improve convenience/flexibility of CRM.confirm
Pradeep Nayak [Wed, 13 Mar 2013 19:14:54 +0000 (00:44 +0530)]
-- fixed formatting, static errors and replaced contribution_type to financial_type
Coleman Watts [Wed, 13 Mar 2013 19:04:15 +0000 (12:04 -0700)]
Introduce 'context' param to CRM.api CRM-12029
dlobo [Wed, 13 Mar 2013 18:22:19 +0000 (11:22 -0700)]
Merge pull request #139 from lcdservices/master
CRM-11203 authenticate user when running jobs via cli
Brian Shaughnessy [Wed, 13 Mar 2013 18:20:06 +0000 (14:20 -0400)]
CRM-11203 update Joomla setUserSession to call parent method
Brian Shaughnessy [Wed, 13 Mar 2013 18:14:07 +0000 (14:14 -0400)]
CRM-11203 move setUserSession from Drupal to Base so we allow optional override on per CMS basis
colemanw [Wed, 13 Mar 2013 18:07:05 +0000 (11:07 -0700)]
Merge pull request #140 from dlobo/CRM-12111
CRM-12111
Donald A. Lobo [Wed, 13 Mar 2013 17:38:36 +0000 (10:38 -0700)]
CRM-12111
Brian Shaughnessy [Wed, 13 Mar 2013 17:23:47 +0000 (13:23 -0400)]
CRM-11203 authenticate user when running jobs via cli
Kurund Jalmi [Wed, 13 Mar 2013 16:52:00 +0000 (09:52 -0700)]
Merge pull request #138 from pratik-joshi/webtest-improvement
Webtest improvement
Pratik Joshi [Wed, 13 Mar 2013 14:54:55 +0000 (20:24 +0530)]
minor test fix
Pratik Joshi [Wed, 13 Mar 2013 14:41:47 +0000 (20:11 +0530)]
more test cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:27:48 +0000 (19:57 +0530)]
webtest cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:21:21 +0000 (19:51 +0530)]
more test cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:12:26 +0000 (19:42 +0530)]
test cleanup
Kurund Jalmi [Wed, 13 Mar 2013 12:58:22 +0000 (05:58 -0700)]
Merge pull request #137 from pratik-joshi/CRM-12076-fix
CRM-12076 fix
Pratik Joshi [Wed, 13 Mar 2013 12:35:28 +0000 (18:05 +0530)]
CRM-12076-fix : gen data commit
Pratik Joshi [Wed, 13 Mar 2013 12:08:54 +0000 (17:38 +0530)]
CRM-12076 fix
Conflicts:
CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl
Kurund Jalmi [Wed, 13 Mar 2013 11:28:08 +0000 (04:28 -0700)]
Merge pull request #127 from dlobo/CRM-12100
CRM-12100
Kurund Jalmi [Wed, 13 Mar 2013 11:26:16 +0000 (04:26 -0700)]
Merge pull request #133 from pradpnayak/CRM-12061
--fixed for CRM-12061
Kurund Jalmi [Wed, 13 Mar 2013 11:25:22 +0000 (04:25 -0700)]
Merge pull request #134 from totten/fix-doc-comment
Fix doc-comment formatting
Tim Otten [Wed, 13 Mar 2013 11:17:30 +0000 (04:17 -0700)]
Merge pull request #136 from pratik-joshi/CRM-12084
CRM-12084 fix : comment https://github.com/civicrm/civicrm-core/pull/135...
Pratik Joshi [Wed, 13 Mar 2013 11:05:53 +0000 (16:35 +0530)]
CRM-12084 fix : comment https://github.com/civicrm/civicrm-core/pull/135#issuecomment-
14834797 by totten
Tim Otten [Wed, 13 Mar 2013 10:29:22 +0000 (03:29 -0700)]
Merge pull request #135 from pratik-joshi/CRM-12084
CRM-12084 fix : Upgrade verifyPreDBState - check for orphaned contribution records
Tim Otten [Wed, 13 Mar 2013 10:06:28 +0000 (03:06 -0700)]
Merge pull request #129 from dlobo/CRM-12101
CRM-12101 - fixed fatal error and also fixed mail/postProcess from cli which was broken
Pratik Joshi [Wed, 13 Mar 2013 09:55:50 +0000 (15:25 +0530)]
CRM-12084 fix
Tim Otten [Wed, 13 Mar 2013 09:49:50 +0000 (02:49 -0700)]
Merge pull request #128 from eileenmcnaughton/CRM-11915-comments
Crm 11915 comments
Coleman Watts [Tue, 12 Mar 2013 03:32:35 +0000 (20:32 -0700)]
Adding .listall back to .gitignore for legacy purposes
Coleman Watts [Tue, 12 Mar 2013 03:28:32 +0000 (20:28 -0700)]
Also update GenCode
Coleman Watts [Tue, 12 Mar 2013 03:19:16 +0000 (20:19 -0700)]
Move .permissions.php and .listAll.php
Tim Otten [Wed, 13 Mar 2013 09:10:20 +0000 (05:10 -0400)]
Fix doc-comment formatting
Pradeep Nayak [Wed, 13 Mar 2013 08:09:13 +0000 (13:39 +0530)]
--fixed for CRM-12061
Tim Otten [Wed, 13 Mar 2013 06:05:35 +0000 (02:05 -0400)]
Add tpl-lint tool inspired by pull request #132
Tim Otten [Wed, 13 Mar 2013 04:41:31 +0000 (00:41 -0400)]
Cleanup extra spaces around HTML id attributes
Tim Otten [Wed, 13 Mar 2013 04:31:24 +0000 (00:31 -0400)]
Merge branch 'CRM-12019-b' of github.com:colemanw/civicrm-core into colemanw-CRM-12019-b
Tim Otten [Wed, 13 Mar 2013 03:36:35 +0000 (20:36 -0700)]
Merge pull request #132 from colemanw/CRM-12107
Don't include lock js on add new contact page CRM-12107
Coleman Watts [Wed, 13 Mar 2013 03:29:13 +0000 (20:29 -0700)]
Don't include lock js on add new contact page CRM-12107
colemanw [Wed, 13 Mar 2013 03:26:32 +0000 (20:26 -0700)]
Merge pull request #131 from eileenmcnaughton/CRM-12042
CRM-12042 edge case protection
eileen [Wed, 13 Mar 2013 03:19:49 +0000 (16:19 +1300)]
CRM-12042 edge case protection
Coleman Watts [Wed, 13 Mar 2013 02:28:48 +0000 (19:28 -0700)]
Change onclick handlers to be IE friendly CRM-12019
Donald A. Lobo [Tue, 12 Mar 2013 22:56:56 +0000 (15:56 -0700)]
get mail to work, eliminate debug code - CRM-12101
Donald A. Lobo [Tue, 12 Mar 2013 22:24:17 +0000 (15:24 -0700)]
CRM-12101
Donald A. Lobo [Tue, 12 Mar 2013 20:14:56 +0000 (13:14 -0700)]
CRM-12101
eileen [Tue, 12 Mar 2013 20:48:14 +0000 (09:48 +1300)]
CRM-11915 code comments
Donald A. Lobo [Tue, 12 Mar 2013 20:36:06 +0000 (13:36 -0700)]
CRM-12100
Tim Otten [Tue, 12 Mar 2013 15:01:59 +0000 (08:01 -0700)]
Merge pull request #126 from totten/abstract-err
CRM_Extension_Container_AllTests - Fix error about abstract method
Tim Otten [Tue, 12 Mar 2013 15:01:00 +0000 (11:01 -0400)]
CRM_Extension_Container_AllTests - Fix error about abstract method
Kurund Jalmi [Tue, 12 Mar 2013 14:48:15 +0000 (07:48 -0700)]
Merge pull request #125 from pradpnayak/CRM-11983
--made Financial Account Code - Credit and Financial Account Code - Debi...
Kurund Jalmi [Tue, 12 Mar 2013 14:42:10 +0000 (07:42 -0700)]
Merge pull request #123 from yashodha/CRM-9394
CRM-9394
Kurund Jalmi [Tue, 12 Mar 2013 14:41:13 +0000 (07:41 -0700)]
Merge pull request #122 from twomice/CRM-12013
Fix CRM-12013.
Kurund Jalmi [Tue, 12 Mar 2013 14:40:32 +0000 (07:40 -0700)]
Merge pull request #121 from colemanw/CRM-12099
Specify location of jstree css and improve menu-editing theme
Kurund Jalmi [Tue, 12 Mar 2013 14:38:56 +0000 (07:38 -0700)]
Merge pull request #118 from dlobo/CRM-12096
fix CRM-12096
Kurund Jalmi [Tue, 12 Mar 2013 14:38:08 +0000 (07:38 -0700)]
Merge pull request #117 from pradpnayak/CRM-12077
--worked on CRM-12077
yashodha [Tue, 12 Mar 2013 14:32:34 +0000 (20:02 +0530)]
CRM-9394
yashodha [Tue, 12 Mar 2013 14:09:37 +0000 (19:39 +0530)]
CRM-9394
Pradeep Nayak [Tue, 12 Mar 2013 13:26:08 +0000 (18:56 +0530)]
--made Financial Account Code - Credit and Financial Account Code - Debit optional, worked on CRM-11983
yashodha [Tue, 12 Mar 2013 09:21:36 +0000 (14:51 +0530)]
CRM-9394
Allen Shaw [Tue, 12 Mar 2013 06:03:13 +0000 (01:03 -0500)]
Fix CRM-12013.
Coleman Watts [Tue, 12 Mar 2013 04:29:16 +0000 (21:29 -0700)]
Specify location of jstree css and improve menu-editing theme
Tim Otten [Tue, 12 Mar 2013 01:35:16 +0000 (18:35 -0700)]
Merge pull request #119 from totten/git-hooks-reponame
gitify - In hook stubs, set GIT_CANONICAL_REPO_NAME.
Tim Otten [Tue, 12 Mar 2013 01:31:46 +0000 (21:31 -0400)]
gitify - In hook stubs, set GIT_CANONICAL_REPO_NAME.
The hook functions are called by multiple repos, and we may want to tweak the behavior within each repo. The GIT_CANONICAL_REPO_NAME provides a value like "civicrm-packages" or "civicrm-core".
Donald A. Lobo [Mon, 11 Mar 2013 22:29:02 +0000 (15:29 -0700)]
fix CRM-12096
Pradeep Nayak [Mon, 11 Mar 2013 20:04:20 +0000 (01:34 +0530)]
--worked on CRM-12077
Kurund Jalmi [Mon, 11 Mar 2013 18:34:23 +0000 (11:34 -0700)]
Merge pull request #116 from dlobo/CRM-12093
fix CRM-12093
Donald A. Lobo [Mon, 11 Mar 2013 18:01:20 +0000 (11:01 -0700)]
fix CRM-12093
Kurund Jalmi [Mon, 11 Mar 2013 17:50:16 +0000 (10:50 -0700)]
Merge pull request #115 from dlobo/CRM-12088
fix CRM-12088
projects / civicrm-core.git / log