civicrm-core.git
11 years agoMerge pull request #547 from deepak-srivastava/ninja
Kurund Jalmi [Fri, 26 Apr 2013 14:10:55 +0000 (07:10 -0700)]
Merge pull request #547 from deepak-srivastava/ninja

CRM-12427 Fixes and patch

11 years agoCRM-12427 Fixes and patch
Deepak Srivastava [Fri, 26 Apr 2013 10:23:06 +0000 (15:53 +0530)]
CRM-12427 Fixes and patch

11 years agoMerge pull request #539 from kurund/CRM-12407
Kurund Jalmi [Fri, 26 Apr 2013 05:44:25 +0000 (22:44 -0700)]
Merge pull request #539 from kurund/CRM-12407

CRM-12407

11 years agoMerge pull request #531 from colemanw/versionCompare
Kurund Jalmi [Thu, 25 Apr 2013 22:28:03 +0000 (15:28 -0700)]
Merge pull request #531 from colemanw/versionCompare

Use php version_compare function instead of our own

11 years agoMerge pull request #540 from yashodha/CRM-12401
Kurund Jalmi [Thu, 25 Apr 2013 22:27:30 +0000 (15:27 -0700)]
Merge pull request #540 from yashodha/CRM-12401

added test for reminder for the condition(CRM-12401)

11 years agoadded test for reminder for the condition(CRM-12401)
yashodha [Wed, 24 Apr 2013 23:36:44 +0000 (05:06 +0530)]
added test for reminder for the condition(CRM-12401)

11 years agoworked on CRM-12407, ajax events are fired for each of the multiple of
Kurund Jalmi [Wed, 24 Apr 2013 23:12:32 +0000 (16:12 -0700)]
worked on CRM-12407, ajax events are fired for each of the multiple of
data instance simultaneously this causes race condition and casuses
random breaks, hence changing ajax request to use async mode.

11 years agocode cleanup
Kurund Jalmi [Wed, 24 Apr 2013 23:00:48 +0000 (16:00 -0700)]
code cleanup

11 years agoMerge pull request #532 from deepak-srivastava/ninja
Kurund Jalmi [Wed, 24 Apr 2013 22:34:04 +0000 (15:34 -0700)]
Merge pull request #532 from deepak-srivastava/ninja

Fix for CRM-12409

11 years agoMerge pull request #536 from colemanw/quickFix
Kurund Jalmi [Wed, 24 Apr 2013 22:29:00 +0000 (15:29 -0700)]
Merge pull request #536 from colemanw/quickFix

Fix undefined variable

11 years agoFix undefined variable
Coleman Watts [Wed, 24 Apr 2013 22:26:57 +0000 (15:26 -0700)]
Fix undefined variable

11 years agoFix for CRM-12409
Deepak Srivastava [Wed, 24 Apr 2013 07:02:25 +0000 (12:32 +0530)]
Fix for CRM-12409

11 years agoUse php version_compare function instead of our own
Coleman Watts [Wed, 24 Apr 2013 04:01:34 +0000 (21:01 -0700)]
Use php version_compare function instead of our own

11 years agoMerge pull request #529 from kurund/group-cache
Kurund Jalmi [Wed, 24 Apr 2013 00:28:07 +0000 (17:28 -0700)]
Merge pull request #529 from kurund/group-cache

code cleanup

11 years agocode cleanup
Kurund Jalmi [Wed, 24 Apr 2013 00:26:43 +0000 (17:26 -0700)]
code cleanup

11 years agoMerge pull request #528 from lcdservices/joomla-3.0-cli
Kurund Jalmi [Wed, 24 Apr 2013 00:23:30 +0000 (17:23 -0700)]
Merge pull request #528 from lcdservices/joomla-3.0-cli

CRM-12096 joomla 3.0 support cli

11 years agoMerge pull request #522 from lcdservices/4.3
Kurund Jalmi [Wed, 24 Apr 2013 00:18:55 +0000 (17:18 -0700)]
Merge pull request #522 from lcdservices/4.3

CRM-12096 support joomla 3.0 ACL config

11 years agoCRM-12096 joomla 3.0 support cli
Brian Shaughnessy [Wed, 24 Apr 2013 00:13:59 +0000 (20:13 -0400)]
CRM-12096 joomla 3.0 support cli

11 years agoMerge pull request #525 from dlobo/URLFixes
Kurund Jalmi [Tue, 23 Apr 2013 23:49:14 +0000 (16:49 -0700)]
Merge pull request #525 from dlobo/URLFixes

fix url to point to book

11 years agofix url to point to book
Donald A. Lobo [Tue, 23 Apr 2013 23:42:23 +0000 (16:42 -0700)]
fix url to point to book

11 years agoCRM-12096 joomla 3.0 css tweak
Brian Shaughnessy [Tue, 23 Apr 2013 23:26:57 +0000 (19:26 -0400)]
CRM-12096 joomla 3.0 css tweak

11 years agoCRM-12096 support joomla 3.0 ACL config
Brian Shaughnessy [Tue, 23 Apr 2013 23:18:08 +0000 (19:18 -0400)]
CRM-12096 support joomla 3.0 ACL config

11 years agoMerge pull request #518 from totten/merge-forward-mktemp
Kurund Jalmi [Tue, 23 Apr 2013 22:50:26 +0000 (15:50 -0700)]
Merge pull request #518 from totten/merge-forward-mktemp

merge-forward: Fix for OS X mktemp

11 years agomerge-forward: Fix for OS X mktemp
Tim Otten [Tue, 23 Apr 2013 22:11:23 +0000 (15:11 -0700)]
merge-forward: Fix for OS X mktemp

11 years agoMerge pull request #515 from kurund/CRM-12395
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

11 years agoverified the work on CRM-12395
Kurund Jalmi [Tue, 23 Apr 2013 21:48:56 +0000 (14:48 -0700)]
verified the work on CRM-12395

11 years agoMerge pull request #510 from adamwight/respect_includeOrderByClause
dlobo [Tue, 23 Apr 2013 20:28:57 +0000 (13:28 -0700)]
Merge pull request #510 from adamwight/respect_includeOrderByClause

Respect includeOrderByClause in quicksearch

11 years agoMerge pull request #481 from dlobo/CRM-12368
Kurund Jalmi [Tue, 23 Apr 2013 19:28:57 +0000 (12:28 -0700)]
Merge pull request #481 from dlobo/CRM-12368

CRM-12368

11 years agoRespect includeOrderByClause in quicksearch
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

11 years agoMerge pull request #509 from yashodha/CRM-12401
Kurund Jalmi [Tue, 23 Apr 2013 18:06:01 +0000 (11:06 -0700)]
Merge pull request #509 from yashodha/CRM-12401

CRM-12401

11 years agoCRM-12401
yashodha [Tue, 23 Apr 2013 17:37:20 +0000 (23:07 +0530)]
CRM-12401

11 years agoCRM-12401
yashodha [Tue, 23 Apr 2013 17:25:34 +0000 (22:55 +0530)]
CRM-12401

11 years agoMerge pull request #505 from eileenmcnaughton/4.3
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

11 years ago CRM-12405 - patch for additional logging on failed IPN calls
eileen [Tue, 23 Apr 2013 00:43:33 +0000 (12:43 +1200)]
 CRM-12405 - patch for additional logging on failed IPN calls

11 years agoMerge pull request #502 from colemanw/versionCheck
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

11 years agoMerge pull request #503 from dlobo/CRM-12396
Kurund Jalmi [Mon, 22 Apr 2013 22:33:48 +0000 (15:33 -0700)]
Merge pull request #503 from dlobo/CRM-12396

CRM-12396

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

11 years agoCRM-12396
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

11 years agoShorter cache duration for versionCheck
Coleman Watts [Mon, 22 Apr 2013 17:20:08 +0000 (10:20 -0700)]
Shorter cache duration for versionCheck

11 years agoFix for CRM-12391
Deepak Srivastava [Mon, 22 Apr 2013 12:14:49 +0000 (17:44 +0530)]
Fix for CRM-12391

11 years agoMerge pull request #492 from dlobo/CRM-12394
Kurund Jalmi [Sun, 21 Apr 2013 18:51:29 +0000 (11:51 -0700)]
Merge pull request #492 from dlobo/CRM-12394

CRM-12394

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

11 years agoMerge pull request #491 from dlobo/MiscFixes
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

11 years agoMerge pull request #488 from kurund/notice-fixes
Kurund Jalmi [Sat, 20 Apr 2013 21:56:06 +0000 (14:56 -0700)]
Merge pull request #488 from kurund/notice-fixes

notice fixes

11 years agosend right number of parameters to function
Donald A. Lobo [Sat, 20 Apr 2013 15:29:39 +0000 (08:29 -0700)]
send right number of parameters to function

11 years agonotice fixes
Kurund Jalmi [Sat, 20 Apr 2013 07:52:30 +0000 (00:52 -0700)]
notice fixes

11 years agoMerge pull request #482 from colemanw/CRM-12382
Kurund Jalmi [Sat, 20 Apr 2013 06:14:34 +0000 (23:14 -0700)]
Merge pull request #482 from colemanw/CRM-12382

Fix CRM-12382

11 years agoMerge pull request #485 from dlobo/CRM-12386
Kurund Jalmi [Sat, 20 Apr 2013 06:09:31 +0000 (23:09 -0700)]
Merge pull request #485 from dlobo/CRM-12386

CRM-12386

11 years agoMerge pull request #484 from dlobo/CRM-12385
Kurund Jalmi [Sat, 20 Apr 2013 06:08:23 +0000 (23:08 -0700)]
Merge pull request #484 from dlobo/CRM-12385

CRM-12385

11 years agoMerge pull request #486 from dlobo/CRM-12390
Kurund Jalmi [Sat, 20 Apr 2013 06:07:54 +0000 (23:07 -0700)]
Merge pull request #486 from dlobo/CRM-12390

CRM-12390

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

11 years agoCRM-12386
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

11 years agoCRM-12385
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

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

11 years agoMerge pull request #476 from yashodha/fixscript
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

11 years agoMerge pull request #480 from colemanw/css
Kurund Jalmi [Fri, 19 Apr 2013 07:03:26 +0000 (00:03 -0700)]
Merge pull request #480 from colemanw/css

css tweaks

11 years agoFix CRM-12382
Coleman Watts [Fri, 19 Apr 2013 05:49:45 +0000 (22:49 -0700)]
Fix CRM-12382

11 years agoFix fonts for IE compatability CRM-12381
Coleman Watts [Fri, 19 Apr 2013 00:02:32 +0000 (17:02 -0700)]
Fix fonts for IE compatability CRM-12381

11 years agojs/whitespace cleanup
Coleman Watts [Thu, 18 Apr 2013 23:35:06 +0000 (16:35 -0700)]
js/whitespace cleanup

11 years agocss tweaks
Coleman Watts [Thu, 18 Apr 2013 23:30:21 +0000 (16:30 -0700)]
css tweaks

11 years agoCRM-12368
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

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

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

11 years agoMerge pull request #479 from colemanw/releaser
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

11 years agoImprove "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

11 years agoMerge pull request #478 from kurund/regen-data
Kurund Jalmi [Thu, 18 Apr 2013 22:07:30 +0000 (15:07 -0700)]
Merge pull request #478 from kurund/regen-data

fixed generate data

11 years agofixed generate data
kurund [Thu, 18 Apr 2013 22:05:48 +0000 (03:35 +0530)]
fixed generate data

11 years agofix script to pass correct fee_amount parameter
yashodha [Thu, 18 Apr 2013 20:02:45 +0000 (01:32 +0530)]
fix script to pass correct fee_amount parameter

11 years agoUpdate version to 4.3.2
CiviCRM [Thu, 18 Apr 2013 19:23:24 +0000 (12:23 -0700)]
Update version to 4.3.2

11 years agoMerge pull request #469 from colemanw/versionUpdate
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

11 years agoMerge pull request #475 from ravishnair/webtest-fix
colemanw [Thu, 18 Apr 2013 15:03:42 +0000 (08:03 -0700)]
Merge pull request #475 from ravishnair/webtest-fix

-- webtest fix

11 years ago-- webtest fix
Ravish Nair [Thu, 18 Apr 2013 14:38:35 +0000 (20:08 +0530)]
-- webtest fix

11 years agoMerge pull request #474 from pratik-joshi/webtest-civi-bug-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 ...

11 years agofound a bug while runing test case WebTest_Contact_InlineFieldsEditTest : while editi...
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

11 years agoMerge pull request #471 from colemanw/communityMessagesUrl
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

11 years agoMerge pull request #472 from dlobo/CRM-12373
Kurund Jalmi [Thu, 18 Apr 2013 06:11:05 +0000 (23:11 -0700)]
Merge pull request #472 from dlobo/CRM-12373

CRM-12373

11 years agoMerge pull request #473 from dlobo/CRM-12376
Kurund Jalmi [Thu, 18 Apr 2013 06:10:05 +0000 (23:10 -0700)]
Merge pull request #473 from dlobo/CRM-12376

CRM-12376

11 years agoCRM-12376
Donald A. Lobo [Thu, 18 Apr 2013 03:34:43 +0000 (20:34 -0700)]
CRM-12376

----------------------------------------
* CRM-12376: CiviMail job with no remaining deliveries gets stuck in Running
  http://issues.civicrm.org/jira/browse/CRM-12376

11 years agoCRM-12373
Donald A. Lobo [Thu, 18 Apr 2013 02:26:54 +0000 (19:26 -0700)]
CRM-12373

----------------------------------------
* CRM-12373: civicrm_mailing_bounce_pattern rules for postfix
  http://issues.civicrm.org/jira/browse/CRM-12373

11 years agoMerge pull request #470 from yashodha/CRM-12374
Kurund Jalmi [Thu, 18 Apr 2013 02:15:53 +0000 (19:15 -0700)]
Merge pull request #470 from yashodha/CRM-12374

CRM-12374

11 years agoAdd community messages enabled/disabled to pingback stats CRM-12375
Coleman Watts [Thu, 18 Apr 2013 02:14:41 +0000 (19:14 -0700)]
Add community messages enabled/disabled to pingback stats CRM-12375

11 years agoCRM-12374
yashodha [Thu, 18 Apr 2013 02:09:36 +0000 (07:39 +0530)]
CRM-12374

11 years agoImprove 'update' in releaser script
Coleman Watts [Wed, 17 Apr 2013 23:56:25 +0000 (16:56 -0700)]
Improve 'update' in releaser script

11 years agoAdd 'update' to releaser script
Coleman Watts [Wed, 17 Apr 2013 23:16:00 +0000 (16:16 -0700)]
Add 'update' to releaser script

11 years agoMerge pull request #468 from mlutfy/fix-43-case-ts
colemanw [Wed, 17 Apr 2013 22:40:32 +0000 (15:40 -0700)]
Merge pull request #468 from mlutfy/fix-43-case-ts

ts() fixes for labels in case activity popup, + minor fixes to code format.

11 years agots() fixes for labels in case activity popup, and minor fixes to code format.
Mathieu Lutfy [Wed, 17 Apr 2013 21:48:48 +0000 (17:48 -0400)]
ts() fixes for labels in case activity popup, and minor fixes to code format.

11 years agoMerge pull request #467 from colemanw/resources
Tim Otten [Wed, 17 Apr 2013 21:17:44 +0000 (14:17 -0700)]
Merge pull request #467 from colemanw/resources

Fix common CRM settings CRM-12339

11 years agoFix common CRM settings CRM-12339
Coleman Watts [Wed, 17 Apr 2013 21:14:40 +0000 (14:14 -0700)]
Fix common CRM settings CRM-12339

11 years agoMerge pull request #466 from colemanw/upgradeMessage
Dave Greenberg [Wed, 17 Apr 2013 19:11:00 +0000 (12:11 -0700)]
Merge pull request #466 from colemanw/upgradeMessage

Improve upgrade messages CRM-12369

11 years agoImprove upgrade messages CRM-12369
Coleman Watts [Wed, 17 Apr 2013 18:44:48 +0000 (11:44 -0700)]
Improve upgrade messages CRM-12369

11 years agoMerge pull request #461 from pradpnayak/CRM-12284
Kurund Jalmi [Wed, 17 Apr 2013 16:25:44 +0000 (09:25 -0700)]
Merge pull request #461 from pradpnayak/CRM-12284

--webtest for CRM-12284

11 years agoMerge pull request #463 from dlobo/CRM-12151
Kurund Jalmi [Wed, 17 Apr 2013 16:21:21 +0000 (09:21 -0700)]
Merge pull request #463 from dlobo/CRM-12151

CRM-12151

11 years agoMerge pull request #462 from pratik-joshi/forum_upgrade_issue
Kurund Jalmi [Wed, 17 Apr 2013 16:18:40 +0000 (09:18 -0700)]
Merge pull request #462 from pratik-joshi/forum_upgrade_issue

CRM-12367 : http://forum.civicrm.org/index.php/topic,28397.msg121403.html#msg121403

11 years agoMerge pull request #464 from deepak-srivastava/galaxy
Kurund Jalmi [Wed, 17 Apr 2013 16:16:29 +0000 (09:16 -0700)]
Merge pull request #464 from deepak-srivastava/galaxy

Fix for CRM-12362

11 years agoFix for CRM-12362
Deepak Srivastava [Wed, 17 Apr 2013 14:03:36 +0000 (19:33 +0530)]
Fix for CRM-12362

11 years agoMerge pull request #455 from eileenmcnaughton/4.3
dlobo [Wed, 17 Apr 2013 13:56:10 +0000 (06:56 -0700)]
Merge pull request #455 from eileenmcnaughton/4.3

drop report temp tables on db clean up.

11 years agoCRM-12151
Donald A. Lobo [Wed, 17 Apr 2013 13:54:16 +0000 (06:54 -0700)]
CRM-12151

----------------------------------------
* CRM-12151: MySQL max_key_length error installing CiviCRM 4.2.8 on stock OSX MySQL
  http://issues.civicrm.org/jira/browse/CRM-12151

11 years agoCRM-12367
Pratik Joshi [Wed, 17 Apr 2013 12:16:03 +0000 (17:46 +0530)]
CRM-12367

11 years ago--webtest for CRM-12284
Pradeep Nayak [Wed, 17 Apr 2013 11:58:02 +0000 (17:28 +0530)]
--webtest for CRM-12284

11 years agoMerge pull request #458 from davecivicrm/4.3
colemanw [Wed, 17 Apr 2013 04:44:50 +0000 (21:44 -0700)]
Merge pull request #458 from davecivicrm/4.3

CRM-12327 One more instance of the checkbox needs the help link.