civicrm-core.git
11 years agodrupal_add_js isn't working - disabling seems the easiest fix
Coleman Watts [Fri, 8 Mar 2013 03:59:42 +0000 (19:59 -0800)]
drupal_add_js isn't working - disabling seems the easiest fix

11 years agoMerge pull request #66 from colemanw/Webtests
colemanw [Fri, 8 Mar 2013 00:35:32 +0000 (16:35 -0800)]
Merge pull request #66 from colemanw/Webtests

Fix 3 webtests, and cleanup

11 years agoLogout should not wait for civicrm-footer
Coleman Watts [Wed, 6 Mar 2013 22:11:57 +0000 (14:11 -0800)]
Logout should not wait for civicrm-footer

11 years agoThe cut-n-paste code avanger strikes again
Coleman Watts [Wed, 6 Mar 2013 19:58:21 +0000 (11:58 -0800)]
The cut-n-paste code avanger strikes again

11 years agoFix 3 webtests, and cleanup
Coleman Watts [Wed, 6 Mar 2013 19:29:14 +0000 (11:29 -0800)]
Fix 3 webtests, and cleanup

11 years agoMerge pull request #83 from pradpnayak/CRM-12024
Kurund Jalmi [Thu, 7 Mar 2013 18:26:55 +0000 (10:26 -0800)]
Merge pull request #83 from pradpnayak/CRM-12024

--code cleanup for CRM-12024

11 years agoMerge pull request #82 from pratik-joshi/webtests-fixes
Kurund Jalmi [Thu, 7 Mar 2013 15:18:19 +0000 (07:18 -0800)]
Merge pull request #82 from pratik-joshi/webtests-fixes

Webtests fixes

11 years agoMerge pull request #80 from ravishnair/CRM-11778_grant-page-title-fix
Kurund Jalmi [Thu, 7 Mar 2013 15:14:28 +0000 (07:14 -0800)]
Merge pull request #80 from ravishnair/CRM-11778_grant-page-title-fix

-- CRM-11778 fix for Grant edit/view page title

11 years agoMerge pull request #81 from ravishnair/webtest-improvement
Kurund Jalmi [Thu, 7 Mar 2013 15:14:15 +0000 (07:14 -0800)]
Merge pull request #81 from ravishnair/webtest-improvement

-- improved webtests, applied patch and made modifications

11 years ago--code cleanup for CRM-12024
Pradeep Nayak [Thu, 7 Mar 2013 15:14:04 +0000 (20:44 +0530)]
--code cleanup for CRM-12024

11 years agowebtest improvements for mailing tests
Pratik Joshi [Thu, 7 Mar 2013 15:06:44 +0000 (20:36 +0530)]
webtest improvements for mailing tests

11 years agowebtest improvement
Pratik Joshi [Thu, 7 Mar 2013 13:09:50 +0000 (18:39 +0530)]
webtest improvement

11 years ago-- CRM-11778 fix for Grant edit/view page title
Ravish Nair [Thu, 7 Mar 2013 15:02:16 +0000 (20:32 +0530)]
-- CRM-11778 fix for Grant edit/view page title

11 years ago-- improved webtests, applied patch and made modifications
Ravish Nair [Thu, 7 Mar 2013 14:55:12 +0000 (20:25 +0530)]
-- improved webtests, applied patch and made modifications

11 years agoreleaser - Extract variable "$distmaker_tgt"
Tim Otten [Thu, 7 Mar 2013 12:51:08 +0000 (07:51 -0500)]
releaser - Extract variable "$distmaker_tgt"

11 years agoreleaser - Publish starterkit tgz file (but not on sf.net)
Tim Otten [Thu, 7 Mar 2013 12:47:37 +0000 (07:47 -0500)]
releaser - Publish starterkit tgz file (but not on sf.net)

11 years agodistmaker/joomlaxml - Disable MySQL strict (which causes extraneous DB request)
Tim Otten [Thu, 7 Mar 2013 12:43:51 +0000 (07:43 -0500)]
distmaker/joomlaxml - Disable MySQL strict (which causes extraneous DB request)

11 years agoMerge pull request #79 from pradpnayak/CRM-12018
Kurund Jalmi [Thu, 7 Mar 2013 12:33:50 +0000 (04:33 -0800)]
Merge pull request #79 from pradpnayak/CRM-12018

--notice fixes for CRM-12018

11 years ago--notice fixes for CRM-12018
Pradeep Nayak [Thu, 7 Mar 2013 12:24:50 +0000 (17:54 +0530)]
--notice fixes for CRM-12018

11 years agoMerge pull request #77 from pratik-joshi/webtest-improvement
Kurund Jalmi [Thu, 7 Mar 2013 11:40:19 +0000 (03:40 -0800)]
Merge pull request #77 from pratik-joshi/webtest-improvement

webtest fix : deleting profiles created through webtest

11 years agoMerge pull request #76 from pradpnayak/CRM-12018
Kurund Jalmi [Thu, 7 Mar 2013 09:09:48 +0000 (01:09 -0800)]
Merge pull request #76 from pradpnayak/CRM-12018

--fixed for CRM-12018

11 years agoMerge pull request #75 from ravishnair/postUpgradeMessage-fix
Kurund Jalmi [Thu, 7 Mar 2013 09:09:11 +0000 (01:09 -0800)]
Merge pull request #75 from ravishnair/postUpgradeMessage-fix

-- postupgrade message for beta2 to display the modified message templat...

11 years ago--fixed for CRM-12018
Pradeep Nayak [Thu, 7 Mar 2013 08:50:15 +0000 (14:20 +0530)]
--fixed for CRM-12018

11 years ago-- postupgrade message for beta2 to display the modified message templates
Ravish Nair [Thu, 7 Mar 2013 08:49:27 +0000 (14:19 +0530)]
-- postupgrade message for beta2 to display the modified message templates

11 years agoMerge pull request #65 from twomice/CRM-12013
Kurund Jalmi [Thu, 7 Mar 2013 07:56:31 +0000 (23:56 -0800)]
Merge pull request #65 from twomice/CRM-12013

Fix CRM-12013.

11 years agoMerge pull request #74 from dlobo/MiscFixes
Kurund Jalmi [Thu, 7 Mar 2013 07:54:37 +0000 (23:54 -0800)]
Merge pull request #74 from dlobo/MiscFixes

fix notices for PHP 5.4

11 years agowebtest fix : deleting profiles created through webtest
Pratik Joshi [Thu, 7 Mar 2013 07:51:59 +0000 (13:21 +0530)]
webtest fix : deleting profiles created through webtest

11 years agofix notices for PHP 5.4
Donald A. Lobo [Thu, 7 Mar 2013 05:53:02 +0000 (21:53 -0800)]
fix notices for PHP 5.4

11 years agoMerge pull request #67 from dlobo/CRM-12027
Kurund Jalmi [Thu, 7 Mar 2013 05:52:20 +0000 (21:52 -0800)]
Merge pull request #67 from dlobo/CRM-12027

fix CRM-12027

11 years agoMerge pull request #72 from colemanw/CRM-12029
Kurund Jalmi [Thu, 7 Mar 2013 05:51:51 +0000 (21:51 -0800)]
Merge pull request #72 from colemanw/CRM-12029

Restore context to CRM.api CRM-12029

11 years agoMerge pull request #73 from totten/ext-url-warning
Kurund Jalmi [Thu, 7 Mar 2013 05:51:22 +0000 (21:51 -0800)]
Merge pull request #73 from totten/ext-url-warning

CRM-12039 - Warning about undefined extensionsUrl

11 years agoCRM-12039 - Display warning to prevent downloads if the default container doesn't...
Tim Otten [Thu, 7 Mar 2013 02:19:47 +0000 (21:19 -0500)]
CRM-12039 - Display warning to prevent downloads if the default container doesn't have a URL

11 years agoCRM-12039 - Add checkRequirements to CRM_Extension_Container_Interface
Tim Otten [Thu, 7 Mar 2013 02:17:50 +0000 (21:17 -0500)]
CRM-12039 - Add checkRequirements to CRM_Extension_Container_Interface

11 years agoRestore context to CRM.api CRM-12029
Coleman Watts [Thu, 7 Mar 2013 01:38:00 +0000 (17:38 -0800)]
Restore context to CRM.api CRM-12029

11 years agoCleanup - Ignore test byproducts
Tim Otten [Thu, 7 Mar 2013 01:38:00 +0000 (20:38 -0500)]
Cleanup - Ignore test byproducts

11 years agoMerge pull request #71 from colemanw/CRM-12038
Tim Otten [Thu, 7 Mar 2013 01:34:03 +0000 (17:34 -0800)]
Merge pull request #71 from colemanw/CRM-12038

Crm 12038 - Fix help popups for custom fields

11 years agoHmm, help file version numbers haven't been updated in a while
Coleman Watts [Thu, 7 Mar 2013 00:59:29 +0000 (16:59 -0800)]
Hmm, help file version numbers haven't been updated in a while

11 years agoRemove unneeded param
Coleman Watts [Thu, 7 Mar 2013 00:53:20 +0000 (16:53 -0800)]
Remove unneeded param

11 years agoAdd dynamic loading of help text for custom fields CRM-12038
Coleman Watts [Thu, 7 Mar 2013 00:50:24 +0000 (16:50 -0800)]
Add dynamic loading of help text for custom fields CRM-12038

11 years agoMerge pull request #70 from totten/windows-extension
Tim Otten [Thu, 7 Mar 2013 00:46:44 +0000 (16:46 -0800)]
Merge pull request #70 from totten/windows-extension

CRM-12030 - Resource URLS for extensions on Windows

11 years agoMerge pull request #69 from colemanw/CRM-12019
Tim Otten [Thu, 7 Mar 2013 00:33:05 +0000 (16:33 -0800)]
Merge pull request #69 from colemanw/CRM-12019

Fix 'leave page' alert in IE CRM-12019

11 years agoCRM-12030 - Use getRelUrls() instead of getRelPaths() to construct URLs
Tim Otten [Thu, 7 Mar 2013 00:23:35 +0000 (19:23 -0500)]
CRM-12030 - Use getRelUrls() instead of getRelPaths() to construct URLs

11 years agoCRM-12030 - Always use '/' in URLs (even for Windows)
Tim Otten [Thu, 7 Mar 2013 00:11:02 +0000 (19:11 -0500)]
CRM-12030 - Always use '/' in URLs (even for Windows)

11 years agoFix 'leave page' alert in IE CRM-12019
Coleman Watts [Wed, 6 Mar 2013 23:36:01 +0000 (15:36 -0800)]
Fix 'leave page' alert in IE CRM-12019

11 years agoCRM-11658 - releaser - Fix GPG bug
Tim Otten [Wed, 6 Mar 2013 22:36:08 +0000 (17:36 -0500)]
CRM-11658 - releaser - Fix GPG bug

11 years agoMerge pull request #68 from totten/releaser-tweak
Tim Otten [Wed, 6 Mar 2013 22:13:55 +0000 (14:13 -0800)]
Merge pull request #68 from totten/releaser-tweak

CRM-11658 Releaser tweaks

11 years agoCRM-11658 - distmaker - Allow running Joomla scripts for multiple users on the same...
Tim Otten [Wed, 6 Mar 2013 22:06:13 +0000 (17:06 -0500)]
CRM-11658 - distmaker - Allow running Joomla scripts for multiple users on the same host

11 years agoCRM-11658 - releaser - Explain why there are two git_base_url options
Tim Otten [Wed, 6 Mar 2013 21:47:21 +0000 (16:47 -0500)]
CRM-11658 - releaser - Explain why there are two git_base_url options

11 years agoCRM-11658 - releaser - Tweak help text to be more realistic
Tim Otten [Wed, 6 Mar 2013 21:46:54 +0000 (16:46 -0500)]
CRM-11658 - releaser - Tweak help text to be more realistic

11 years agofix CRM-12027
Donald A. Lobo [Wed, 6 Mar 2013 19:54:43 +0000 (11:54 -0800)]
fix CRM-12027

11 years agoFix CRM-12013.
Allen Shaw [Wed, 6 Mar 2013 17:56:05 +0000 (11:56 -0600)]
Fix CRM-12013.

11 years agoMerge pull request #64 from dlobo/CRM-12034
Kurund Jalmi [Wed, 6 Mar 2013 17:35:37 +0000 (09:35 -0800)]
Merge pull request #64 from dlobo/CRM-12034

fix CRM-12034

11 years agoMerge pull request #63 from ravishnair/webtest-improvement
Kurund Jalmi [Wed, 6 Mar 2013 17:35:05 +0000 (09:35 -0800)]
Merge pull request #63 from ravishnair/webtest-improvement

-- applied patch and made some modifications

11 years agoMerge pull request #62 from pratik-joshi/webtest-improvement
Kurund Jalmi [Wed, 6 Mar 2013 17:34:17 +0000 (09:34 -0800)]
Merge pull request #62 from pratik-joshi/webtest-improvement

Webtest improvement

11 years agoMerge pull request #60 from pradpnayak/CRM-12017
Kurund Jalmi [Wed, 6 Mar 2013 17:29:39 +0000 (09:29 -0800)]
Merge pull request #60 from pradpnayak/CRM-12017

-fixed for CRM-12017

11 years agofix CRM-12034
Donald A. Lobo [Wed, 6 Mar 2013 17:15:05 +0000 (09:15 -0800)]
fix CRM-12034

11 years ago-- applied patch and made some modifications
Ravish Nair [Wed, 6 Mar 2013 16:19:07 +0000 (21:49 +0530)]
-- applied patch and made some modifications

11 years agowebtest cleanup and code improvement(using helper function)
Pratik Joshi [Wed, 6 Mar 2013 15:47:46 +0000 (21:17 +0530)]
webtest cleanup and code improvement(using helper function)

11 years agowebtest cleanup and code improvement
Pratik Joshi [Wed, 6 Mar 2013 15:17:35 +0000 (20:47 +0530)]
webtest cleanup and code improvement

11 years ago-fixed for CRM-12017
Pradeep Nayak [Wed, 6 Mar 2013 15:34:46 +0000 (21:04 +0530)]
-fixed for CRM-12017

11 years agoMerge pull request #58 from pratik-joshi/webtests-cleanup
Kurund Jalmi [Wed, 6 Mar 2013 15:15:05 +0000 (07:15 -0800)]
Merge pull request #58 from pratik-joshi/webtests-cleanup

webtest cleanup and code improvement

11 years agowebtest cleanup and code improvement
Pratik Joshi [Wed, 6 Mar 2013 14:14:56 +0000 (19:44 +0530)]
webtest cleanup and code improvement

11 years agoMerge pull request #57 from ravishnair/webtest-improvement
Kurund Jalmi [Wed, 6 Mar 2013 13:40:03 +0000 (05:40 -0800)]
Merge pull request #57 from ravishnair/webtest-improvement

-- applied patches and made some modifications

11 years ago-- applied patches and made some modifications
Ravish Nair [Wed, 6 Mar 2013 13:10:50 +0000 (18:40 +0530)]
-- applied patches and made some modifications

11 years agoMerge pull request #54 from pratik-joshi/CRM-11960
Kurund Jalmi [Wed, 6 Mar 2013 12:39:04 +0000 (04:39 -0800)]
Merge pull request #54 from pratik-joshi/CRM-11960

fix for CRM-11960

11 years agoMerge pull request #55 from pratik-joshi/CRM-11960-webtest
Kurund Jalmi [Wed, 6 Mar 2013 12:38:28 +0000 (04:38 -0800)]
Merge pull request #55 from pratik-joshi/CRM-11960-webtest

test case for CRM-11960

11 years agoMerge pull request #56 from deepak-srivastava/crm
Kurund Jalmi [Wed, 6 Mar 2013 12:38:03 +0000 (04:38 -0800)]
Merge pull request #56 from deepak-srivastava/crm

default demo processor fixes

11 years agodemo processor fix
Deepak Srivastava [Wed, 6 Mar 2013 12:24:34 +0000 (17:54 +0530)]
demo processor fix

11 years agodemo processor fix
Deepak Srivastava [Wed, 6 Mar 2013 12:23:16 +0000 (17:53 +0530)]
demo processor fix

11 years agotest case for CRM-11960
Pratik Joshi [Wed, 6 Mar 2013 11:27:12 +0000 (16:57 +0530)]
test case for CRM-11960

11 years agofix for CRM-11960
Pratik Joshi [Wed, 6 Mar 2013 10:15:27 +0000 (15:45 +0530)]
fix for CRM-11960

11 years agoMerge pull request #53 from totten/releaser
Kurund Jalmi [Wed, 6 Mar 2013 09:55:09 +0000 (01:55 -0800)]
Merge pull request #53 from totten/releaser

CRM-11658 - Add "releaser" for git

11 years agoMerge pull request #51 from ravishnair/webtest-improvement
Kurund Jalmi [Wed, 6 Mar 2013 09:48:43 +0000 (01:48 -0800)]
Merge pull request #51 from ravishnair/webtest-improvement

-- applied patch and made some modifications

11 years agoMerge pull request #49 from dlobo/CRM-12027
Kurund Jalmi [Wed, 6 Mar 2013 09:36:27 +0000 (01:36 -0800)]
Merge pull request #49 from dlobo/CRM-12027

fix CRM-12027

11 years agoMerge pull request #47 from dlobo/CRM-11915
Kurund Jalmi [Wed, 6 Mar 2013 09:35:24 +0000 (01:35 -0800)]
Merge pull request #47 from dlobo/CRM-11915

fix CRM-11915

11 years agoRemove SVN-focused "build-tarballs"
Tim Otten [Wed, 6 Mar 2013 09:34:02 +0000 (04:34 -0500)]
Remove SVN-focused "build-tarballs"

11 years agoCRM-11658 - "releaser/self-update"
Tim Otten [Wed, 6 Mar 2013 09:29:36 +0000 (04:29 -0500)]
CRM-11658 - "releaser/self-update"

Add script to download the releaser+gitify. This should be used on the production build environment instead of maintaining an extraneous working-copy.

11 years agoDon't use "set -x" until after parsing command-line arguments
Tim Otten [Wed, 6 Mar 2013 09:28:19 +0000 (04:28 -0500)]
Don't use "set -x" until after parsing command-line arguments

11 years agoCRM-11658 - "releaser" for git - Changes from old "build-tarballs":
Tim Otten [Wed, 6 Mar 2013 09:22:59 +0000 (04:22 -0500)]
CRM-11658 - "releaser" for git - Changes from old "build-tarballs":
 * Fetch code with "gitify"
 * Make coordinated tags and push them (instead of using post-commit hook on single repo)
 * Extract hard-coded references to sf.net
 * Split into smaller functions (which are more explanatory and easier to toggle for testing)
 * Document configuration file format
 * Rename executable variables (e.g. $php => $cmd_php)
 * Use "set -ex" to catch errors

11 years agoMerge pull request #50 from yashodha/fix-version
Kurund Jalmi [Wed, 6 Mar 2013 09:16:24 +0000 (01:16 -0800)]
Merge pull request #50 from yashodha/fix-version

fix version

11 years ago-- applied patch and made some modifications
Ravish Nair [Wed, 6 Mar 2013 08:23:17 +0000 (13:53 +0530)]
-- applied patch and made some modifications

11 years agofix version
yashodha [Wed, 6 Mar 2013 07:21:06 +0000 (12:51 +0530)]
fix version

11 years agofix CRM-12027
Donald A. Lobo [Wed, 6 Mar 2013 05:42:15 +0000 (21:42 -0800)]
fix CRM-12027

11 years agoMerge pull request #48 from dlobo/CRM-11435
Kurund Jalmi [Wed, 6 Mar 2013 02:20:49 +0000 (18:20 -0800)]
Merge pull request #48 from dlobo/CRM-11435

fix CRM-11435

11 years agofix typo in comment
dlobo [Wed, 6 Mar 2013 01:47:20 +0000 (17:47 -0800)]
fix typo in comment

11 years agoMerge pull request #46 from dlobo/CRM-11994
Tim Otten [Tue, 5 Mar 2013 22:59:53 +0000 (14:59 -0800)]
Merge pull request #46 from dlobo/CRM-11994

fix CRM-11994 and also a bunch of php 5.4 notices

11 years agofix CRM-11435
Donald A. Lobo [Tue, 5 Mar 2013 22:57:30 +0000 (14:57 -0800)]
fix CRM-11435

11 years agoadd comment for CRM-11994
Donald A. Lobo [Tue, 5 Mar 2013 22:12:52 +0000 (14:12 -0800)]
add comment for CRM-11994

11 years agofix CRM-11915
Donald A. Lobo [Tue, 5 Mar 2013 21:58:55 +0000 (13:58 -0800)]
fix CRM-11915

11 years agofix CRM-11994 and also a bunch of php 5.4 notices
Donald A. Lobo [Tue, 5 Mar 2013 21:54:26 +0000 (13:54 -0800)]
fix CRM-11994 and also a bunch of php 5.4 notices

11 years agoMerge pull request #45 from totten/dist-fixes
Tim Otten [Tue, 5 Mar 2013 21:34:51 +0000 (13:34 -0800)]
Merge pull request #45 from totten/dist-fixes

CRM-11658 - distmaker - Centralize exclude list; exclude various files that originated in SVN's "tools/packages"

11 years agoCRM-11658 - distmaker - Centralize exclude list; exclude various files that originate...
Tim Otten [Tue, 5 Mar 2013 21:12:53 +0000 (16:12 -0500)]
CRM-11658 - distmaker - Centralize exclude list; exclude various files that originated in SVN's "tools/packages"

11 years agoMerge pull request #44 from kurund/distmaker-fixes
Kurund Jalmi [Tue, 5 Mar 2013 20:23:25 +0000 (12:23 -0800)]
Merge pull request #44 from kurund/distmaker-fixes

fixed distmaker script for d6/d7

11 years agofixed distmaker script for d6/d7
Kurund Jalmi [Tue, 5 Mar 2013 20:21:49 +0000 (01:51 +0530)]
fixed distmaker script for d6/d7

11 years agoMerge pull request #43 from pradpnayak/webtest
Kurund Jalmi [Tue, 5 Mar 2013 19:41:04 +0000 (11:41 -0800)]
Merge pull request #43 from pradpnayak/webtest

--code cleanup for CRM-11986

11 years agoMerge pull request #42 from pradpnayak/CRM-11983
Kurund Jalmi [Tue, 5 Mar 2013 19:40:30 +0000 (11:40 -0800)]
Merge pull request #42 from pradpnayak/CRM-11983

--fixed for CRM-11983

11 years agoMerge pull request #41 from pradpnayak/CRM-11467
Kurund Jalmi [Tue, 5 Mar 2013 19:38:47 +0000 (11:38 -0800)]
Merge pull request #41 from pradpnayak/CRM-11467

--fixed for CRM-11467

11 years ago--fixed for CRM-11983
Pradeep Nayak [Tue, 5 Mar 2013 18:50:13 +0000 (00:20 +0530)]
--fixed for CRM-11983

11 years ago--fixed for CRM-11467
Pradeep Nayak [Tue, 5 Mar 2013 18:47:36 +0000 (00:17 +0530)]
--fixed for CRM-11467

11 years agoMerge pull request #40 from kurund/upgrade-fixes
Kurund Jalmi [Tue, 5 Mar 2013 15:00:48 +0000 (07:00 -0800)]
Merge pull request #40 from kurund/upgrade-fixes

fixed call to upgrade templates CRM-12002