Monish Deb [Tue, 4 Nov 2014 07:40:52 +0000 (13:10 +0530)]
Merge pull request #4504 from rohankatkar/CRM15544
Fix for CRM-15544
Rohan Katkar [Tue, 4 Nov 2014 07:38:56 +0000 (13:08 +0530)]
Fix for CRM-15544
Yashodha Chaku [Tue, 4 Nov 2014 07:02:01 +0000 (12:32 +0530)]
Merge pull request #4492 from pradpnayak/CRM-15475
Crm 15475
Kurund Jalmi [Tue, 4 Nov 2014 06:47:47 +0000 (12:17 +0530)]
Merge pull request #4467 from atif-shaikh/CRM-15427AdditionalFixes
CRM-15427 Additional Fixes
colemanw [Tue, 4 Nov 2014 02:30:01 +0000 (21:30 -0500)]
Merge pull request #4501 from colemanw/Fix
Fix Custom/Page/Option.tpl to separate form from page
Coleman Watts [Tue, 4 Nov 2014 02:20:30 +0000 (21:20 -0500)]
fix tpl space
Coleman Watts [Tue, 4 Nov 2014 02:17:16 +0000 (21:17 -0500)]
Fix Custom/Page/Option.tpl to separate form from page
Coleman Watts [Tue, 4 Nov 2014 02:05:31 +0000 (21:05 -0500)]
CRM-15524 - Avoid loading profileSelector scripts in ajax mode
This commit tweaks the call of CRM_Core_Resources::isAjaxMode to use the simpler static method.
colemanw [Tue, 4 Nov 2014 01:33:41 +0000 (20:33 -0500)]
Merge pull request #4500 from colemanw/CRM-15346
CRM-15346 - pass more specific context to Drupal.behaviors
Coleman Watts [Tue, 4 Nov 2014 01:32:48 +0000 (20:32 -0500)]
CRM-15346 - pass more specific context to Drupal.behaviors
Coleman Watts [Tue, 4 Nov 2014 01:19:30 +0000 (20:19 -0500)]
CRM-15524 - Avoid loading profileSelector scripts in ajax mode
Tim Otten [Mon, 3 Nov 2014 21:01:14 +0000 (13:01 -0800)]
Merge pull request #4440 from colemanw/CRM-15524
CRM-15524 - Support adding settings, scripts, etc in snippet mode
Pradeep Nayak [Mon, 3 Nov 2014 05:57:36 +0000 (11:27 +0530)]
-- CRM-15475, Added upgrade code to make Cancelled status as reserved
----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
https://issues.civicrm.org/jira/browse/CRM-15475
Pradeep Nayak [Mon, 3 Nov 2014 05:31:04 +0000 (11:01 +0530)]
-- CRM-15475, changed Cancelled mmebership status to reserved
----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
https://issues.civicrm.org/jira/browse/CRM-15475
Pradeep Nayak [Mon, 3 Nov 2014 05:28:03 +0000 (10:58 +0530)]
-- CRM-15475, Used Contribution status Pseudoconstant to fetch id rather then using getfield value function
----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
https://issues.civicrm.org/jira/browse/CRM-15475
Pradeep Nayak [Mon, 3 Nov 2014 05:26:54 +0000 (10:56 +0530)]
-- CRM-15475, Retrieved value for membership status id regardless of civicrm_membership_status.is_active field
----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
https://issues.civicrm.org/jira/browse/CRM-15475
Yashodha Chaku [Mon, 3 Nov 2014 05:28:50 +0000 (10:58 +0530)]
Merge pull request #4484 from atif-shaikh/CRM-15547
CRM-15547 - Current Employer not saved on Drupal user profile
Coleman Watts [Mon, 3 Nov 2014 00:48:07 +0000 (19:48 -0500)]
CRM-15524 - Move static js resources to the html-header region so they don't reload with ajax page refreshes
Coleman Watts [Sun, 2 Nov 2014 23:35:29 +0000 (18:35 -0500)]
CRM-15524 - Add 'ajax-snippet' region
Coleman Watts [Sat, 25 Oct 2014 01:37:56 +0000 (21:37 -0400)]
CRM-15524 - Support adding scripts, styles, etc to page header/footer regions in snippet mode
Coleman Watts [Sat, 1 Nov 2014 19:36:19 +0000 (15:36 -0400)]
crm.multilingual.js code comment cleanup
colemanw [Fri, 31 Oct 2014 23:54:17 +0000 (19:54 -0400)]
Merge pull request #4486 from colemanw/CRM-15551
CRM-15551 - crmEditable: add placeholder if empty after editing
Coleman Watts [Fri, 31 Oct 2014 23:51:04 +0000 (19:51 -0400)]
CRM-15551 - crmEditable: add placeholder if empty after editing
Eileen McNaughton [Fri, 31 Oct 2014 15:56:47 +0000 (04:56 +1300)]
Merge pull request #4482 from jitendrapurohit/CRM-15508
CRM-15508 Custom Group Create API references non existant var
Dave Greenberg [Fri, 31 Oct 2014 15:40:19 +0000 (08:40 -0700)]
Merge pull request #4478 from davecivicrm/CRM-15197
CRM-15197 - Fix date formatting in PCP page tpl (should use crmDate). Co...
atif-shaikh [Fri, 31 Oct 2014 13:47:38 +0000 (19:17 +0530)]
CRM-15547 - Current Employer not saved on Drupal user profile
https://issues.civicrm.org/jira/browse/CRM-15547
Yashodha Chaku [Fri, 31 Oct 2014 10:53:43 +0000 (16:23 +0530)]
Merge pull request #4480 from rohankatkar/CRM_15540
Additional changes and notices fix for CRM-15540
jitendrapurohit [Fri, 31 Oct 2014 10:21:49 +0000 (15:51 +0530)]
CRM-15508 Custom Group Create API references non existant var Fix
Yashodha Chaku [Fri, 31 Oct 2014 09:05:33 +0000 (14:35 +0530)]
Merge pull request #4463 from jmcclelland/authorize-recur-unlimited
CRM-15537 - translate open ended installments to 9999 for authorize.net
Rohan Katkar [Fri, 31 Oct 2014 07:19:20 +0000 (12:49 +0530)]
Additional changes and notices fix for CRM-15540
Dave Greenberg [Fri, 31 Oct 2014 00:33:26 +0000 (17:33 -0700)]
CRM-15197 - Fix date formatting in PCP page tpl (should use crmDate). Corresponding webtest fix as well.
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
colemanw [Thu, 30 Oct 2014 22:04:42 +0000 (18:04 -0400)]
Merge pull request #4477 from colemanw/CRM-15541
CRM-15541 - change crm-container-snippet to crm-container for embedded profile forms
Coleman Watts [Thu, 30 Oct 2014 21:58:58 +0000 (17:58 -0400)]
CRM-15541 - change crm-container-snippet to crm-container for embedded profile forms
colemanw [Thu, 30 Oct 2014 20:34:16 +0000 (16:34 -0400)]
Merge pull request #4476 from colemanw/CRM-15534
CRM-15534 - Fix api.getfields to return custom fields from sub-types
Coleman Watts [Thu, 30 Oct 2014 18:57:32 +0000 (14:57 -0400)]
Api getfields code cleanup
Coleman Watts [Thu, 30 Oct 2014 18:55:20 +0000 (14:55 -0400)]
CRM-15534 - Fix api.getfields to return custom fields from sub-types
Kurund Jalmi [Thu, 30 Oct 2014 14:54:34 +0000 (10:54 -0400)]
Merge pull request #4475 from jitendrapurohit/webtestfixes
Fix for webtest WebTest_Contribute_UpdateContributionTest.testDeletePrem...
jitendrapurohit [Thu, 30 Oct 2014 13:07:09 +0000 (18:37 +0530)]
Fix for webtest WebTest_Contribute_UpdateContributionTest.testDeletePremium
Yashodha Chaku [Thu, 30 Oct 2014 07:48:15 +0000 (13:18 +0530)]
Merge pull request #4474 from jitendrapurohit/CRM-15538
DB error fix on search for account_type_code or account_code
jitendrapurohit [Thu, 30 Oct 2014 06:38:01 +0000 (12:08 +0530)]
DB error on search for account_type_code or account_code
Dave Greenberg [Wed, 29 Oct 2014 21:35:44 +0000 (14:35 -0700)]
Merge pull request #4471 from monishdeb/CRM-15500
CRM-15500 fix - Scheduled reminders: if 'Also include' and 'Choose recip...
Dave Greenberg [Wed, 29 Oct 2014 21:15:05 +0000 (14:15 -0700)]
Merge pull request #4468 from monishdeb/CRM-15481
CRM-15481 additional fix
Yashodha Chaku [Wed, 29 Oct 2014 18:01:39 +0000 (23:31 +0530)]
Merge pull request #4470 from rohankatkar/tests
webtest fixes
Rohan Katkar [Wed, 29 Oct 2014 15:00:54 +0000 (20:30 +0530)]
webtest fixes
monishdeb [Wed, 29 Oct 2014 14:58:44 +0000 (20:28 +0530)]
CRM-15500 fix - Scheduled reminders: if 'Also include' and 'Choose recipients' is selected, and no recipients are entered - reminder is sent to all contacts
https://issues.civicrm.org/jira/browse/CRM-15500
atif-shaikh [Wed, 29 Oct 2014 13:20:35 +0000 (18:50 +0530)]
Additional QA Enhancement
atif-shaikh [Wed, 29 Oct 2014 13:11:07 +0000 (18:41 +0530)]
QA Fix
monishdeb [Wed, 29 Oct 2014 11:01:47 +0000 (16:31 +0530)]
Minor change
monishdeb [Wed, 29 Oct 2014 08:40:16 +0000 (14:10 +0530)]
CRM-15481 additional fix
----------------------------------------
* CRM-15481: Scheduled Reminders job failure with event reminders
https://issues.civicrm.org/jira/browse/CRM-15481
atif-shaikh [Wed, 29 Oct 2014 08:24:52 +0000 (13:54 +0530)]
CRM-15427 Additional Fixes
----------------------------------------
* CRM-15427: Profiles using Participants (Event type), Participants (Event Name) and Participants (Role) custom fields are not available for online registration
https://issues.civicrm.org/jira/browse/CRM-15427
Tim Otten [Wed, 29 Oct 2014 03:20:26 +0000 (20:20 -0700)]
Merge pull request #4464 from totten/4.5-regen
regen.sh - Add support for alternate ports (using same configuration as setup.sh)
Tim Otten [Wed, 29 Oct 2014 01:54:49 +0000 (18:54 -0700)]
regen.sh - Add support for alternate ports (using same configuration as setup.sh)
Tim Otten [Tue, 28 Oct 2014 21:21:41 +0000 (14:21 -0700)]
Merge pull request #4299 from JohnFF/4.5-metafix
CRM-15251 - Contact details revealed when certain URLs indexed by search engines
Jamie McClelland [Tue, 28 Oct 2014 21:21:28 +0000 (17:21 -0400)]
CRM-15537 - translate open ended installments to 9999 for authorize.net
----------------------------------------
* CRM-15537: editing recurring contribution for authorize.net with unlimited contributions throws error
https://issues.civicrm.org/jira/browse/CRM-15537
Kurund Jalmi [Tue, 28 Oct 2014 21:00:43 +0000 (17:00 -0400)]
Merge pull request #4462 from kurund/permission-fixes
add missing / new permissions
kurund [Tue, 28 Oct 2014 20:59:52 +0000 (16:59 -0400)]
add missing / new permissions
Monish Deb [Tue, 28 Oct 2014 10:13:01 +0000 (15:43 +0530)]
Merge pull request #4459 from rohankatkar/CRM-15517
CRM-15517 Fix for, images broken for Premiums on contribution page
Monish Deb [Tue, 28 Oct 2014 05:59:33 +0000 (11:29 +0530)]
Merge pull request #4451 from atif-shaikh/CRM-15520
CRM-15520 - Titles of Screens do not support two-line titles
Rohan Katkar [Tue, 28 Oct 2014 05:31:46 +0000 (11:01 +0530)]
CRM-15517 Fix for images broken for Premiums on contribution page
Yashodha Chaku [Tue, 28 Oct 2014 05:27:03 +0000 (10:57 +0530)]
Merge pull request #4453 from jitendrapurohit/CRM-15501
CRM-15501 Wrong File ID on Public Multi-Record Detail View Fix
Yashodha Chaku [Tue, 28 Oct 2014 05:23:12 +0000 (10:53 +0530)]
Merge pull request #4452 from yashodha/CRM-15445
CRM-15445: fix missing title
Dave Greenberg [Mon, 27 Oct 2014 23:09:38 +0000 (16:09 -0700)]
Merge pull request #4439 from colemanw/CRM-15523
CRM-15523 - Add sub-type custom fields to list of available tokens
Dave Greenberg [Mon, 27 Oct 2014 22:21:34 +0000 (15:21 -0700)]
Merge pull request #4455 from lcdservices/CRM-15525
CRM-15525 change require to require_once
Brian Shaughnessy [Mon, 27 Oct 2014 18:14:33 +0000 (14:14 -0400)]
CRM-15525 change require to require_once
Dave Greenberg [Mon, 27 Oct 2014 17:57:28 +0000 (10:57 -0700)]
Merge pull request #4437 from atif-shaikh/CRM-15427
CRM-15427 - Profiles using Participants (Event type), Participants (Even...
colemanw [Mon, 27 Oct 2014 17:25:35 +0000 (13:25 -0400)]
Merge pull request #4454 from colemanw/CRM-15530
CRM-15530 - Fix event profile remove button
Coleman Watts [Mon, 27 Oct 2014 17:16:32 +0000 (13:16 -0400)]
CRM-15530 - Fix event profile remove button
jitendrapurohit [Mon, 27 Oct 2014 12:38:12 +0000 (18:08 +0530)]
CRM-15501 Wrong File ID on Public Multi-Record Detail View Fix
CiviCRM [Mon, 27 Oct 2014 10:47:34 +0000 (16:17 +0530)]
CRM-15445: fix missing title
atif-shaikh [Mon, 27 Oct 2014 08:33:15 +0000 (14:03 +0530)]
CRM-15520 - Titles of Screens do not support two-line titles
https://issues.civicrm.org/jira/browse/CRM-15520
Tim Otten [Mon, 27 Oct 2014 07:19:22 +0000 (00:19 -0700)]
Merge pull request #4450 from totten/4.5-test-fixes
INFRA-124 - Misc fixes based on paratest failures
Tim Otten [Mon, 27 Oct 2014 04:13:47 +0000 (21:13 -0700)]
CRM-15198 - CRM/Core/EntityReference.php - Fix syntax
Tim Otten [Mon, 27 Oct 2014 03:54:02 +0000 (20:54 -0700)]
Merge pull request #4411 from totten/4.5-case-type-utf8
CaseType XML - Generate UTF-8 instead of ISO-8859-1
Tim Otten [Mon, 27 Oct 2014 03:34:50 +0000 (20:34 -0700)]
CRM_Contribution_BAO_Contribution - Fix test failure
Test failurewas observed on toj-1 (Ubuntu 12.04) with paratest.
https://test.civicrm.org/job/CiviCRM-Core-Matrix-exp/CIVIVER=4.5,label=toj-1/8/testReport/%28root%29/CRM_Batch_Form_EntryTest/testProcessMembership/
Tim Otten [Sat, 25 Oct 2014 09:30:12 +0000 (02:30 -0700)]
Merge pull request #4441 from totten/4.5-civitest-reset-id
INFRA-124 - CiviUnitTestCase - Reset the session-scoped user ID between tests
Tim Otten [Sat, 25 Oct 2014 07:22:07 +0000 (03:22 -0400)]
INFRA-124 - CiviUnitTestCase - Reset the session-scoped user ID between tests
Coleman Watts [Sat, 25 Oct 2014 01:37:30 +0000 (21:37 -0400)]
CRM-15524 - Support addSetting in snippet mode
Dave Greenberg [Fri, 24 Oct 2014 21:07:08 +0000 (14:07 -0700)]
Merge pull request #4423 from PalanteJon/aclReportFix-4.5
CRM-15482 - CiviReport - fix ACL clause on Contribution Details w/ soft ...
Coleman Watts [Fri, 24 Oct 2014 19:33:11 +0000 (15:33 -0400)]
CRM-15523 - Add sub-type custom fields to list of available tokens
colemanw [Fri, 24 Oct 2014 18:03:09 +0000 (14:03 -0400)]
Merge pull request #4436 from colemanw/CRM-15107
CRM-15107 - Fix slow group_contact count query on large dbs
atif-shaikh [Fri, 24 Oct 2014 15:25:55 +0000 (20:55 +0530)]
CRM-15427 - Profiles using Participants (Event type), Participants (Event Name) and Participants (Role) fields are not available for online registration
https://issues.civicrm.org/jira/browse/CRM-15427
Coleman Watts [Fri, 24 Oct 2014 12:44:56 +0000 (08:44 -0400)]
CRM-15107 - Fix slow group_contact count query on large dbs
Yashodha Chaku [Fri, 24 Oct 2014 11:09:15 +0000 (16:39 +0530)]
Merge pull request #4435 from yashodha/version-fix
version fixes
CiviCRM [Fri, 24 Oct 2014 11:07:44 +0000 (16:37 +0530)]
version fixes
colemanw [Thu, 23 Oct 2014 18:55:02 +0000 (14:55 -0400)]
Merge pull request #4432 from colemanw/hideMenu
Make 'civicrm menu hidden' alert less obtrusive
Coleman Watts [Thu, 23 Oct 2014 18:54:09 +0000 (14:54 -0400)]
Make 'civicrm menu hidden' alert less obtrusive
Dave Greenberg [Wed, 22 Oct 2014 23:56:41 +0000 (16:56 -0700)]
Merge pull request #4416 from monishdeb/CRM-15481
CRM-15481 fix - Scheduled Reminders job failure with event reminders
Kurund Jalmi [Wed, 22 Oct 2014 18:50:18 +0000 (11:50 -0700)]
Merge pull request #4419 from eileenmcnaughton/CRM-15510
CRM-15510 param retrieval issue
colemanw [Wed, 22 Oct 2014 18:40:24 +0000 (14:40 -0400)]
Merge pull request #4430 from colemanw/CRM-15483
CRM-15483 - Fix js loading event form fee block
Coleman Watts [Wed, 22 Oct 2014 18:39:00 +0000 (14:39 -0400)]
CRM-15483 - Fix js loading event form fee block
colemanw [Wed, 22 Oct 2014 18:28:51 +0000 (14:28 -0400)]
Merge pull request #4429 from colemanw/CRM-15476
CRM-15476 - Only validate chainSelect fields if the control field exists
Coleman Watts [Wed, 22 Oct 2014 18:27:38 +0000 (14:27 -0400)]
CRM-15476 - Only validate chainSelect fields if the control field exists
Coleman Watts [Wed, 22 Oct 2014 18:24:47 +0000 (14:24 -0400)]
CRM-15346 - Also trigger crmUnload when refreshing content
colemanw [Wed, 22 Oct 2014 18:06:07 +0000 (14:06 -0400)]
Merge pull request #4428 from colemanw/CRM-15346
CRM-15346 - Trigger Drupal.detachBehaviors when removing dynamic content
Coleman Watts [Wed, 22 Oct 2014 18:04:04 +0000 (14:04 -0400)]
CRM-15346 - Trigger Drupal.detachBehaviors when removing dynamic content
colemanw [Wed, 22 Oct 2014 16:52:39 +0000 (12:52 -0400)]
Merge pull request #4427 from colemanw/CRM-15472
CRM-15472 - Freeze activity target field if too many contacts
Coleman Watts [Wed, 22 Oct 2014 15:03:56 +0000 (11:03 -0400)]
CRM-15472 - Freeze activity target field if too many contacts
colemanw [Wed, 22 Oct 2014 14:54:52 +0000 (10:54 -0400)]
Merge pull request #4425 from colemanw/CRM-15476
CRM-15476 - Add fall-back for ChainSelect when control field not present
Coleman Watts [Wed, 22 Oct 2014 14:09:57 +0000 (10:09 -0400)]
CRM-15476 - Add fall-back for ChainSelect when control field not present
colemanw [Wed, 22 Oct 2014 13:20:58 +0000 (09:20 -0400)]
Merge pull request #4424 from colemanw/CRM-15507
CRM-15507 - Change options-edit icon from pencil to wrench
projects / civicrm-core.git / log