Donald A. Lobo [Mon, 11 Mar 2013 22:29:02 +0000 (15:29 -0700)]
fix CRM-12096
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
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
Coleman Watts [Thu, 7 Mar 2013 00:53:20 +0000 (16:53 -0800)]
Remove unneeded param
Coleman Watts [Thu, 7 Mar 2013 00:50:24 +0000 (16:50 -0800)]
Add dynamic loading of help text for custom fields CRM-12038
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
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
Tim Otten [Thu, 7 Mar 2013 00:23:35 +0000 (19:23 -0500)]
CRM-12030 - Use getRelUrls() instead of getRelPaths() to construct URLs
Tim Otten [Thu, 7 Mar 2013 00:11:02 +0000 (19:11 -0500)]
CRM-12030 - Always use '/' in URLs (even for Windows)
Coleman Watts [Wed, 6 Mar 2013 23:36:01 +0000 (15:36 -0800)]
Fix 'leave page' alert in IE CRM-12019
Tim Otten [Wed, 6 Mar 2013 22:36:08 +0000 (17:36 -0500)]
CRM-11658 - releaser - Fix GPG bug
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
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
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
Tim Otten [Wed, 6 Mar 2013 21:46:54 +0000 (16:46 -0500)]
CRM-11658 - releaser - Tweak help text to be more realistic
Kurund Jalmi [Wed, 6 Mar 2013 17:35:37 +0000 (09:35 -0800)]
Merge pull request #64 from dlobo/CRM-12034
fix CRM-12034
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
Kurund Jalmi [Wed, 6 Mar 2013 17:34:17 +0000 (09:34 -0800)]
Merge pull request #62 from pratik-joshi/webtest-improvement
Webtest improvement
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
Donald A. Lobo [Wed, 6 Mar 2013 17:15:05 +0000 (09:15 -0800)]
fix CRM-12034
Ravish Nair [Wed, 6 Mar 2013 16:19:07 +0000 (21:49 +0530)]
-- applied patch and made some modifications
Pratik Joshi [Wed, 6 Mar 2013 15:47:46 +0000 (21:17 +0530)]
webtest cleanup and code improvement(using helper function)
Pratik Joshi [Wed, 6 Mar 2013 15:17:35 +0000 (20:47 +0530)]
webtest cleanup and code improvement
Pradeep Nayak [Wed, 6 Mar 2013 15:34:46 +0000 (21:04 +0530)]
-fixed for CRM-12017
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
Pratik Joshi [Wed, 6 Mar 2013 14:14:56 +0000 (19:44 +0530)]
webtest cleanup and code 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
Ravish Nair [Wed, 6 Mar 2013 13:10:50 +0000 (18:40 +0530)]
-- applied patches and made some modifications
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
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
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
Deepak Srivastava [Wed, 6 Mar 2013 12:24:34 +0000 (17:54 +0530)]
demo processor fix
Deepak Srivastava [Wed, 6 Mar 2013 12:23:16 +0000 (17:53 +0530)]
demo processor fix
Pratik Joshi [Wed, 6 Mar 2013 11:27:12 +0000 (16:57 +0530)]
test case for CRM-11960
Pratik Joshi [Wed, 6 Mar 2013 10:15:27 +0000 (15:45 +0530)]
fix for CRM-11960
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
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
Kurund Jalmi [Wed, 6 Mar 2013 09:36:27 +0000 (01:36 -0800)]
Merge pull request #49 from dlobo/CRM-12027
fix CRM-12027
Kurund Jalmi [Wed, 6 Mar 2013 09:35:24 +0000 (01:35 -0800)]
Merge pull request #47 from dlobo/CRM-11915
fix CRM-11915
Tim Otten [Wed, 6 Mar 2013 09:34:02 +0000 (04:34 -0500)]
Remove SVN-focused "build-tarballs"
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.
Tim Otten [Wed, 6 Mar 2013 09:28:19 +0000 (04:28 -0500)]
Don't use "set -x" until after parsing command-line arguments
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
Kurund Jalmi [Wed, 6 Mar 2013 09:16:24 +0000 (01:16 -0800)]
Merge pull request #50 from yashodha/fix-version
fix version
Ravish Nair [Wed, 6 Mar 2013 08:23:17 +0000 (13:53 +0530)]
-- applied patch and made some modifications
yashodha [Wed, 6 Mar 2013 07:21:06 +0000 (12:51 +0530)]
fix version
Donald A. Lobo [Wed, 6 Mar 2013 05:42:15 +0000 (21:42 -0800)]
fix CRM-12027
Kurund Jalmi [Wed, 6 Mar 2013 02:20:49 +0000 (18:20 -0800)]
Merge pull request #48 from dlobo/CRM-11435
fix CRM-11435
dlobo [Wed, 6 Mar 2013 01:47:20 +0000 (17:47 -0800)]
fix typo in comment
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
Donald A. Lobo [Tue, 5 Mar 2013 22:57:30 +0000 (14:57 -0800)]
fix CRM-11435
Donald A. Lobo [Tue, 5 Mar 2013 22:12:52 +0000 (14:12 -0800)]
add comment for CRM-11994
Donald A. Lobo [Tue, 5 Mar 2013 21:58:55 +0000 (13:58 -0800)]
fix CRM-11915
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
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"
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"
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
Kurund Jalmi [Tue, 5 Mar 2013 20:21:49 +0000 (01:51 +0530)]
fixed distmaker script for d6/d7
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
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
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
Pradeep Nayak [Tue, 5 Mar 2013 18:50:13 +0000 (00:20 +0530)]
--fixed for CRM-11983
Pradeep Nayak [Tue, 5 Mar 2013 18:47:36 +0000 (00:17 +0530)]
--fixed for CRM-11467
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
Kurund Jalmi [Tue, 5 Mar 2013 14:59:28 +0000 (20:29 +0530)]
fixed call to upgrade templates CRM-12002
Kurund Jalmi [Tue, 5 Mar 2013 13:38:53 +0000 (05:38 -0800)]
Merge pull request #39 from deepak-srivastava/crm
CRM-11968 : fixed no diff to display problem for multiple targets
Deepak Srivastava [Tue, 5 Mar 2013 12:47:02 +0000 (18:17 +0530)]
CRM-11968 : fixed no diff to display problem for multiple targets
Kurund Jalmi [Tue, 5 Mar 2013 11:29:59 +0000 (03:29 -0800)]
Merge pull request #38 from kurund/regen-data
removed unwanted regen.sh.txt and updated generated data
Kurund Jalmi [Tue, 5 Mar 2013 11:27:15 +0000 (16:57 +0530)]
removed unwanted regen.sh.txt and updated generated data
Kurund Jalmi [Tue, 5 Mar 2013 10:53:02 +0000 (02:53 -0800)]
Merge pull request #37 from ravishnair/webtest-fixes
-- webtest fixes and improvement
Kurund Jalmi [Tue, 5 Mar 2013 10:51:22 +0000 (02:51 -0800)]
Merge pull request #36 from kurund/CRM-12011
worked on CRM-12011
Ravish Nair [Tue, 5 Mar 2013 10:41:47 +0000 (16:11 +0530)]
-- webtest fixes and improvement
Kurund Jalmi [Tue, 5 Mar 2013 10:40:34 +0000 (16:10 +0530)]
worked on CRM-12011
Kurund Jalmi [Tue, 5 Mar 2013 10:15:25 +0000 (02:15 -0800)]
Merge pull request #35 from kurund/CRM-12012
CRM-12012
Kurund Jalmi [Tue, 5 Mar 2013 10:08:33 +0000 (15:38 +0530)]
fixed adding of client for multi-client mode, problem was with the page being redirected before relationship was saved, CRM-12012
Kurund Jalmi [Tue, 5 Mar 2013 09:58:04 +0000 (15:28 +0530)]
template cleanup
Kurund Jalmi [Tue, 5 Mar 2013 09:55:17 +0000 (15:25 +0530)]
fixed js error, CRM-12012
Kurund Jalmi [Tue, 5 Mar 2013 07:38:45 +0000 (23:38 -0800)]
Merge pull request #27 from dlobo/CRM-12002
Fix CRM-12002
Tim Otten [Tue, 5 Mar 2013 05:08:48 +0000 (21:08 -0800)]
Merge pull request #31 from eileenmcnaughton/CRM-12008
CRM-12008 Enotice fixes on create user
Tim Otten [Tue, 5 Mar 2013 04:53:22 +0000 (20:53 -0800)]
Merge pull request #26 from dlobo/CRM-12007
fix CRM-12007
Tim Otten [Tue, 5 Mar 2013 04:51:43 +0000 (20:51 -0800)]
Merge pull request #32 from davecivicrm/CRM-11534
Fixes for WebTest_Contribute_ContributionPageAddTest
Dave Greenberg [Tue, 5 Mar 2013 02:29:56 +0000 (18:29 -0800)]
Fixes for WebTest_Contribute_ContributionPageAddTest
Tim Otten [Tue, 5 Mar 2013 02:17:27 +0000 (21:17 -0500)]
Fix bad merge in civicrm_generated.mysql
eileen [Tue, 5 Mar 2013 00:27:31 +0000 (13:27 +1300)]
CRM-12008 e-Notice fixes
Conflicts:
CRM/Utils/System/Drupal.php
eileen [Mon, 4 Mar 2013 23:57:36 +0000 (12:57 +1300)]
CRM-12010 Drupal 7 create user class doesn't support multiple creates
Tim Otten [Mon, 4 Mar 2013 21:56:45 +0000 (13:56 -0800)]
Merge pull request #14 from dlobo/CRM-12005
Fix for CRM-12005 and CRM-12004
Donald A. Lobo [Mon, 4 Mar 2013 21:45:22 +0000 (13:45 -0800)]
sync with upstream master
Tim Otten [Mon, 4 Mar 2013 20:56:49 +0000 (12:56 -0800)]
Merge pull request #28 from mlutfy/ts-fixes
Fix ts() usage in activityView() popup.
Mathieu Lutfy [Mon, 4 Mar 2013 19:53:01 +0000 (14:53 -0500)]
Fix ts() usage in activityView() popup.
Donald A. Lobo [Mon, 4 Mar 2013 17:47:24 +0000 (09:47 -0800)]
fix CRM-12002
Donald A. Lobo [Mon, 4 Mar 2013 17:46:33 +0000 (09:46 -0800)]
fix CRM-12002
Donald A. Lobo [Mon, 4 Mar 2013 16:43:42 +0000 (08:43 -0800)]
fix CRM-12007
Kurund Jalmi [Mon, 4 Mar 2013 15:16:39 +0000 (07:16 -0800)]
Merge pull request #25 from ravishnair/webtest-fixes
-- Used openCiviPage and assertElementContainsText methods in webtests
Kurund Jalmi [Mon, 4 Mar 2013 13:44:57 +0000 (05:44 -0800)]
Merge pull request #24 from deepak-srivastava/
24571eeacd20595493c8077eb0e0c01ea814b9df
CRM-12000
Ravish Nair [Mon, 4 Mar 2013 13:36:55 +0000 (19:06 +0530)]
-- Used openCiviPage and assertElementContainsText methods in webtests
Deepak Srivastava [Mon, 4 Mar 2013 12:09:05 +0000 (17:39 +0530)]
CRM-12000
Kurund Jalmi [Mon, 4 Mar 2013 13:04:57 +0000 (05:04 -0800)]
Merge pull request #23 from pratik-joshi/webtests-cleanup
Webtests cleanup
Pratik Joshi [Mon, 4 Mar 2013 10:48:19 +0000 (16:18 +0530)]
webtest code improvement (using helper functions)
Pratik Joshi [Mon, 4 Mar 2013 09:58:37 +0000 (15:28 +0530)]
webtest code improvement(using helper functions of CiviSeleniumTestCase) and cleanup
Pradeep Nayak [Mon, 4 Mar 2013 11:04:16 +0000 (16:34 +0530)]
--code cleanup for CRM-11986
projects / civicrm-core.git / log