civicrm-core.git
11 years agoMerge pull request #702 from eileenmcnaughton/CRM-12584
dlobo [Fri, 10 May 2013 17:14:15 +0000 (10:14 -0700)]
Merge pull request #702 from eileenmcnaughton/CRM-12584

CRM-12584 GenCode shouldn't reduce memory_limit

11 years agoGenCode shouldn't reduce memory_limit
eileen [Fri, 10 May 2013 08:10:01 +0000 (20:10 +1200)]
GenCode shouldn't reduce memory_limit

11 years agoMerge pull request #700 from dlobo/CRM-12559
Kurund Jalmi [Thu, 9 May 2013 22:48:20 +0000 (15:48 -0700)]
Merge pull request #700 from dlobo/CRM-12559

CRM-12559

11 years agoMerge pull request #677 from eileenmcnaughton/CRM-12557
dlobo [Thu, 9 May 2013 20:17:47 +0000 (13:17 -0700)]
Merge pull request #677 from eileenmcnaughton/CRM-12557

CRM-12557 - ACL users cannot see removed , pending groups on contact sum...

11 years agoCRM-12559
Donald A. Lobo [Thu, 9 May 2013 20:15:51 +0000 (13:15 -0700)]
CRM-12559

----------------------------------------
* CRM-12559: Handle failed contributions in CRM_Contribute_BAO_Contribution_Confirm::processContribution()
  http://issues.civicrm.org/jira/browse/CRM-12559

11 years agoMerge pull request #698 from kurund/CRM-12574
Kurund Jalmi [Thu, 9 May 2013 16:52:56 +0000 (09:52 -0700)]
Merge pull request #698 from kurund/CRM-12574

fixed error message, CRM-12574

11 years agofixed error message, CRM-12574
Kurund Jalmi [Thu, 9 May 2013 16:51:21 +0000 (09:51 -0700)]
fixed error message, CRM-12574

11 years agoUpdate version to 4.3.4
CiviCRM [Thu, 9 May 2013 16:42:45 +0000 (09:42 -0700)]
Update version to 4.3.4

11 years agoMerge pull request #693 from lcdservices/activity-perms
Kurund Jalmi [Thu, 9 May 2013 05:44:52 +0000 (22:44 -0700)]
Merge pull request #693 from lcdservices/activity-perms

CRM-12569 permission activity links and tasks more accurately

11 years agoCRM-12569 permission activity links and tasks more accurately
Brian Shaughnessy [Thu, 9 May 2013 03:50:39 +0000 (23:50 -0400)]
CRM-12569 permission activity links and tasks more accurately

11 years agoMerge pull request #692 from kurund/CRM-12458
Kurund Jalmi [Thu, 9 May 2013 00:10:28 +0000 (17:10 -0700)]
Merge pull request #692 from kurund/CRM-12458

undo last merge: 5a10656d1e6f02ef543375e974b2439c50f3f66d

11 years agoundo last merge
Kurund Jalmi [Thu, 9 May 2013 00:08:37 +0000 (17:08 -0700)]
undo last merge

11 years agoMerge pull request #690 from yashodha/4.3.CRM-12458
Kurund Jalmi [Wed, 8 May 2013 22:13:29 +0000 (15:13 -0700)]
Merge pull request #690 from yashodha/4.3.CRM-12458

CRM-12458

11 years agoCRM-12458
yashodha [Wed, 8 May 2013 21:13:15 +0000 (02:43 +0530)]
CRM-12458

11 years agoMerge pull request #686 from totten/mktest-mail
Kurund Jalmi [Wed, 8 May 2013 21:12:42 +0000 (14:12 -0700)]
Merge pull request #686 from totten/mktest-mail

mk-drupal-test-site - Write outgoing mails to /dev/null

11 years agoMerge pull request #688 from colemanw/CRM-12471
colemanw [Wed, 8 May 2013 20:51:05 +0000 (13:51 -0700)]
Merge pull request #688 from colemanw/CRM-12471

Look before leaping when flushing pseudoconstants CRM-12471

11 years agoLook before leaping when flushing pseudoconstants CRM-12471
Coleman Watts [Wed, 8 May 2013 20:48:51 +0000 (13:48 -0700)]
Look before leaping when flushing pseudoconstants CRM-12471

11 years agoMerge pull request #687 from totten/http-array-error
Tim Otten [Wed, 8 May 2013 19:28:15 +0000 (12:28 -0700)]
Merge pull request #687 from totten/http-array-error

HttpClient - Fix bad return format

11 years agoHttpClient - Fix bad return format
Tim Otten [Wed, 8 May 2013 19:26:04 +0000 (12:26 -0700)]
HttpClient - Fix bad return format

11 years agomk-drupal-test-site - Write outgoing mails to /dev/null
Tim Otten [Wed, 8 May 2013 18:41:47 +0000 (18:41 +0000)]
mk-drupal-test-site - Write outgoing mails to /dev/null

11 years agoMerge pull request #685 from kurund/CRM-12512
Kurund Jalmi [Wed, 8 May 2013 18:07:01 +0000 (11:07 -0700)]
Merge pull request #685 from kurund/CRM-12512

removed obsolete code that tried to create duplicate assignee contacts, ...

11 years agoremoved obsolete code that tried to create duplicate assignee contacts, CRM-12512
Kurund Jalmi [Wed, 8 May 2013 18:06:01 +0000 (11:06 -0700)]
removed obsolete code that tried to create duplicate assignee contacts, CRM-12512

11 years agoMerge pull request #670 from pratik-joshi/CRM-12503
Tim Otten [Wed, 8 May 2013 17:19:18 +0000 (10:19 -0700)]
Merge pull request #670 from pratik-joshi/CRM-12503

CRM-12503

11 years agoMerge pull request #679 from davecivicrm/CRM-12397
Kurund Jalmi [Wed, 8 May 2013 17:19:07 +0000 (10:19 -0700)]
Merge pull request #679 from davecivicrm/CRM-12397

Add back in the NONE option for additional participant profile bottom sl...

11 years agoMerge pull request #683 from dlobo/CRM-12558
dlobo [Wed, 8 May 2013 14:09:08 +0000 (07:09 -0700)]
Merge pull request #683 from dlobo/CRM-12558

CRM-12558

11 years agoCRM-12558
Donald A. Lobo [Wed, 8 May 2013 14:07:48 +0000 (07:07 -0700)]
CRM-12558

----------------------------------------
* CRM-12558: Ensure CRM/Utils/DeprecatedUtils.php is required
  http://issues.civicrm.org/jira/browse/CRM-12558

11 years agoAdd back in the NONE option for additional participant profile bottom slots. The...
Dave Greenberg [Wed, 8 May 2013 00:04:50 +0000 (17:04 -0700)]
Add back in the NONE option for additional participant profile bottom slots. The option to NOT have a second profile for additional participants was lost in a regression between 4.1 and 4.2.

11 years agoMerge pull request #675 from dlobo/CRM-12558
dlobo [Tue, 7 May 2013 23:39:11 +0000 (16:39 -0700)]
Merge pull request #675 from dlobo/CRM-12558

CRM-12558

11 years agoCRM-12557 - ACL users cannot see removed , pending groups on contact summary tab
eileen [Tue, 7 May 2013 23:38:57 +0000 (11:38 +1200)]
CRM-12557 - ACL users cannot see removed , pending groups on contact summary tab

11 years agoCRM-12558
Donald A. Lobo [Tue, 7 May 2013 23:37:56 +0000 (16:37 -0700)]
CRM-12558

----------------------------------------
* CRM-12558: Ensure CRM/Utils/DeprecatedUtils.php is required
  http://issues.civicrm.org/jira/browse/CRM-12558

11 years agoMerge pull request #674 from totten/upgrade-messages
colemanw [Tue, 7 May 2013 22:27:56 +0000 (15:27 -0700)]
Merge pull request #674 from totten/upgrade-messages

CRM-12549 - Restore upgrade message

11 years agoCRM_Core_Sessio - Doc tweak
Tim Otten [Tue, 7 May 2013 22:22:39 +0000 (15:22 -0700)]
CRM_Core_Sessio - Doc tweak

11 years agoCRM-12549 - Restore upgrade message
Tim Otten [Tue, 7 May 2013 22:22:04 +0000 (15:22 -0700)]
CRM-12549 - Restore upgrade message

----------------------------------------
* CRM-12549: Upgrade isn't displaying $message on success.tpl
  http://issues.civicrm.org/jira/browse/CRM-12549

11 years agoMerge pull request #673 from eileenmcnaughton/4.3
colemanw [Tue, 7 May 2013 22:14:45 +0000 (15:14 -0700)]
Merge pull request #673 from eileenmcnaughton/4.3

CRM-12550 avoid extraneous log_civicrm_email entries

11 years agoCRM-12550 avoid extraneous log_civicrm_email entries
eileen [Tue, 7 May 2013 21:43:20 +0000 (09:43 +1200)]
CRM-12550 avoid extraneous log_civicrm_email entries

11 years agoMerge pull request #671 from totten/rest-comments
Tim Otten [Tue, 7 May 2013 17:00:47 +0000 (10:00 -0700)]
Merge pull request #671 from totten/rest-comments

WebTest_Utils_Rest - Comments

11 years agoWebTest_Utils_Rest - Comments
Tim Otten [Tue, 7 May 2013 16:59:47 +0000 (09:59 -0700)]
WebTest_Utils_Rest - Comments

11 years agoCRM-12503
Pratik Joshi [Tue, 7 May 2013 06:36:07 +0000 (12:06 +0530)]
CRM-12503

11 years agoMerge pull request #668 from kurund/notice-fixes
Kurund Jalmi [Tue, 7 May 2013 05:58:50 +0000 (22:58 -0700)]
Merge pull request #668 from kurund/notice-fixes

notice fixes

11 years agonotice fixes
Kurund Jalmi [Tue, 7 May 2013 05:55:07 +0000 (22:55 -0700)]
notice fixes

11 years agoMerge pull request #666 from totten/pull-request-638
Kurund Jalmi [Tue, 7 May 2013 04:57:42 +0000 (21:57 -0700)]
Merge pull request #666 from totten/pull-request-638

Remove REST code

11 years agoMerge pull request #667 from kurund/CRM-12437
Kurund Jalmi [Tue, 7 May 2013 04:54:50 +0000 (21:54 -0700)]
Merge pull request #667 from kurund/CRM-12437

patched CRM-12437

11 years agopatched CRM-12437
Kurund Jalmi [Tue, 7 May 2013 04:54:02 +0000 (21:54 -0700)]
patched CRM-12437

11 years agoWebTest_Utils_RestTest - Remove disabled tests
Tim Otten [Tue, 7 May 2013 03:08:13 +0000 (20:08 -0700)]
WebTest_Utils_RestTest - Remove disabled tests

11 years agoCRM_Utils_REST - Fix regression of "?q=civicrm/X/Y"
Tim Otten [Tue, 7 May 2013 03:06:18 +0000 (20:06 -0700)]
CRM_Utils_REST - Fix regression of "?q=civicrm/X/Y"

11 years agoCRM_Utils_REST - Remove dead code. Allow loadCMSBootstrap to send well-formed errors
Tim Otten [Tue, 7 May 2013 02:55:23 +0000 (19:55 -0700)]
CRM_Utils_REST - Remove dead code. Allow loadCMSBootstrap to send well-formed errors

11 years agoextern/rest.php - Refactor (in anticipation of producing better errors during bootstrap)
Tim Otten [Tue, 7 May 2013 00:15:05 +0000 (17:15 -0700)]
extern/rest.php - Refactor (in anticipation of producing better errors during bootstrap)

11 years agoCRM_Utils_REST - Fix PHP warning
Tim Otten [Mon, 6 May 2013 23:39:35 +0000 (16:39 -0700)]
CRM_Utils_REST - Fix PHP warning

11 years agoCleanup
Chris Doten [Thu, 2 May 2013 22:50:11 +0000 (18:50 -0400)]
Cleanup

11 years agoRemoved old user/pass login ability for authenticating to API
Chris Doten [Thu, 2 May 2013 22:09:31 +0000 (18:09 -0400)]
Removed old user/pass login ability for authenticating to API

11 years agominor changes
Chris Doten [Thu, 2 May 2013 21:12:25 +0000 (17:12 -0400)]
minor changes

11 years agoAdding comments, playing with REST
Debian Live user [Thu, 2 May 2013 21:08:15 +0000 (17:08 -0400)]
Adding comments, playing with REST

11 years agoMerge pull request #660 from pradpnayak/CRM-12478
Kurund Jalmi [Mon, 6 May 2013 19:23:46 +0000 (12:23 -0700)]
Merge pull request #660 from pradpnayak/CRM-12478

-- fixed for CRM-12478 and added condition with financial_account_type =...

11 years ago-- fixed for CRM-12478 and added condition with financial_account_type = Asset for...
Pradeep Nayak [Mon, 6 May 2013 18:59:49 +0000 (00:29 +0530)]
-- fixed for CRM-12478 and added condition with financial_account_type = Asset for assigning to_financial_account_id for default

----------------------------------------
* CRM-12478: Default for Financial Account should be per Financial Account Type
  http://issues.civicrm.org/jira/browse/CRM-12478

11 years agoMerge pull request #581 from eileenmcnaughton/CRM-12472
Kurund Jalmi [Mon, 6 May 2013 18:15:40 +0000 (11:15 -0700)]
Merge pull request #581 from eileenmcnaughton/CRM-12472

CRM-12472 - Custom tables being needlessly left joined into reports if they include a date field

11 years agoMerge pull request #641 from yashodha/4.3.IPN
Kurund Jalmi [Mon, 6 May 2013 18:08:37 +0000 (11:08 -0700)]
Merge pull request #641 from yashodha/4.3.IPN

4.3.ipn

11 years agoMerge pull request #642 from pradpnayak/CRM-12501
Kurund Jalmi [Mon, 6 May 2013 18:02:52 +0000 (11:02 -0700)]
Merge pull request #642 from pradpnayak/CRM-12501

--worked on CRA-12501, changed length/values for tax_rate from 9,8 to 10...

11 years agoMerge pull request #646 from pradpnayak/CRM-12511
Kurund Jalmi [Mon, 6 May 2013 18:01:24 +0000 (11:01 -0700)]
Merge pull request #646 from pradpnayak/CRM-12511

--fixed for CRM-12511

11 years agoMerge pull request #651 from demeritcowboy/misc4.3
Kurund Jalmi [Mon, 6 May 2013 17:18:19 +0000 (10:18 -0700)]
Merge pull request #651 from demeritcowboy/misc4.3

CRM-12519

11 years agoMerge pull request #652 from dlobo/CRM-12533
Kurund Jalmi [Mon, 6 May 2013 17:16:03 +0000 (10:16 -0700)]
Merge pull request #652 from dlobo/CRM-12533

CRM-12533

11 years agoMerge pull request #653 from dlobo/CRM-12534
Kurund Jalmi [Mon, 6 May 2013 17:15:40 +0000 (10:15 -0700)]
Merge pull request #653 from dlobo/CRM-12534

CRM-12534

11 years agoMerge pull request #654 from dlobo/CRM-12535
Kurund Jalmi [Mon, 6 May 2013 17:15:19 +0000 (10:15 -0700)]
Merge pull request #654 from dlobo/CRM-12535

CRM-12535

11 years agoMerge pull request #655 from dlobo/CRM-12526
Kurund Jalmi [Mon, 6 May 2013 17:14:51 +0000 (10:14 -0700)]
Merge pull request #655 from dlobo/CRM-12526

CRM-12526

11 years agoMerge pull request #656 from dlobo/CRM-12494
Kurund Jalmi [Mon, 6 May 2013 17:14:10 +0000 (10:14 -0700)]
Merge pull request #656 from dlobo/CRM-12494

CRM-12494

11 years agoMerge pull request #657 from dlobo/CRM-12525
Kurund Jalmi [Mon, 6 May 2013 17:13:15 +0000 (10:13 -0700)]
Merge pull request #657 from dlobo/CRM-12525

CRM-12525

11 years agoCRM-12525
Donald A. Lobo [Sun, 5 May 2013 16:16:46 +0000 (09:16 -0700)]
CRM-12525

----------------------------------------
* CRM-12525: Hidden smart groups show in Groups view
  http://issues.civicrm.org/jira/browse/CRM-12525

11 years agoCRM-12494
Donald A. Lobo [Sun, 5 May 2013 15:54:52 +0000 (08:54 -0700)]
CRM-12494

----------------------------------------
* CRM-12494: updating authorize.net recurring contribution with unlimited contributions throws error
  http://issues.civicrm.org/jira/browse/CRM-12494

11 years agoCRM-12526
Donald A. Lobo [Sun, 5 May 2013 15:48:06 +0000 (08:48 -0700)]
CRM-12526

----------------------------------------
* CRM-12526: getUTCTime ignores format parameter
  http://issues.civicrm.org/jira/browse/CRM-12526

11 years agoCRM-12535
Donald A. Lobo [Sun, 5 May 2013 15:41:45 +0000 (08:41 -0700)]
CRM-12535

----------------------------------------
* CRM-12535: Wrong text   CRM/Core/Payment/PayPalImpl.php:
  http://issues.civicrm.org/jira/browse/CRM-12535

11 years agoCRM-12534
Donald A. Lobo [Sun, 5 May 2013 15:39:36 +0000 (08:39 -0700)]
CRM-12534

----------------------------------------
* CRM-12534: Wrong text   CRM/Core/Payment/PaymentExpress.php:
  http://issues.civicrm.org/jira/browse/CRM-12534

11 years agoCRM-12533
Donald A. Lobo [Sun, 5 May 2013 15:36:56 +0000 (08:36 -0700)]
CRM-12533

----------------------------------------
* CRM-12533: Wrong help text   CRM/Core/Config.php:
  http://issues.civicrm.org/jira/browse/CRM-12533

11 years agoCRM-12519
DemeritCowboy [Sun, 5 May 2013 13:56:03 +0000 (09:56 -0400)]
CRM-12519

11 years ago--fixed for CRM-12511
Pradeep Nayak [Sat, 4 May 2013 21:38:21 +0000 (03:08 +0530)]
--fixed for CRM-12511

----------------------------------------
* CRM-12511: Upgrade error where DB has some membership types with minimum_fee IS NULL
  http://issues.civicrm.org/jira/browse/CRM-12511

11 years agoMerge pull request #644 from davecivicrm/CRM-12507
Kurund Jalmi [Sat, 4 May 2013 21:02:53 +0000 (14:02 -0700)]
Merge pull request #644 from davecivicrm/CRM-12507

Adding support for including event id or contribution page id class in t...

11 years agoAdding support for including event id or contribution page id class in the main div...
Dave Greenberg [Sat, 4 May 2013 20:09:29 +0000 (13:09 -0700)]
Adding support for including event id or contribution page id class in the main div container. Had to assign contribution page id to template for contribution confirm step in Confirm.php preProcess()

11 years ago--worked on CRA-12501, changed length/values for tax_rate from 9,8 to 10,8
Pradeep Nayak [Sat, 4 May 2013 18:19:40 +0000 (23:49 +0530)]
--worked on CRA-12501, changed length/values for tax_rate from 9,8 to 10,8

----------------------------------------
* CRM-12501: Financial Account Tax > 10 causes error
  http://issues.civicrm.org/jira/browse/CRM-12501

11 years agoCRM-12522
yashodha [Sat, 4 May 2013 18:11:56 +0000 (23:41 +0530)]
CRM-12522

11 years agoCRM-12522
yashodha [Sat, 4 May 2013 18:09:48 +0000 (23:39 +0530)]
CRM-12522

11 years agoMerge pull request #640 from davecivicrm/CRM-12505
Dave Greenberg [Sat, 4 May 2013 17:57:57 +0000 (10:57 -0700)]
Merge pull request #640 from davecivicrm/CRM-12505

Remove social network block from Main.tpl and modify help text on config...

11 years agoRemove social network block from Main.tpl and modify help text on configure title...
Dave Greenberg [Sat, 4 May 2013 17:57:23 +0000 (10:57 -0700)]
Remove social network block from Main.tpl and modify help text on configure title and settings page.

11 years agoMerge pull request #633 from dlobo/FormattingFixes
colemanw [Fri, 3 May 2013 05:27:09 +0000 (22:27 -0700)]
Merge pull request #633 from dlobo/FormattingFixes

fix formatting and add comments

11 years agofix formatting and add comments
Donald A. Lobo [Fri, 3 May 2013 04:20:22 +0000 (21:20 -0700)]
fix formatting and add comments

11 years agoUpdate version to 4.3.3
CiviCRM [Thu, 2 May 2013 21:00:39 +0000 (14:00 -0700)]
Update version to 4.3.3

11 years agoMerge pull request #625 from kurund/upgrade-fixes
Kurund Jalmi [Thu, 2 May 2013 20:37:26 +0000 (13:37 -0700)]
Merge pull request #625 from kurund/upgrade-fixes

fixed upgrade issue

11 years agofixed upgrade issue
Kurund Jalmi [Thu, 2 May 2013 20:35:46 +0000 (13:35 -0700)]
fixed upgrade issue

11 years agoMerge pull request #624 from colemanw/testFix
colemanw [Thu, 2 May 2013 19:53:33 +0000 (12:53 -0700)]
Merge pull request #624 from colemanw/testFix

Fix is_primary handling

11 years agoFix is_primary handling
Coleman Watts [Thu, 2 May 2013 19:53:03 +0000 (12:53 -0700)]
Fix is_primary handling

11 years agoMerge pull request #620 from pratik-joshi/webtest-fixes
Kurund Jalmi [Thu, 2 May 2013 15:55:28 +0000 (08:55 -0700)]
Merge pull request #620 from pratik-joshi/webtest-fixes

this webtest fix is WRT https://github.com/agh1/civicrm-core/commit/4dfc...

11 years agothis webtest fix is WRT https://github.com/agh1/civicrm-core/commit/4dfcb7f8 this...
Pratik Joshi [Thu, 2 May 2013 10:05:48 +0000 (15:35 +0530)]
this webtest fix is WRT https://github.com/agh1/civicrm-core/commit/4dfcb7f8 this commit

11 years agoMerge pull request #615 from pratik-joshi/CRM-12378
Kurund Jalmi [Thu, 2 May 2013 07:29:38 +0000 (00:29 -0700)]
Merge pull request #615 from pratik-joshi/CRM-12378

CRM-12378 a new webtest helper function introduction which can help dete...

11 years agoMerge pull request #607 from totten/colbyw-rest
Kurund Jalmi [Wed, 1 May 2013 23:13:11 +0000 (16:13 -0700)]
Merge pull request #607 from totten/colbyw-rest

Add test case for REST interface

11 years agoMerge pull request #605 from kurund/CRM-12452
Kurund Jalmi [Wed, 1 May 2013 21:09:00 +0000 (14:09 -0700)]
Merge pull request #605 from kurund/CRM-12452

refixed CRM-12452, normal new contact widget was broken

11 years agorefixed CRM-12452, normal new contact widget was broken
Kurund Jalmi [Wed, 1 May 2013 21:07:40 +0000 (14:07 -0700)]
refixed CRM-12452, normal new contact widget was broken

11 years agoMerge pull request #585 from agh1/fintyperel-relfirst
Kurund Jalmi [Wed, 1 May 2013 20:34:58 +0000 (13:34 -0700)]
Merge pull request #585 from agh1/fintyperel-relfirst

Put relationship ahead of account name in assigned financial accounts page (CRM-12474)

11 years agoMerge pull request #598 from dlobo/CRM-12488
Kurund Jalmi [Wed, 1 May 2013 20:33:44 +0000 (13:33 -0700)]
Merge pull request #598 from dlobo/CRM-12488

CRM-12488

11 years agoMerge pull request #601 from dlobo/CRM-12475
Kurund Jalmi [Wed, 1 May 2013 20:32:24 +0000 (13:32 -0700)]
Merge pull request #601 from dlobo/CRM-12475

CRM-12475

11 years agoMerge pull request #586 from yashodha/CRM-12401-reminder
Kurund Jalmi [Wed, 1 May 2013 19:48:28 +0000 (12:48 -0700)]
Merge pull request #586 from yashodha/CRM-12401-reminder

CRM-12401

11 years agoCRM-12475
Donald A. Lobo [Wed, 1 May 2013 15:50:46 +0000 (08:50 -0700)]
CRM-12475

----------------------------------------
* CRM-12475: Advanced search for CiviCRM ID fails
  http://issues.civicrm.org/jira/browse/CRM-12475

11 years agoRestTest - Add test case for ping
Tim Otten [Wed, 1 May 2013 06:19:59 +0000 (23:19 -0700)]
RestTest - Add test case for ping

11 years agoCRM-12488
Donald A. Lobo [Wed, 1 May 2013 05:03:02 +0000 (22:03 -0700)]
CRM-12488

----------------------------------------
* CRM-12488: CiviMail delivers only 10 emails on the first round
  http://issues.civicrm.org/jira/browse/CRM-12488