civicrm-core.git
11 years agoworked on CRM-12012, added missing feature of copying relationships/case roles when...
Kurund Jalmi [Sat, 16 Mar 2013 13:37:04 +0000 (19:07 +0530)]
worked on CRM-12012, added missing feature of copying relationships/case roles when new client is added for a case, ( when multi-client mode is enabled for case )

11 years agoindentation fixes
Kurund Jalmi [Sat, 16 Mar 2013 12:38:28 +0000 (18:08 +0530)]
indentation fixes

11 years agofixed the layout for multi-client mode
Kurund Jalmi [Sat, 16 Mar 2013 10:40:54 +0000 (16:10 +0530)]
fixed the layout for multi-client mode

11 years agoMerge pull request #166 from totten/html-head
Kurund Jalmi [Sat, 16 Mar 2013 17:55:40 +0000 (10:55 -0700)]
Merge pull request #166 from totten/html-head

CRM-11823 - Enable CiviCRM to generate HTML HEAD elements on non-Civi pages

11 years agoMerge pull request #165 from colemanw/CRM-12122
Kurund Jalmi [Sat, 16 Mar 2013 17:53:04 +0000 (10:53 -0700)]
Merge pull request #165 from colemanw/CRM-12122

Fix print.tpl to include new regions CRM-12122

11 years agodistmaker - Remove old D6 build code
CiviCRM [Sat, 16 Mar 2013 14:44:16 +0000 (10:44 -0400)]
distmaker - Remove old D6 build code

11 years agodistmaker - Increase verbosity
CiviCRM [Sat, 16 Mar 2013 14:28:00 +0000 (10:28 -0400)]
distmaker - Increase verbosity

11 years agoCRM-11823 - D6/D7 - Clear theme registry, et al, as part of install/upgrade
CiviCRM [Sat, 16 Mar 2013 13:34:10 +0000 (09:34 -0400)]
CRM-11823 - D6/D7 - Clear theme registry, et al, as part of install/upgrade

11 years agoCRM-11823 - D6 - Warn during upgrade if the 'preprocess function' for outputing JS...
Tim Otten [Tue, 12 Mar 2013 18:08:04 +0000 (14:08 -0400)]
CRM-11823 - D6 - Warn during upgrade if the 'preprocess function' for outputing JS/CSS is registered. (It's needed in the AJAX upgrade UI.)

11 years agoCRM-11823 - D7 - Restore JS on upgrade screen
Tim Otten [Tue, 12 Mar 2013 17:38:04 +0000 (13:38 -0400)]
CRM-11823 - D7 - Restore JS on upgrade screen

11 years agoCRM-11823 - Restore generation of JS/CSS markup in the profiles' "HTML Form Snippets"
Tim Otten [Tue, 12 Mar 2013 16:21:59 +0000 (12:21 -0400)]
CRM-11823 - Restore generation of JS/CSS markup in the profiles' "HTML Form Snippets"

11 years agoCRM-11823 - Conditionally disable all existing codes that render html-header
Tim Otten [Mon, 11 Mar 2013 23:25:58 +0000 (19:25 -0400)]
CRM-11823 - Conditionally disable all existing codes that render html-header

11 years agoMerge pull request #144 from colemanw/profileHelp
Tim Otten [Sat, 16 Mar 2013 11:19:33 +0000 (04:19 -0700)]
Merge pull request #144 from colemanw/profileHelp

Profile editor: Fetch pre/post help for custom fields

11 years agoMerge pull request #160 from davecivicrm/CRM-12013
Kurund Jalmi [Sat, 16 Mar 2013 06:23:53 +0000 (23:23 -0700)]
Merge pull request #160 from davecivicrm/CRM-12013

CRM-12119 replaced demo_processor with new dummy_processor file

11 years agoMerge pull request #162 from davecivicrm/CRM-12113
Kurund Jalmi [Sat, 16 Mar 2013 06:23:12 +0000 (23:23 -0700)]
Merge pull request #162 from davecivicrm/CRM-12113

CRM-12113 Extend status message when attempting to deleting membership type.

11 years agoMerge pull request #163 from dlobo/CRM-12121
Kurund Jalmi [Sat, 16 Mar 2013 06:22:20 +0000 (23:22 -0700)]
Merge pull request #163 from dlobo/CRM-12121

CRM-12121

11 years agoMerge pull request #164 from dlobo/CRM-12117
Kurund Jalmi [Sat, 16 Mar 2013 06:21:48 +0000 (23:21 -0700)]
Merge pull request #164 from dlobo/CRM-12117

CRM-12117

11 years agoCRM-12117
Donald A. Lobo [Sat, 16 Mar 2013 05:29:31 +0000 (22:29 -0700)]
CRM-12117

11 years agoFix print.tpl to include new regions CRM-12122
Coleman Watts [Sat, 16 Mar 2013 02:28:11 +0000 (19:28 -0700)]
Fix print.tpl to include new regions CRM-12122

11 years agoCRM-12121
Donald A. Lobo [Fri, 15 Mar 2013 23:55:57 +0000 (16:55 -0700)]
CRM-12121

11 years agoCRM-12113 Extend status message when attempting to deleting membership type to explai...
Dave Greenberg [Fri, 15 Mar 2013 21:44:28 +0000 (14:44 -0700)]
CRM-12113 Extend status message when attempting to deleting membership type to explain that contacts in trash may have membership type assigned. This has come up as a question several times on the forums.

11 years agoOnly set appropriate fields
Coleman Watts [Fri, 15 Mar 2013 21:35:54 +0000 (14:35 -0700)]
Only set appropriate fields

11 years agoMerge pull request #159 from lcdservices/master
colemanw [Fri, 15 Mar 2013 21:25:06 +0000 (14:25 -0700)]
Merge pull request #159 from lcdservices/master

CRM-12096 UI tweaks for J3.0; set base level font sizes and form element box model

11 years agoMerge pull request #161 from totten/releaser-split
colemanw [Fri, 15 Mar 2013 20:23:17 +0000 (13:23 -0700)]
Merge pull request #161 from totten/releaser-split

releaser - Optionally split the "build" and "publish" steps

11 years agoreleaser - Optionally split the "build" and "publish" steps
Tim Otten [Fri, 15 Mar 2013 19:38:23 +0000 (15:38 -0400)]
releaser - Optionally split the "build" and "publish" steps

This allows one to test the tarballs produced by distmaker before publishing anything.

11 years agoadd class to summary view block to make consistent with other blocks
Brian Shaughnessy [Fri, 15 Mar 2013 19:33:52 +0000 (15:33 -0400)]
add class to summary view block to make consistent with other blocks

11 years agoCRM-12119 replaced demo_processor with new dummy_processor file which creates dummy...
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.

11 years agoCRM-12096 UI tweaks for J3.0; set base level font sizes and form element box model
Brian Shaughnessy [Fri, 15 Mar 2013 19:17:07 +0000 (15:17 -0400)]
CRM-12096 UI tweaks for J3.0; set base level font sizes and form element box model

11 years agoMerge pull request #157 from pradpnayak/CRM-12061
Kurund Jalmi [Fri, 15 Mar 2013 18:36:07 +0000 (11:36 -0700)]
Merge pull request #157 from pradpnayak/CRM-12061

--fixed for CRM-12061, fee_amount should be greater then 0 to create ext...

11 years agoMerge pull request #158 from mlutfy/CRM-12125
Kurund Jalmi [Fri, 15 Mar 2013 18:25:31 +0000 (11:25 -0700)]
Merge pull request #158 from mlutfy/CRM-12125

fixes CRM-12125: format case start date using localisation settings

11 years agofixes CRM-12125: format case start date using localisation settings, otherwise defaul...
Mathieu Lutfy [Fri, 15 Mar 2013 18:21:41 +0000 (14:21 -0400)]
fixes CRM-12125: format case start date using localisation settings, otherwise defaults to AM/PM.

11 years ago--fixed for CRM-12061, fee_amount should be greater then 0 to create extra entry
Pradeep Nayak [Fri, 15 Mar 2013 18:08:38 +0000 (23:38 +0530)]
--fixed for CRM-12061, fee_amount should be greater then 0 to create extra entry

11 years agoMerge pull request #155 from deepak-srivastava/master
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

11 years agoadding demo processor to generated data
Deepak Srivastava [Fri, 15 Mar 2013 09:28:54 +0000 (14:58 +0530)]
adding demo processor to generated data

11 years agoMerge pull request #152 from davecivicrm/CRM-12013
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().

11 years agoMerge pull request #153 from twomice/CRM-12013
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.

11 years agoMerge pull request #154 from colemanw/CRM-12120
Kurund Jalmi [Fri, 15 Mar 2013 05:38:11 +0000 (22:38 -0700)]
Merge pull request #154 from colemanw/CRM-12120

Crm 12120

11 years agoAlter quicksearch to redirect to advanced search CRM-12120
Coleman Watts [Fri, 15 Mar 2013 04:42:34 +0000 (21:42 -0700)]
Alter quicksearch to redirect to advanced search CRM-12120

11 years agoFix CRM-12013: Fixed PHP warnings.
Allen Shaw [Fri, 15 Mar 2013 03:36:43 +0000 (22:36 -0500)]
Fix CRM-12013: Fixed PHP warnings.

11 years agoWhitespace cleanup
Coleman Watts [Fri, 15 Mar 2013 03:16:16 +0000 (20:16 -0700)]
Whitespace cleanup

11 years agoFix notice due to missing param in array loop.
Dave Greenberg [Thu, 14 Mar 2013 22:03:58 +0000 (15:03 -0700)]
Fix notice due to missing param in array loop.

11 years agoMerge pull request #151 from pradpnayak/CRM-12065
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

11 years ago--upgrade script for CRM-12065
Pradeep Nayak [Thu, 14 Mar 2013 19:01:47 +0000 (00:31 +0530)]
--upgrade script for CRM-12065

11 years agoMerge pull request #142 from colemanw/CRM-12029b
Tim Otten [Thu, 14 Mar 2013 17:50:34 +0000 (10:50 -0700)]
Merge pull request #142 from colemanw/CRM-12029b

Javascript improvements

11 years agoMerge pull request #147 from deepak-srivastava/crm
colemanw [Thu, 14 Mar 2013 16:54:12 +0000 (09:54 -0700)]
Merge pull request #147 from deepak-srivastava/crm

towards webtest fixes

11 years agoMerge pull request #149 from pratik-joshi/more-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

11 years agoMerge pull request #150 from yashodha/webtest-fixes
colemanw [Thu, 14 Mar 2013 16:18:32 +0000 (09:18 -0700)]
Merge pull request #150 from yashodha/webtest-fixes

webtest fixes

11 years agoMerge pull request #146 from pratik-joshi/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

11 years agoMerge pull request #148 from tttp/bugfix
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

11 years agomore test fix
Pratik Joshi [Thu, 14 Mar 2013 14:08:02 +0000 (19:38 +0530)]
more test fix

11 years agomore test fixes
Pratik Joshi [Thu, 14 Mar 2013 13:39:54 +0000 (19:09 +0530)]
more test fixes

11 years agowebtest fixes
yashodha [Thu, 14 Mar 2013 13:39:21 +0000 (19:09 +0530)]
webtest fixes

11 years agominor webtest fix
Pratik Joshi [Thu, 14 Mar 2013 13:11:42 +0000 (18:41 +0530)]
minor webtest fix

11 years agoCRM-12102 Redirect from civicrm/ajax/doc to civicrm/api/explorer
Xavier Dutoit [Thu, 14 Mar 2013 12:44:20 +0000 (13:44 +0100)]
CRM-12102 Redirect from civicrm/ajax/doc to civicrm/api/explorer

11 years agowebtest fix
Pratik Joshi [Thu, 14 Mar 2013 12:19:01 +0000 (17:49 +0530)]
webtest fix

11 years agotowards webtest fixes
Deepak Srivastava [Thu, 14 Mar 2013 12:11:07 +0000 (17:41 +0530)]
towards webtest fixes

11 years agominor test fix
Pratik Joshi [Thu, 14 Mar 2013 11:19:38 +0000 (16:49 +0530)]
minor test fix

11 years agotowards webtest fixes
Deepak Srivastava [Thu, 14 Mar 2013 11:01:19 +0000 (16:31 +0530)]
towards webtest fixes

11 years agominor webtest fix for error : 'civicrm-footer' element not found
Pratik Joshi [Thu, 14 Mar 2013 10:58:37 +0000 (16:28 +0530)]
minor webtest fix for error : 'civicrm-footer' element not found

11 years agoMerge pull request #145 from pratik-joshi/CRM-12062-minor-bug-fix
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

11 years agoCRM-12062 : minor bug found by failing test case WebTest_Event_AddEventTest::testAddP...
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

11 years agoProfile editor: Fetch pre/post help for custom fields
Coleman Watts [Thu, 14 Mar 2013 02:46:16 +0000 (19:46 -0700)]
Profile editor: Fetch pre/post help for custom fields

11 years agoMerge pull request #141 from pradpnayak/CRM-12065
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...

11 years agoMerge pull request #143 from dlobo/CRM-11281
colemanw [Thu, 14 Mar 2013 00:07:50 +0000 (17:07 -0700)]
Merge pull request #143 from dlobo/CRM-11281

CRM-11281

11 years agoCRM-11281
Donald A. Lobo [Wed, 13 Mar 2013 23:32:48 +0000 (16:32 -0700)]
CRM-11281

11 years agoCRM-11281
Donald A. Lobo [Wed, 13 Mar 2013 21:17:10 +0000 (14:17 -0700)]
CRM-11281

11 years agoImprove convenience/flexibility of CRM.confirm
Coleman Watts [Wed, 13 Mar 2013 21:14:56 +0000 (14:14 -0700)]
Improve convenience/flexibility of CRM.confirm

11 years ago-- fixed formatting, static errors and replaced contribution_type to financial_type
Pradeep Nayak [Wed, 13 Mar 2013 19:14:54 +0000 (00:44 +0530)]
-- fixed formatting, static errors and replaced contribution_type to financial_type

11 years agoIntroduce 'context' param to CRM.api CRM-12029
Coleman Watts [Wed, 13 Mar 2013 19:04:15 +0000 (12:04 -0700)]
Introduce 'context' param to CRM.api CRM-12029

11 years agoMerge pull request #139 from lcdservices/master
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

11 years agoCRM-11203 update Joomla setUserSession to call parent method
Brian Shaughnessy [Wed, 13 Mar 2013 18:20:06 +0000 (14:20 -0400)]
CRM-11203 update Joomla setUserSession to call parent method

11 years agoCRM-11203 move setUserSession from Drupal to Base so we allow optional override on...
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

11 years agoMerge pull request #140 from dlobo/CRM-12111
colemanw [Wed, 13 Mar 2013 18:07:05 +0000 (11:07 -0700)]
Merge pull request #140 from dlobo/CRM-12111

CRM-12111

11 years agoCRM-12111
Donald A. Lobo [Wed, 13 Mar 2013 17:38:36 +0000 (10:38 -0700)]
CRM-12111

11 years agoCRM-11203 authenticate user when running jobs via cli
Brian Shaughnessy [Wed, 13 Mar 2013 17:23:47 +0000 (13:23 -0400)]
CRM-11203 authenticate user when running jobs via cli

11 years agoMerge pull request #138 from pratik-joshi/webtest-improvement
Kurund Jalmi [Wed, 13 Mar 2013 16:52:00 +0000 (09:52 -0700)]
Merge pull request #138 from pratik-joshi/webtest-improvement

Webtest improvement

11 years agominor test fix
Pratik Joshi [Wed, 13 Mar 2013 14:54:55 +0000 (20:24 +0530)]
minor test fix

11 years agomore test cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:41:47 +0000 (20:11 +0530)]
more test cleanup

11 years agowebtest cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:27:48 +0000 (19:57 +0530)]
webtest cleanup

11 years agomore test cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:21:21 +0000 (19:51 +0530)]
more test cleanup

11 years agotest cleanup
Pratik Joshi [Wed, 13 Mar 2013 14:12:26 +0000 (19:42 +0530)]
test cleanup

11 years agoMerge pull request #137 from pratik-joshi/CRM-12076-fix
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

11 years agoCRM-12076-fix : gen data commit
Pratik Joshi [Wed, 13 Mar 2013 12:35:28 +0000 (18:05 +0530)]
CRM-12076-fix : gen data commit

11 years agoCRM-12076 fix
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

11 years agoMerge pull request #127 from dlobo/CRM-12100
Kurund Jalmi [Wed, 13 Mar 2013 11:28:08 +0000 (04:28 -0700)]
Merge pull request #127 from dlobo/CRM-12100

CRM-12100

11 years agoMerge pull request #133 from pradpnayak/CRM-12061
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

11 years agoMerge pull request #134 from totten/fix-doc-comment
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

11 years agoMerge pull request #136 from pratik-joshi/CRM-12084
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...

11 years agoCRM-12084 fix : comment https://github.com/civicrm/civicrm-core/pull/135#issuecomment...
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

11 years agoMerge pull request #135 from pratik-joshi/CRM-12084
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

11 years agoMerge pull request #129 from dlobo/CRM-12101
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

11 years agoCRM-12084 fix
Pratik Joshi [Wed, 13 Mar 2013 09:55:50 +0000 (15:25 +0530)]
CRM-12084 fix

11 years agoMerge pull request #128 from eileenmcnaughton/CRM-11915-comments
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

11 years agoAdding .listall back to .gitignore for legacy purposes
Coleman Watts [Tue, 12 Mar 2013 03:32:35 +0000 (20:32 -0700)]
Adding .listall back to .gitignore for legacy purposes

11 years agoAlso update GenCode
Coleman Watts [Tue, 12 Mar 2013 03:28:32 +0000 (20:28 -0700)]
Also update GenCode

11 years agoMove .permissions.php and .listAll.php
Coleman Watts [Tue, 12 Mar 2013 03:19:16 +0000 (20:19 -0700)]
Move .permissions.php and .listAll.php

11 years agoFix doc-comment formatting
Tim Otten [Wed, 13 Mar 2013 09:10:20 +0000 (05:10 -0400)]
Fix doc-comment formatting

11 years ago--fixed for CRM-12061
Pradeep Nayak [Wed, 13 Mar 2013 08:09:13 +0000 (13:39 +0530)]
--fixed for CRM-12061

11 years agoAdd tpl-lint tool inspired by pull request #132
Tim Otten [Wed, 13 Mar 2013 06:05:35 +0000 (02:05 -0400)]
Add tpl-lint tool inspired by pull request #132

11 years agoCleanup extra spaces around HTML id attributes
Tim Otten [Wed, 13 Mar 2013 04:41:31 +0000 (00:41 -0400)]
Cleanup extra spaces around HTML id attributes