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
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 ...
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
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
Coleman Watts [Wed, 22 Oct 2014 13:16:17 +0000 (09:16 -0400)]
CRM-15507 - Increase dialog percent width on small screens
Jon goldberg [Fri, 17 Oct 2014 23:40:05 +0000 (19:40 -0400)]
CRM-15482 - CiviReport - fix ACL clause on Contribution Details w/ soft credits
Monish Deb [Wed, 22 Oct 2014 09:20:19 +0000 (14:50 +0530)]
Merge pull request #4405 from jitendrapurohit/CRM-15477
CRM-15477
Dave Greenberg [Wed, 22 Oct 2014 01:50:46 +0000 (18:50 -0700)]
Merge pull request #4421 from davecivicrm/CRM-15433
CRM-15433 - Fix skipPayment function so it works regardless of currency ...
Coleman Watts [Wed, 22 Oct 2014 00:36:23 +0000 (20:36 -0400)]
CRM-15507 - Change options-edit icon from pencil to wrench
Kurund Jalmi [Tue, 21 Oct 2014 23:19:48 +0000 (16:19 -0700)]
Merge pull request #4413 from rohankatkar/Webtests
Fix for webtest: WebTest_Import_ContactSubtypeTest::testHouseholdSubtype...
Dave Greenberg [Tue, 21 Oct 2014 23:13:03 +0000 (16:13 -0700)]
CRM-15433 - Fix skipPayment function so it works regardless of currency localization.
----------------------------------------
* CRM-15433: Billing info and payment options blocks not hidden for $0 events with price sets when decimal delimiter is NOT a dot
https://issues.civicrm.org/jira/browse/CRM-15433
Eileen McNaughton [Tue, 21 Oct 2014 22:01:45 +0000 (11:01 +1300)]
CRM-15510 param retrieval issue
Conflicts:
CRM/Event/Page/AJAX.php
Monish Deb [Tue, 21 Oct 2014 16:31:35 +0000 (22:01 +0530)]
Merge pull request #4414 from jitendrapurohit/CRM-15480
CRM-15480 Fix for Recording completed payment for Pending membership fro...
monishdeb [Tue, 21 Oct 2014 14:35:03 +0000 (20:05 +0530)]
CRM-15481 fix - Scheduled Reminders job failure with event reminders
https://issues.civicrm.org/jira/browse/CRM-15481
jitendrapurohit [Tue, 21 Oct 2014 12:53:37 +0000 (18:23 +0530)]
CRM-15480 Fix for Recording completed payment for Pending membership from Edit Membership throws fatal error
Rohan Katkar [Tue, 21 Oct 2014 08:44:38 +0000 (14:14 +0530)]
Fix for webtest: WebTest_Import_ContactSubtypeTest::testHouseholdSubtypeImport
colemanw [Tue, 21 Oct 2014 02:55:10 +0000 (22:55 -0400)]
Merge pull request #4408 from jitendrapurohit/CRM-15485
CRM-15485
Dave Greenberg [Mon, 20 Oct 2014 20:38:18 +0000 (13:38 -0700)]
Merge pull request #4409 from davecivicrm/CRM-15418
CRM-15418 - Prevent non-contact tokens from being lost in replaceGreetin...
Dave Greenberg [Mon, 20 Oct 2014 19:19:28 +0000 (12:19 -0700)]
CRM-15418 - Prevent non-contact tokens from being lost in replaceGreetingTokens function.
----------------------------------------
* CRM-15418:
https://issues.civicrm.org/jira/browse/CRM-15418
Dave Greenberg [Mon, 20 Oct 2014 18:05:59 +0000 (11:05 -0700)]
Merge pull request #4406 from rohankatkar/CRM-15473
Fix for CRM-15473
jitendrapurohit [Mon, 20 Oct 2014 13:10:54 +0000 (18:40 +0530)]
CRM-15485
Yashodha Chaku [Mon, 20 Oct 2014 11:16:14 +0000 (16:46 +0530)]
Merge pull request #4407 from rohankatkar/Webtests
Webtest fix
Rohan Katkar [Mon, 20 Oct 2014 11:00:06 +0000 (16:30 +0530)]
Webtest fix
Rohan Katkar [Mon, 20 Oct 2014 10:55:29 +0000 (16:25 +0530)]
Fix for CRM-15473
jitendrapurohit [Mon, 20 Oct 2014 09:39:04 +0000 (15:09 +0530)]
CRM-15477
Eileen McNaughton [Mon, 20 Oct 2014 08:22:17 +0000 (21:22 +1300)]
Merge pull request #4398 from kenwest/CRM-15492-4.5
CRM-15492 / 4.5 branch
Eileen McNaughton [Mon, 20 Oct 2014 06:32:18 +0000 (19:32 +1300)]
Merge pull request #4399 from eileenmcnaughton/CRM-15496
CRM-15496 api contribution.complete_transaction improve recurring handli...
Eileen McNaughton [Mon, 20 Oct 2014 02:37:59 +0000 (15:37 +1300)]
api contribution.completetransaction fix misname of _spec function
Conflicts:
api/v3/Contribution.php
Eileen McNaughton [Mon, 20 Oct 2014 02:21:06 +0000 (15:21 +1300)]
CRM-15496 api contribution.complete_transaction improve recurring handling
colemanw [Mon, 20 Oct 2014 00:17:01 +0000 (20:17 -0400)]
Merge pull request #4397 from crusonweb/CRM-15494
CRM-15494 Fix label display for Joomla 3.x
Ken West [Sun, 19 Oct 2014 23:56:53 +0000 (10:56 +1100)]
CRM-15492 / 4.5 branch / Notice: Undefined index: include in CRM_Mailing_Form_Group->setDefaultValues()
Dan Cruson [Sun, 19 Oct 2014 23:55:36 +0000 (19:55 -0400)]
CRM-15494 Fix label display for Joomla 3.x
Fix the display of the labels so they are readable in the default
template in Joomla 3.
colemanw [Sun, 19 Oct 2014 23:51:33 +0000 (19:51 -0400)]
Merge pull request #4396 from colemanw/CRM-15493
CRM-15493 - Ensure quickSearch uses a fresh qfKey every time
Coleman Watts [Sun, 19 Oct 2014 22:00:24 +0000 (18:00 -0400)]
CRM-15493 - Ensure quickSearch uses a fresh qfKey every time
Kurund Jalmi [Sun, 19 Oct 2014 05:18:10 +0000 (22:18 -0700)]
Merge pull request #4314 from cividesk/CRM-13227
CRM-13227, CRM-14744: full fix
colemanw [Sat, 18 Oct 2014 23:34:43 +0000 (19:34 -0400)]
Merge pull request #4388 from colemanw/CRM-15486
CRM-15486 - Fix pager js for non-form pages
Coleman Watts [Sat, 18 Oct 2014 23:28:49 +0000 (19:28 -0400)]
CRM-15486 - Fix pager js for non-form pages
colemanw [Sat, 18 Oct 2014 21:41:35 +0000 (17:41 -0400)]
Merge pull request #4386 from colemanw/CRM-15471
CRM-15471 - Clear search checkboxes when choosing 'select all' radio
Coleman Watts [Sat, 18 Oct 2014 21:40:44 +0000 (17:40 -0400)]
CRM-15471 - Clear search checkboxes when choosing 'select all' radio
colemanw [Sat, 18 Oct 2014 19:52:56 +0000 (15:52 -0400)]
Merge pull request #4385 from colemanw/CRM-15484
CRM-15484 - Ensure event edit links go to backend
Coleman Watts [Sat, 18 Oct 2014 19:47:29 +0000 (15:47 -0400)]
CRM-15484 - Event edit links tpl cleanup
Coleman Watts [Sat, 18 Oct 2014 19:21:17 +0000 (15:21 -0400)]
CRM-15484 - Ensure event edit links go to backend
Dave Greenberg [Fri, 17 Oct 2014 22:50:28 +0000 (15:50 -0700)]
Merge pull request #4359 from jmcclelland/duplicate-registration-take-two
CRM-15452 - ensure dupes not added when no event fee is used.
Dave Greenberg [Fri, 17 Oct 2014 22:21:40 +0000 (15:21 -0700)]
Merge pull request #4361 from jmcclelland/civimail-test-duplicate
CRM-15455 - avoid creating dupes and using deleted contacts in test
Dave Greenberg [Fri, 17 Oct 2014 19:28:46 +0000 (12:28 -0700)]
Merge pull request #4379 from jitendrapurohit/CRM-14968
CRM-14968
Yashodha Chaku [Fri, 17 Oct 2014 15:41:51 +0000 (21:11 +0530)]
Merge pull request #4329 from davecivicrm/CRM-15376
CRM-15376 - Porting fixes from https://github.com/civicrm/civicrm-core/p...
Monish Deb [Fri, 17 Oct 2014 14:10:45 +0000 (19:40 +0530)]
Merge pull request #4383 from monishdeb/CRM-15328
CRM-15328 fix - Api ContactType Create Fails for Update
monishdeb [Fri, 17 Oct 2014 10:42:14 +0000 (16:12 +0530)]
CRM-15328 fix - Api ContactType Create Fails for Update
https://issues.civicrm.org/jira/browse/CRM-15328
Monish Deb [Fri, 17 Oct 2014 10:31:19 +0000 (16:01 +0530)]
Merge pull request #4382 from rohankatkar/CRM-15458
Fix for CRM-15458
Monish Deb [Fri, 17 Oct 2014 08:36:56 +0000 (14:06 +0530)]
Merge pull request #4380 from atif-shaikh/CRM-15301
CRM-15301 - Sorted order is not respected in 'Export Contacts' csv
Monish Deb [Fri, 17 Oct 2014 06:43:56 +0000 (12:13 +0530)]
Merge pull request #4378 from jitendrapurohit/CRM-15447
Related test build failure is not related to current PR changes, also tested(follow issue link), hence merging
jitendrapurohit [Fri, 17 Oct 2014 06:29:03 +0000 (11:59 +0530)]
Additional Fixes
jitendrapurohit [Thu, 16 Oct 2014 12:05:15 +0000 (17:35 +0530)]
CRM-14968
Rohan Katkar [Fri, 17 Oct 2014 05:33:25 +0000 (11:03 +0530)]
Fix for CRM-15458
colemanw [Thu, 16 Oct 2014 21:40:49 +0000 (17:40 -0400)]
Merge pull request #4381 from colemanw/strikethrough
Remove redundant css class
Coleman Watts [Thu, 16 Oct 2014 21:32:49 +0000 (17:32 -0400)]
Remove redundant css class
Dave Greenberg [Thu, 16 Oct 2014 20:14:32 +0000 (13:14 -0700)]
Merge pull request #4377 from monishdeb/CRM-15439
CRM-15439 fix - Regression of CRM-15121 - searching on reciprocal relationships
atif-shaikh [Thu, 16 Oct 2014 14:05:35 +0000 (19:35 +0530)]
CRM-15301 - Sorted order is not respected in 'Export Contacts' csv
https://issues.civicrm.org/jira/browse/CRM-15301
jitendrapurohit [Thu, 16 Oct 2014 09:51:29 +0000 (15:21 +0530)]
CRM-15447
monishdeb [Thu, 16 Oct 2014 06:57:33 +0000 (12:27 +0530)]
CRM-15439 fix - Regression of CRM-13149 - searching on reciprocal relationships
https://issues.civicrm.org/jira/browse/CRM-15439
Dave Greenberg [Wed, 15 Oct 2014 20:50:27 +0000 (13:50 -0700)]
Merge pull request #4372 from davecivicrm/CRM-15467
CRM-15467 - Set location type to is_default and fix group_type in uf_gro...
Dave Greenberg [Wed, 15 Oct 2014 20:00:17 +0000 (13:00 -0700)]
CRM-15467 - Set location type to is_default and fix group_type in uf_group insert.
----------------------------------------
* CRM-15467:
https://issues.civicrm.org/jira/browse/CRM-15467
Dave Greenberg [Wed, 15 Oct 2014 19:13:22 +0000 (12:13 -0700)]
Merge pull request #4371 from colemanw/CRM-15438
CRM-15438 - Fix search component_mode selections
Coleman Watts [Wed, 15 Oct 2014 18:29:09 +0000 (14:29 -0400)]
CRM-15438 - Fix search component_mode selections
colemanw [Wed, 15 Oct 2014 02:39:58 +0000 (22:39 -0400)]
Merge pull request #4366 from colemanw/CRM-15442
CRM-15442 - Change spaces to wildcards in contact.getlist api
Coleman Watts [Wed, 15 Oct 2014 02:33:28 +0000 (22:33 -0400)]
CRM-15442 - Change spaces to wildcards in contact.getlist api
colemanw [Wed, 15 Oct 2014 01:55:40 +0000 (21:55 -0400)]
Merge pull request #4365 from colemanw/CRM-15451
CRM-15451 - Fix api.getlist handling of deceased contacts
colemanw [Wed, 15 Oct 2014 01:50:15 +0000 (21:50 -0400)]
Merge pull request #4363 from colemanw/CRM-15456
CRM-15456 - Add safety checks to avoid errors when updating tabs
Tim Otten [Tue, 14 Oct 2014 23:05:07 +0000 (16:05 -0700)]
Merge pull request #4362 from kurund/CRM-15436
CRM-15436: "Download and Install" action for extension does not create menu entries
Coleman Watts [Tue, 14 Oct 2014 21:35:22 +0000 (17:35 -0400)]
CRM-15456 - Add safety checks to avoid errors when updating tabs
Coleman Watts [Tue, 14 Oct 2014 22:13:05 +0000 (18:13 -0400)]
CRM-15451 - Fix api.getlist handling of deceased contacts
colemanw [Tue, 14 Oct 2014 21:50:36 +0000 (17:50 -0400)]
Merge pull request #4364 from colemanw/static
Fix PHP static context error
Coleman Watts [Tue, 14 Oct 2014 21:49:01 +0000 (17:49 -0400)]
Fix PHP static context error
kurund [Tue, 14 Oct 2014 21:28:04 +0000 (02:58 +0530)]
CRM-15436, undo not a typo fix
kurund [Tue, 14 Oct 2014 21:14:36 +0000 (02:44 +0530)]
CRM-15436, because of caching of xml items, xml menu items defined by extension are not resolved during 'download and install' process, hence force computing menu items from xml during hard reset, i.e when we truncate civicrm_menu
kurund [Tue, 14 Oct 2014 20:23:34 +0000 (01:53 +0530)]
CRM-15436, fixed typo
colemanw [Tue, 14 Oct 2014 19:32:08 +0000 (15:32 -0400)]
Merge pull request #4354 from colemanw/CRM-14949
CRM-14949 Fix access_callback for l10n-js
Jamie McClelland [Tue, 14 Oct 2014 17:09:08 +0000 (13:09 -0400)]
CRM-15455 - avoid creating dupes and using deleted contacts in test
mailings.
----------------------------------------
* CRM-15455: email tests do not properly replace tokens
https://issues.civicrm.org/jira/browse/CRM-15455
Jamie McClelland [Tue, 14 Oct 2014 14:53:01 +0000 (10:53 -0400)]
CRM-15452 - ensure dupes not added when no event fee is used.
----------------------------------------
* CRM-15452: When no registration fee is involved, duplicate registration still created for event
https://issues.civicrm.org/jira/browse/CRM-15452
Monish Deb [Tue, 14 Oct 2014 12:00:09 +0000 (17:30 +0530)]
Merge pull request #4358 from monishdeb/CRM-15430
CRM-15430 indentation fixes
projects / civicrm-core.git / log