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
Kurund Jalmi [Mon, 4 Mar 2013 10:16:46 +0000 (02:16 -0800)]
Merge pull request #18 from pradpnayak/webtest-CRM-11986
--used $this->openCiviPage() method instead $this->open(), CRM-11986
Kurund Jalmi [Mon, 4 Mar 2013 10:14:33 +0000 (02:14 -0800)]
Merge pull request #19 from ravishnair/webtest-fixes
-- webtests cleanup
Ravish Nair [Mon, 4 Mar 2013 08:07:12 +0000 (13:37 +0530)]
-- webtests cleanup
Pradeep Nayak [Mon, 4 Mar 2013 07:47:39 +0000 (13:17 +0530)]
--used $this->openCiviPage() method instead $this->open(), CRM-11986
Kurund Jalmi [Mon, 4 Mar 2013 07:22:30 +0000 (23:22 -0800)]
Merge pull request #17 from deepak-srivastava/civicrm43
- CRM-11968
Deepak Srivastava [Mon, 4 Mar 2013 06:24:38 +0000 (11:54 +0530)]
- CRM-11968
Kurund Jalmi [Sun, 3 Mar 2013 21:04:47 +0000 (13:04 -0800)]
Merge pull request #16 from pradpnayak/webtest-CRM-11986
--added webtest for CRM-11986
Kurund Jalmi [Sun, 3 Mar 2013 21:01:59 +0000 (13:01 -0800)]
Merge pull request #15 from totten/setup-conf-advice
Display informative warning if setup.conf is missing.
Tim Otten [Sun, 3 Mar 2013 04:58:36 +0000 (20:58 -0800)]
Merge pull request #12 from dlobo/CRM-12003
Fix for CRM-12003
Tim Otten [Sun, 3 Mar 2013 04:04:10 +0000 (23:04 -0500)]
Display informative warning if setup.conf is missing.
Donald A. Lobo [Sat, 2 Mar 2013 22:31:06 +0000 (14:31 -0800)]
fix CRM-12005
Donald A. Lobo [Sat, 2 Mar 2013 22:23:28 +0000 (14:23 -0800)]
fix CRM-12004
Donald A. Lobo [Sat, 2 Mar 2013 22:17:42 +0000 (14:17 -0800)]
fix CRM-12003
Donald A. Lobo [Sat, 2 Mar 2013 22:09:57 +0000 (14:09 -0800)]
fix CRM-12003
Kurund Jalmi [Sat, 2 Mar 2013 16:41:27 +0000 (08:41 -0800)]
Merge pull request #11 from davecivicrm/CRM-11534
Crm 11534
colemanw [Sat, 2 Mar 2013 01:30:42 +0000 (17:30 -0800)]
Merge pull request #10 from colemanw/tests
Make webtest helper fn for enabling components
Dave Greenberg [Sat, 2 Mar 2013 01:27:48 +0000 (17:27 -0800)]
additional fixes for WebTest_Contribute_AddPricesetTest. All methods run ok now in my local sandbox.
Coleman Watts [Sat, 2 Mar 2013 01:27:42 +0000 (17:27 -0800)]
Needed to add this file too
Coleman Watts [Sat, 2 Mar 2013 01:23:37 +0000 (17:23 -0800)]
Make helper fn for enabling components
Tim Otten [Fri, 1 Mar 2013 20:03:29 +0000 (12:03 -0800)]
Merge pull request #9 from dlobo/CRM-11995
fix CRM-11995
Dave Greenberg [Fri, 1 Mar 2013 19:36:36 +0000 (11:36 -0800)]
initial fixes
Donald A. Lobo [Fri, 1 Mar 2013 18:59:11 +0000 (10:59 -0800)]
fix CRM-11995
Kurund Jalmi [Fri, 1 Mar 2013 17:51:14 +0000 (09:51 -0800)]
Merge pull request #8 from kurund/matrix
update gitify help
Kurund Jalmi [Fri, 1 Mar 2013 17:49:20 +0000 (23:19 +0530)]
update gitify help
Kurund Jalmi [Fri, 1 Mar 2013 17:38:00 +0000 (09:38 -0800)]
Merge pull request #7 from pratik-joshi/webtests-cleanup-and-fixes
more webtest cleanup and code improvement
Pratik Joshi [Fri, 1 Mar 2013 16:36:48 +0000 (22:06 +0530)]
more webtest cleanup and code improvement
Kurund Jalmi [Fri, 1 Mar 2013 14:18:51 +0000 (06:18 -0800)]
Merge pull request #6 from pratik-joshi/webtests-cleanup-and-fixes
webtests cleanup
Kurund Jalmi [Fri, 1 Mar 2013 13:19:56 +0000 (05:19 -0800)]
Merge pull request #5 from tttp/CRM-11926_upstream
CRM-11926 add a better error handling for db errors in the api
Kurund Jalmi [Fri, 1 Mar 2013 13:13:30 +0000 (05:13 -0800)]
Merge pull request #4 from ravishnair/webtest-fixes
-- webtest cleanup (used openCiviPage function in place of open)
Kurund Jalmi [Fri, 1 Mar 2013 13:10:50 +0000 (05:10 -0800)]
Merge pull request #3 from kurund/matrix
fixed the language and variable refering to svn
Xavier Dutoit [Fri, 1 Mar 2013 11:51:56 +0000 (12:51 +0100)]
CRM-11926 add a better error handling for db errors in the api
Kurund Jalmi [Fri, 1 Mar 2013 11:44:47 +0000 (17:14 +0530)]
fixed the language and variable refering to svn
Ravish Nair [Fri, 1 Mar 2013 13:06:25 +0000 (18:36 +0530)]
-- webtest cleanup (used openCiviPage function in place of open)
Pradeep Nayak [Fri, 1 Mar 2013 12:07:41 +0000 (17:37 +0530)]
--added webtest for CRM-11986
Pratik Joshi [Fri, 1 Mar 2013 12:00:11 +0000 (17:30 +0530)]
webtests cleanup
projects / civicrm-core.git / log