dlobo [Tue, 23 Apr 2013 22:38:59 +0000 (15:38 -0700)]
Merge pull request #520 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 22:37:43 +0000 (15:37 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 22:36:20 +0000 (15:36 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Tim Otten [Tue, 23 Apr 2013 22:20:45 +0000 (15:20 -0700)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-23-15-17-29
Conflicts:
CRM/Core/BAO/ActionSchedule.php
sql/civicrm_generated.mysql
xml/version.xml
dlobo [Tue, 23 Apr 2013 22:04:50 +0000 (15:04 -0700)]
Merge pull request #517 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 22:03:50 +0000 (15:03 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Kurund Jalmi [Tue, 23 Apr 2013 22:02:17 +0000 (15:02 -0700)]
Merge pull request #516 from yashodha/activity-migration
Activity migration
yashodha [Tue, 23 Apr 2013 22:00:38 +0000 (03:30 +0530)]
api fixes
yashodha [Tue, 23 Apr 2013 21:00:05 +0000 (02:30 +0530)]
CRM-12274
Kurund Jalmi [Tue, 23 Apr 2013 21:51:46 +0000 (14:51 -0700)]
Merge pull request #515 from kurund/CRM-12395
verified the work on CRM-12395
Kurund Jalmi [Tue, 23 Apr 2013 21:48:56 +0000 (14:48 -0700)]
verified the work on CRM-12395
dlobo [Tue, 23 Apr 2013 21:28:16 +0000 (14:28 -0700)]
Merge pull request #513 from dlobo/master
Get CRM tests working with activity changes
Donald A. Lobo [Tue, 23 Apr 2013 21:26:28 +0000 (14:26 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 21:25:01 +0000 (14:25 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
dlobo [Tue, 23 Apr 2013 20:28:57 +0000 (13:28 -0700)]
Merge pull request #510 from adamwight/respect_includeOrderByClause
Respect includeOrderByClause in quicksearch
dlobo [Tue, 23 Apr 2013 19:36:07 +0000 (12:36 -0700)]
Merge pull request #511 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 19:35:04 +0000 (12:35 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Kurund Jalmi [Tue, 23 Apr 2013 19:28:57 +0000 (12:28 -0700)]
Merge pull request #481 from dlobo/CRM-12368
CRM-12368
Adam Roses Wight [Thu, 11 Apr 2013 23:30:03 +0000 (16:30 -0700)]
Respect includeOrderByClause in quicksearch
CRM-12326 Name search is not using indexes correctly
Kurund Jalmi [Tue, 23 Apr 2013 18:06:01 +0000 (11:06 -0700)]
Merge pull request #509 from yashodha/CRM-12401
CRM-12401
yashodha [Tue, 23 Apr 2013 17:37:20 +0000 (23:07 +0530)]
CRM-12401
yashodha [Tue, 23 Apr 2013 17:25:34 +0000 (22:55 +0530)]
CRM-12401
Kurund Jalmi [Tue, 23 Apr 2013 16:01:34 +0000 (09:01 -0700)]
Merge pull request #506 from ravishnair/CRM-12292
-- fix for CRM-12292
Kurund Jalmi [Tue, 23 Apr 2013 15:58:01 +0000 (08:58 -0700)]
Merge pull request #507 from deepak-srivastava/mastro
Improvments in demo management scripts
dlobo [Tue, 23 Apr 2013 15:50:59 +0000 (08:50 -0700)]
Merge pull request #508 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 15:49:01 +0000 (08:49 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Deepak Srivastava [Tue, 23 Apr 2013 15:41:54 +0000 (21:11 +0530)]
Improvments in demo management scripts
Ravish Nair [Tue, 23 Apr 2013 06:55:25 +0000 (12:25 +0530)]
-- fix for CRM-12292
Kurund Jalmi [Tue, 23 Apr 2013 05:21:53 +0000 (22:21 -0700)]
Merge pull request #504 from yashodha/more-work
CRM-12274
yashodha [Tue, 23 Apr 2013 05:16:44 +0000 (10:46 +0530)]
CRM-12274
Kurund Jalmi [Tue, 23 Apr 2013 05:08:20 +0000 (22:08 -0700)]
Merge pull request #505 from eileenmcnaughton/4.3
CRM-12405 - patch for additional logging on failed IPN calls
yashodha [Tue, 23 Apr 2013 04:58:14 +0000 (10:28 +0530)]
CRM-12274
eileen [Tue, 23 Apr 2013 00:43:33 +0000 (12:43 +1200)]
CRM-12405 - patch for additional logging on failed IPN calls
yashodha [Tue, 23 Apr 2013 00:58:43 +0000 (06:28 +0530)]
CRM-12274
Kurund Jalmi [Mon, 22 Apr 2013 22:35:21 +0000 (15:35 -0700)]
Merge pull request #500 from yashodha/more-work
CRM-12357
Kurund Jalmi [Mon, 22 Apr 2013 22:34:41 +0000 (15:34 -0700)]
Merge pull request #501 from totten/selenium-remote
CRM-11948 - Apply patch for running with a remote Selenium server.
Kurund Jalmi [Mon, 22 Apr 2013 22:34:14 +0000 (15:34 -0700)]
Merge pull request #502 from colemanw/versionCheck
Shorter cache duration for versionCheck
Kurund Jalmi [Mon, 22 Apr 2013 22:33:48 +0000 (15:33 -0700)]
Merge pull request #503 from dlobo/CRM-12396
CRM-12396
Kurund Jalmi [Mon, 22 Apr 2013 22:33:08 +0000 (15:33 -0700)]
Merge pull request #499 from deepak-srivastava/ninja
Fix for CRM-12391
Donald A. Lobo [Mon, 22 Apr 2013 21:55:38 +0000 (14:55 -0700)]
CRM-12396
----------------------------------------
* CRM-12396: tokens in html not transformed
http://issues.civicrm.org/jira/browse/CRM-12396
Coleman Watts [Mon, 22 Apr 2013 17:20:08 +0000 (10:20 -0700)]
Shorter cache duration for versionCheck
Tim Otten [Mon, 22 Apr 2013 17:06:25 +0000 (10:06 -0700)]
CRM-11948 - Apply patch for running with a remote Selenium server. (This isn't currently/strictly needed for CRM-11948 but was previously written for it -- and it's come up in other contexts.)
----------------------------------------
* CRM-11948: Run WebTests under Jenkins
http://issues.civicrm.org/jira/browse/CRM-11948
yashodha [Mon, 22 Apr 2013 14:57:18 +0000 (20:27 +0530)]
CRM-12357
Deepak Srivastava [Mon, 22 Apr 2013 12:14:49 +0000 (17:44 +0530)]
Fix for CRM-12391
Kurund Jalmi [Mon, 22 Apr 2013 02:07:15 +0000 (19:07 -0700)]
Merge pull request #498 from kurund/CRM-12357
worked on CRM-12357, basic mailing tab is now functional to display cont...
Kurund Jalmi [Mon, 22 Apr 2013 02:05:58 +0000 (19:05 -0700)]
Merge pull request #497 from yashodha/more-work
clean up(CRM-12274)
Kurund Jalmi [Mon, 22 Apr 2013 01:44:48 +0000 (18:44 -0700)]
worked on CRM-12357, basic mailing tab is now functional to display contact mailings
yashodha [Mon, 22 Apr 2013 00:38:11 +0000 (06:08 +0530)]
clean up(CRM-12274)
Kurund Jalmi [Sun, 21 Apr 2013 22:45:53 +0000 (15:45 -0700)]
Merge pull request #496 from kurund/gen-data
fixed generated data
kurund [Sun, 21 Apr 2013 22:43:00 +0000 (04:13 +0530)]
fixed generated data
Kurund Jalmi [Sun, 21 Apr 2013 22:34:25 +0000 (15:34 -0700)]
Merge pull request #495 from yashodha/CRM-12357
CRM-12357
Kurund Jalmi [Sun, 21 Apr 2013 22:33:30 +0000 (15:33 -0700)]
Merge pull request #494 from kurund/CRM-12357
updated generated data
yashodha [Sun, 21 Apr 2013 19:21:12 +0000 (00:51 +0530)]
CRM-12357
Kurund Jalmi [Sun, 21 Apr 2013 22:32:02 +0000 (15:32 -0700)]
update generated data
Kurund Jalmi [Sun, 21 Apr 2013 18:51:29 +0000 (11:51 -0700)]
Merge pull request #492 from dlobo/CRM-12394
CRM-12394
Donald A. Lobo [Sun, 21 Apr 2013 16:46:28 +0000 (09:46 -0700)]
CRM-12394
----------------------------------------
* CRM-12394: Typo in "Name Tent" event badge class causes fatal error
http://issues.civicrm.org/jira/browse/CRM-12394
Kurund Jalmi [Sun, 21 Apr 2013 06:58:31 +0000 (23:58 -0700)]
Merge pull request #491 from dlobo/MiscFixes
send right number of parameters to function
Kurund Jalmi [Sat, 20 Apr 2013 21:56:06 +0000 (14:56 -0700)]
Merge pull request #488 from kurund/notice-fixes
notice fixes
Kurund Jalmi [Sat, 20 Apr 2013 21:55:52 +0000 (14:55 -0700)]
Merge pull request #490 from yashodha/more-CRM-12274
more-CRM-12274
Kurund Jalmi [Sat, 20 Apr 2013 21:55:39 +0000 (14:55 -0700)]
Merge pull request #489 from yashodha/CRM-12274
CRM-12274
yashodha [Sat, 20 Apr 2013 21:00:24 +0000 (02:30 +0530)]
more-CRM-12274
yashodha [Sat, 20 Apr 2013 20:34:37 +0000 (02:04 +0530)]
CRM-12274
yashodha [Sat, 20 Apr 2013 20:10:15 +0000 (01:40 +0530)]
CRM-12274
yashodha [Sat, 20 Apr 2013 18:54:18 +0000 (00:24 +0530)]
more-CRM-12274
Donald A. Lobo [Sat, 20 Apr 2013 15:29:39 +0000 (08:29 -0700)]
send right number of parameters to function
Kurund Jalmi [Sat, 20 Apr 2013 07:52:30 +0000 (00:52 -0700)]
notice fixes
Kurund Jalmi [Sat, 20 Apr 2013 06:14:34 +0000 (23:14 -0700)]
Merge pull request #482 from colemanw/CRM-12382
Fix CRM-12382
Kurund Jalmi [Sat, 20 Apr 2013 06:09:31 +0000 (23:09 -0700)]
Merge pull request #485 from dlobo/CRM-12386
CRM-12386
Kurund Jalmi [Sat, 20 Apr 2013 06:08:23 +0000 (23:08 -0700)]
Merge pull request #484 from dlobo/CRM-12385
CRM-12385
Kurund Jalmi [Sat, 20 Apr 2013 06:07:54 +0000 (23:07 -0700)]
Merge pull request #486 from dlobo/CRM-12390
CRM-12390
Donald A. Lobo [Sat, 20 Apr 2013 02:48:36 +0000 (19:48 -0700)]
CRM-12390
----------------------------------------
* CRM-12390: Triggers should not include database name when logging is to the same DB
http://issues.civicrm.org/jira/browse/CRM-12390
yashodha [Sat, 20 Apr 2013 00:46:11 +0000 (06:16 +0530)]
CRM-12274
Kurund Jalmi [Fri, 19 Apr 2013 21:00:15 +0000 (14:00 -0700)]
Merge branch 'master' of github.com:civicrm/civicrm-core
Kurund Jalmi [Fri, 19 Apr 2013 18:05:06 +0000 (11:05 -0700)]
Merge pull request #483 from deepak-srivastava/mastro
scripts for managing demo sites and their pristines
Donald A. Lobo [Fri, 19 Apr 2013 16:23:19 +0000 (09:23 -0700)]
CRM-12386
----------------------------------------
* CRM-12386: Ensure civicrm_root is escaped in WP install script
http://issues.civicrm.org/jira/browse/CRM-12386
Donald A. Lobo [Fri, 19 Apr 2013 14:40:08 +0000 (07:40 -0700)]
CRM-12385
----------------------------------------
* CRM-12385: SQL error in Payment Express Payment processing module
http://issues.civicrm.org/jira/browse/CRM-12385
Donald A. Lobo [Fri, 19 Apr 2013 14:39:14 +0000 (07:39 -0700)]
CRM-12385
----------------------------------------
* CRM-12385: SQL error in Payment Express Payment processing module
http://issues.civicrm.org/jira/browse/CRM-12385
Deepak Srivastava [Fri, 19 Apr 2013 13:55:27 +0000 (19:25 +0530)]
scripts for managing demo sites and their pristines
Kurund Jalmi [Fri, 19 Apr 2013 07:04:20 +0000 (00:04 -0700)]
Merge pull request #476 from yashodha/fixscript
fix script to pass correct fee_amount parameter
Kurund Jalmi [Fri, 19 Apr 2013 07:03:26 +0000 (00:03 -0700)]
Merge pull request #480 from colemanw/css
css tweaks
Coleman Watts [Fri, 19 Apr 2013 05:49:45 +0000 (22:49 -0700)]
Fix CRM-12382
Coleman Watts [Fri, 19 Apr 2013 00:02:32 +0000 (17:02 -0700)]
Fix fonts for IE compatability CRM-12381
Coleman Watts [Thu, 18 Apr 2013 23:35:06 +0000 (16:35 -0700)]
js/whitespace cleanup
Coleman Watts [Thu, 18 Apr 2013 23:30:21 +0000 (16:30 -0700)]
css tweaks
Donald A. Lobo [Thu, 18 Apr 2013 23:29:18 +0000 (16:29 -0700)]
CRM-12368
----------------------------------------
* CRM-12368: proximity search via advanced search broken
http://issues.civicrm.org/jira/browse/CRM-12368
Donald A. Lobo [Thu, 18 Apr 2013 23:26:33 +0000 (16:26 -0700)]
CRM-12368
----------------------------------------
* CRM-12368: proximity search via advanced search broken
http://issues.civicrm.org/jira/browse/CRM-12368
Donald A. Lobo [Thu, 18 Apr 2013 23:23:22 +0000 (16:23 -0700)]
CRM-12368
----------------------------------------
* CRM-12368: proximity search via advanced search broken
http://issues.civicrm.org/jira/browse/CRM-12368
Tim Otten [Thu, 18 Apr 2013 23:15:54 +0000 (16:15 -0700)]
Merge pull request #479 from colemanw/releaser
Improve "update" mode in releaser to escape regex and show diff
Coleman Watts [Thu, 18 Apr 2013 22:56:26 +0000 (15:56 -0700)]
Improve "update" mode in releaser to escape regex and show diff
Kurund Jalmi [Thu, 18 Apr 2013 22:07:30 +0000 (15:07 -0700)]
Merge pull request #478 from kurund/regen-data
fixed generate data
kurund [Thu, 18 Apr 2013 22:05:48 +0000 (03:35 +0530)]
fixed generate data
yashodha [Thu, 18 Apr 2013 20:02:45 +0000 (01:32 +0530)]
fix script to pass correct fee_amount parameter
CiviCRM [Thu, 18 Apr 2013 19:23:24 +0000 (12:23 -0700)]
Update version to 4.3.2
Tim Otten [Thu, 18 Apr 2013 17:53:57 +0000 (10:53 -0700)]
Merge pull request #469 from colemanw/versionUpdate
Add 'update' to releaser script
colemanw [Thu, 18 Apr 2013 15:03:42 +0000 (08:03 -0700)]
Merge pull request #475 from ravishnair/webtest-fix
-- webtest fix
Ravish Nair [Thu, 18 Apr 2013 14:38:35 +0000 (20:08 +0530)]
-- webtest fix
colemanw [Thu, 18 Apr 2013 14:24:07 +0000 (07:24 -0700)]
Merge pull request #474 from pratik-joshi/webtest-civi-bug-fix
found a bug while runing test case WebTest_Contact_InlineFieldsEditTest ...
Pratik Joshi [Thu, 18 Apr 2013 13:23:33 +0000 (18:53 +0530)]
found a bug while runing test case WebTest_Contact_InlineFieldsEditTest : while editing the custom field the form fields have values populated
Kurund Jalmi [Thu, 18 Apr 2013 06:11:48 +0000 (23:11 -0700)]
Merge pull request #471 from colemanw/communityMessagesUrl
Add community messages enabled/disabled to pingback stats CRM-12375
Kurund Jalmi [Thu, 18 Apr 2013 06:11:05 +0000 (23:11 -0700)]
Merge pull request #472 from dlobo/CRM-12373
CRM-12373