civicrm-core.git
11 years agoMerge pull request #567 from dlobo/CRM-12452
Kurund Jalmi [Tue, 30 Apr 2013 17:44:14 +0000 (10:44 -0700)]
Merge pull request #567 from dlobo/CRM-12452

CRM-12452

11 years agoMerge pull request #582 from agh1/financial-types-message-4.3
dlobo [Tue, 30 Apr 2013 17:41:28 +0000 (10:41 -0700)]
Merge pull request #582 from agh1/financial-types-message-4.3

clarify help text for financial accounts and types (CRM-12473)

11 years agoMerge pull request #559 from agh1/2nd-membership-warning
dlobo [Tue, 30 Apr 2013 17:41:06 +0000 (10:41 -0700)]
Merge pull request #559 from agh1/2nd-membership-warning

Clarify warning for creating duplicate membership

11 years agoclarify help text for fin accts and types
Andrew Hunt [Tue, 30 Apr 2013 17:19:17 +0000 (13:19 -0400)]
clarify help text for fin accts and types

11 years agominor style changes
agh1 [Tue, 30 Apr 2013 17:12:01 +0000 (14:12 -0300)]
minor style changes

11 years agoStyle changes
agh1 [Tue, 30 Apr 2013 17:10:25 +0000 (14:10 -0300)]
Style changes

11 years agoMerge pull request #571 from agh1/bring-back-edit-petition
dlobo [Tue, 30 Apr 2013 17:01:09 +0000 (10:01 -0700)]
Merge pull request #571 from agh1/bring-back-edit-petition

Edit Petition restored to as it was in 4.2

11 years agoMerge pull request #575 from eileenmcnaughton/4.3
dlobo [Tue, 30 Apr 2013 16:59:52 +0000 (09:59 -0700)]
Merge pull request #575 from eileenmcnaughton/4.3

CRM-12468 preliminary tidy up - whitespace, missing ts

11 years agoCRM-12468 add pledge next scheduled date filter
eileen [Tue, 30 Apr 2013 04:26:13 +0000 (16:26 +1200)]
CRM-12468 add pledge next scheduled date filter

11 years agoCRM-12468 whitespace
eileen [Tue, 30 Apr 2013 03:34:30 +0000 (15:34 +1200)]
CRM-12468 whitespace

11 years agoCRM-12468 preliminary tidy up - whitespace, missing ts
eileen [Tue, 30 Apr 2013 01:07:33 +0000 (13:07 +1200)]
CRM-12468 preliminary tidy up - whitespace, missing ts

11 years agoMerge pull request #574 from twomice/CRM-12460
Kurund Jalmi [Mon, 29 Apr 2013 22:13:52 +0000 (15:13 -0700)]
Merge pull request #574 from twomice/CRM-12460

CRM-12460

11 years agoMerge pull request #573 from dlobo/CRM-12457
Kurund Jalmi [Mon, 29 Apr 2013 22:12:58 +0000 (15:12 -0700)]
Merge pull request #573 from dlobo/CRM-12457

CRM-12457

11 years agoCRM-12460
AS [Mon, 29 Apr 2013 21:56:33 +0000 (14:56 -0700)]
CRM-12460

Fixed: phpunit doesn't get mysql password from civicrm.settings.local.php

----------------------------------------
* CRM-12460: phpunit doesn't get mysql password from civicrm.settings.local.php
  http://issues.civicrm.org/jira/browse/CRM-12460

11 years agoCRM-12457
Donald A. Lobo [Mon, 29 Apr 2013 21:44:58 +0000 (14:44 -0700)]
CRM-12457

----------------------------------------
* CRM-12457: Typo - 'Succesful' is spelled 'Successful'
  http://issues.civicrm.org/jira/browse/CRM-12457

11 years agoMerge pull request #561 from totten/upgrade-finish-reload
colemanw [Mon, 29 Apr 2013 21:30:24 +0000 (14:30 -0700)]
Merge pull request #561 from totten/upgrade-finish-reload

CRM-12371 - Don't show errors if admin refreshes post-upgrade screen.

11 years agoMerge pull request #572 from totten/hook-errors-redux
Tim Otten [Mon, 29 Apr 2013 20:57:39 +0000 (13:57 -0700)]
Merge pull request #572 from totten/hook-errors-redux

CRM-12370 - Fix another regression from new hook code

11 years agoCRM-12370 - Code style
Tim Otten [Mon, 29 Apr 2013 20:52:39 +0000 (13:52 -0700)]
CRM-12370 - Code style

----------------------------------------
* CRM-12370: CRM_Utils_Hook::requireCiviModules() assigns infinite weight to extensions
  http://issues.civicrm.org/jira/browse/CRM-12370

11 years agoCRM-12370 - Reapply 2991458
Tim Otten [Mon, 29 Apr 2013 20:50:50 +0000 (13:50 -0700)]
CRM-12370 - Reapply 2991458

See also: #552, #560, #570

----------------------------------------
* CRM-12370: CRM_Utils_Hook::requireCiviModules() assigns infinite weight to extensions
  http://issues.civicrm.org/jira/browse/CRM-12370

11 years agoEdit Petition restored to as it was in 4.2
Andrew Hunt [Mon, 29 Apr 2013 20:38:00 +0000 (16:38 -0400)]
Edit Petition restored to as it was in 4.2

11 years agoMerge pull request #555 from totten/givi-review-urls
Kurund Jalmi [Mon, 29 Apr 2013 19:44:44 +0000 (12:44 -0700)]
Merge pull request #555 from totten/givi-review-urls

givi - When pasting in PR URLs for review, accept more URLs

11 years agoMerge pull request #557 from colemanw/caseCustom
Kurund Jalmi [Mon, 29 Apr 2013 19:44:12 +0000 (12:44 -0700)]
Merge pull request #557 from colemanw/caseCustom

Fix custom data popup CRM-12403

11 years agoMerge pull request #563 from pratik-joshi/CRM-12404-part-1-fix
Kurund Jalmi [Mon, 29 Apr 2013 19:06:59 +0000 (12:06 -0700)]
Merge pull request #563 from pratik-joshi/CRM-12404-part-1-fix

fix for CRM-12404 : "Supporter profile is not set for this Personal Camp...

11 years agoMerge pull request #564 from deepak-srivastava/hulk
Kurund Jalmi [Mon, 29 Apr 2013 18:36:37 +0000 (11:36 -0700)]
Merge pull request #564 from deepak-srivastava/hulk

Fix for CRM-12428

11 years agoMerge pull request #565 from deepak-srivastava/ninja
Kurund Jalmi [Mon, 29 Apr 2013 18:35:55 +0000 (11:35 -0700)]
Merge pull request #565 from deepak-srivastava/ninja

Fix for CRM-12431

11 years agoMerge pull request #566 from dlobo/CRM-12449
Kurund Jalmi [Mon, 29 Apr 2013 18:35:19 +0000 (11:35 -0700)]
Merge pull request #566 from dlobo/CRM-12449

CRM-12449

11 years agoMerge pull request #569 from yashodha/4.3
Kurund Jalmi [Mon, 29 Apr 2013 18:33:18 +0000 (11:33 -0700)]
Merge pull request #569 from yashodha/4.3

CRM-12426

11 years agoMerge pull request #570 from dlobo/CRM-12416
Kurund Jalmi [Mon, 29 Apr 2013 18:32:26 +0000 (11:32 -0700)]
Merge pull request #570 from dlobo/CRM-12416

CRM-12416 also fix warnings when running regen

11 years agoCRM-12416 also fix warnings when running regen
Donald A. Lobo [Mon, 29 Apr 2013 18:24:35 +0000 (11:24 -0700)]
CRM-12416 also fix warnings when running regen

----------------------------------------
* CRM-12416: Database problems when installing Danish language as basic data set
  http://issues.civicrm.org/jira/browse/CRM-12416

11 years agoCRM-12426
yashodha [Mon, 29 Apr 2013 17:52:09 +0000 (23:22 +0530)]
CRM-12426

11 years agoCRM-12452
Donald A. Lobo [Mon, 29 Apr 2013 17:32:00 +0000 (10:32 -0700)]
CRM-12452

----------------------------------------
* CRM-12452: Cannot record activities for individuals with an apostrophe in their last name
  http://issues.civicrm.org/jira/browse/CRM-12452

11 years agoCRM-12449
Donald A. Lobo [Mon, 29 Apr 2013 15:29:15 +0000 (08:29 -0700)]
CRM-12449

----------------------------------------
* CRM-12449: On the import page, the dedupe rules select isn't using the rules' names
  http://issues.civicrm.org/jira/browse/CRM-12449

11 years agoFix for CRM-12431 urls not showing up
Deepak Srivastava [Mon, 29 Apr 2013 14:51:29 +0000 (20:21 +0530)]
Fix for CRM-12431 urls not showing up

11 years agoFix for CRM-12428
Deepak Srivastava [Mon, 29 Apr 2013 12:47:30 +0000 (18:17 +0530)]
Fix for CRM-12428

11 years agoFix for CRM-12431
Deepak Srivastava [Mon, 29 Apr 2013 10:51:37 +0000 (16:21 +0530)]
Fix for CRM-12431

11 years agoMerge pull request #562 from totten/allcoretables-ignore
Kurund Jalmi [Mon, 29 Apr 2013 07:54:11 +0000 (00:54 -0700)]
Merge pull request #562 from totten/allcoretables-ignore

gitignore - Hide CRM/Core/AllCoreTables.php under 4.3. (The file isn't u...

11 years agoadd warning on standalone add membership form
Andrew Hunt [Mon, 29 Apr 2013 06:25:33 +0000 (02:25 -0400)]
add warning on standalone add membership form

11 years agogitignore - Hide CRM/Core/AllCoreTables.php under 4.3. (The file isn't used in 4...
Tim Otten [Mon, 29 Apr 2013 04:54:49 +0000 (21:54 -0700)]
gitignore - Hide CRM/Core/AllCoreTables.php under 4.3. (The file isn't used in 4.3, but it comes up when switching back and forth between the 4.3 and 4.4 codebases.)

11 years agoCRM-12371 - Don't show errors if admin refreshes post-upgrade screen.
Tim Otten [Mon, 29 Apr 2013 04:44:44 +0000 (21:44 -0700)]
CRM-12371 - Don't show errors if admin refreshes post-upgrade screen.

Note: It's not possible to display the exact same messages because the session is destroyed as part of the upgrade process.

----------------------------------------
* CRM-12371: Refreshing upgrade finish page causes errors
  http://issues.civicrm.org/jira/browse/CRM-12371

11 years agopop up warning when selecting member org
Andrew Hunt [Mon, 29 Apr 2013 03:30:44 +0000 (23:30 -0400)]
pop up warning when selecting member org

11 years agoMerge pull request #558 from colemanw/comments
Tim Otten [Mon, 29 Apr 2013 02:05:32 +0000 (19:05 -0700)]
Merge pull request #558 from colemanw/comments

Update code comments

11 years agoMerge pull request #554 from agh1/advmultiselect-narrow-clarify
Tim Otten [Mon, 29 Apr 2013 01:46:29 +0000 (18:46 -0700)]
Merge pull request #554 from agh1/advmultiselect-narrow-clarify

add and remove labels for report role advmultiselect buttons

11 years agoFn comment
Coleman Watts [Mon, 29 Apr 2013 01:22:46 +0000 (18:22 -0700)]
Fn comment

11 years agoUpdate code comments
Coleman Watts [Mon, 29 Apr 2013 01:14:20 +0000 (18:14 -0700)]
Update code comments

11 years agorewrite membership warning text
Andrew Hunt [Mon, 29 Apr 2013 00:55:38 +0000 (20:55 -0400)]
rewrite membership warning text

11 years agoFix custom data popup CRM-12403
Coleman Watts [Sun, 28 Apr 2013 23:38:05 +0000 (16:38 -0700)]
Fix custom data popup CRM-12403

11 years agogivi - When pasting in PR URLs for review, accept URLs from the "Commits" and "Files...
Tim Otten [Sun, 28 Apr 2013 23:23:15 +0000 (16:23 -0700)]
givi - When pasting in PR URLs for review, accept URLs from the "Commits" and "Files Changed" tabs

11 years agoadd and remove labels for report role advmultiselect buttons
Andrew Hunt [Sun, 28 Apr 2013 19:14:45 +0000 (15:14 -0400)]
add and remove labels for report role advmultiselect buttons

11 years agoMerge pull request #553 from kurund/CRM-12370
Kurund Jalmi [Sun, 28 Apr 2013 07:37:27 +0000 (00:37 -0700)]
Merge pull request #553 from kurund/CRM-12370

worked on CRM-12370, minor typo

11 years agoworked on CRM-12370, minor typo
Kurund Jalmi [Sun, 28 Apr 2013 07:36:17 +0000 (00:36 -0700)]
worked on CRM-12370, minor typo

11 years agoMerge pull request #552 from kurund/CRM-12370
Kurund Jalmi [Sun, 28 Apr 2013 07:32:31 +0000 (00:32 -0700)]
Merge pull request #552 from kurund/CRM-12370

worked on CRM-12370, add civicrm modules after main civicrm drupal modul...

11 years agoworked on CRM-12370, add civicrm modules after main civicrm drupal module
Kurund Jalmi [Sun, 28 Apr 2013 07:30:16 +0000 (00:30 -0700)]
worked on CRM-12370, add civicrm modules after main civicrm drupal module

11 years agoMerge pull request #549 from dlobo/CRM-12424
Kurund Jalmi [Sun, 28 Apr 2013 04:51:00 +0000 (21:51 -0700)]
Merge pull request #549 from dlobo/CRM-12424

CRM-12430

11 years agoMerge pull request #550 from dlobo/CRM-12430
Kurund Jalmi [Sun, 28 Apr 2013 04:44:34 +0000 (21:44 -0700)]
Merge pull request #550 from dlobo/CRM-12430

CRM-12430

11 years agoMerge pull request #548 from totten/joomla-fmt
Tim Otten [Sat, 27 Apr 2013 16:18:14 +0000 (09:18 -0700)]
Merge pull request #548 from totten/joomla-fmt

CRM_Utils_Hook_Joomla - Formatting

11 years agoCRM_Utils_Hook_Joomla - Formatting
Tim Otten [Sat, 27 Apr 2013 16:06:41 +0000 (09:06 -0700)]
CRM_Utils_Hook_Joomla - Formatting

11 years agoCRM-12430
Donald A. Lobo [Fri, 26 Apr 2013 19:17:42 +0000 (12:17 -0700)]
CRM-12430

----------------------------------------
* CRM-12430: CRM_Mailing_BAO_Mailing:create changes all mailing settings back to default
  http://issues.civicrm.org/jira/browse/CRM-12430

11 years agoCRM-12430
Donald A. Lobo [Fri, 26 Apr 2013 18:08:06 +0000 (11:08 -0700)]
CRM-12430

----------------------------------------
* CRM-12430: CRM_Mailing_BAO_Mailing:create changes all mailing settings back to default
  http://issues.civicrm.org/jira/browse/CRM-12430

11 years agofix for CRM-12404 : "Supporter profile is not set for this Personal Campaign Page...
Pratik Joshi [Fri, 26 Apr 2013 15:42:55 +0000 (21:12 +0530)]
fix for CRM-12404 : "Supporter profile is not set for this Personal Campaign Page or the profile is disabled. Please contact the site administrator if you need assistance."

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