Eileen McNaughton [Wed, 29 Oct 2014 05:06:48 +0000 (18:06 +1300)]
Merge pull request #4466 from eileenmcnaughton/master
Master
Eileen McNaughton [Wed, 29 Oct 2014 04:14:19 +0000 (17:14 +1300)]
whitespace - strip trailing spaces:
Eileen McNaughton [Wed, 29 Oct 2014 04:11:04 +0000 (17:11 +1300)]
more whitespace cleanup
Eileen McNaughton [Wed, 29 Oct 2014 03:34:42 +0000 (16:34 +1300)]
whitespace cleanup
Eileen McNaughton [Wed, 29 Oct 2014 03:26:35 +0000 (16:26 +1300)]
Merge pull request #4465 from eileenmcnaughton/master
remove trailing whitespace & tabs
Eileen McNaughton [Wed, 29 Oct 2014 02:25:16 +0000 (15:25 +1300)]
more whitespace -remove trailing spaces
Eileen McNaughton [Wed, 29 Oct 2014 02:16:09 +0000 (15:16 +1300)]
whitespace fixups
Eileen McNaughton [Wed, 29 Oct 2014 02:07:09 +0000 (15:07 +1300)]
remove tabs, trailing spaces
kurund [Tue, 28 Oct 2014 21:03:43 +0000 (17:03 -0400)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-28-17-02-35
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
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
Eileen McNaughton [Tue, 28 Oct 2014 03:35:42 +0000 (16:35 +1300)]
Merge pull request #4457 from eileenmcnaughton/master
tidy up of trailing spaces & tabs
Eileen McNaughton [Tue, 28 Oct 2014 03:34:37 +0000 (16:34 +1300)]
Merge pull request #4456 from eileenmcnaughton/CRM-15509
CRM-15509 remove hard-coded billing info from Billing.tpl
Eileen McNaughton [Tue, 28 Oct 2014 01:48:31 +0000 (14:48 +1300)]
CRM-15509 fix paypal express path
Eileen McNaughton [Tue, 28 Oct 2014 00:18:40 +0000 (13:18 +1300)]
remove trailing spaces, swap tabs for double spaces
Eileen McNaughton [Mon, 27 Oct 2014 23:29:45 +0000 (12:29 +1300)]
whitespace
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
Eileen McNaughton [Mon, 27 Oct 2014 21:34:38 +0000 (10:34 +1300)]
CRM-15509 remove hidePaypalExpress assignment as I've switched to an opt-in in the tpl
Eileen McNaughton [Mon, 27 Oct 2014 21:26:42 +0000 (10:26 +1300)]
CRM-15509 put div outside if statements & ensure fieldsets are enclosing within an if statement
Eileen McNaughton [Mon, 27 Oct 2014 21:21:48 +0000 (10:21 +1300)]
CRM-15509 payment processor structure fix typo on previous
Eileen McNaughton [Mon, 27 Oct 2014 21:14:03 +0000 (10:14 +1300)]
CRM-15509 move paypal express to its own file for clarity
Eileen McNaughton [Mon, 27 Oct 2014 21:02:49 +0000 (10:02 +1300)]
CRM-15509 remove hard-coded billing & card blocks in the tpl in favour of assigned fields
(note that a next step will be to allow processors to interact with the defined fields
Eileen McNaughton [Mon, 27 Oct 2014 19:24:36 +0000 (08:24 +1300)]
CRM-15509 towards refactoring control of payment fields to the payment
processors
This doesn't do much in itself but moves a small piece of the logic out
of the tpl where it can be more easily overrided. However, this is not
expected to be the final resting place of this assignment
Eileen McNaughton [Mon, 27 Oct 2014 19:11:47 +0000 (08:11 +1300)]
CRM-15509 cleanup, I grepped templates & couldn't find this param in use
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 06:07:14 +0000 (23:07 -0700)]
Merge pull request #4449 from eileenmcnaughton/master
Master
Eileen McNaughton [Tue, 21 Oct 2014 20:34:57 +0000 (09:34 +1300)]
whitespace only
Tim Otten [Mon, 27 Oct 2014 04:13:47 +0000 (21:13 -0700)]
CRM-15198 - CRM/Core/EntityReference.php - Fix syntax
Eileen McNaughton [Mon, 27 Oct 2014 04:13:18 +0000 (17:13 +1300)]
Merge pull request #4448 from eileenmcnaughton/CRM-15527
CRM-15527 fix crash on membership renewals due to ->id not being set
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/
eileenmcnaughton [Mon, 27 Oct 2014 02:48:10 +0000 (02:48 +0000)]
api examples update
Eileen McNaughton [Mon, 27 Oct 2014 02:47:41 +0000 (15:47 +1300)]
CRM-15527 test includes check for CRM-15203, not yet fixed so mark incomplete
Eileen McNaughton [Mon, 27 Oct 2014 02:43:19 +0000 (15:43 +1300)]
CRM-15527 minor tidyup since = False is never returned
Eileen McNaughton [Tue, 14 Oct 2014 00:58:32 +0000 (13:58 +1300)]
CRM-15444 fix crash on membership renewals due to ->id not being set
Eileen McNaughton [Mon, 27 Oct 2014 02:38:11 +0000 (15:38 +1300)]
CRM-15527 tests indicate ['membership'] is likely to be an array at this stage
Eileen McNaughton [Mon, 27 Oct 2014 02:33:22 +0000 (15:33 +1300)]
CRM-15227 tests to demonstrate bug in recurring membership transaction IPN
Eileen McNaughton [Mon, 27 Oct 2014 00:54:56 +0000 (13:54 +1300)]
Merge pull request #4447 from eileenmcnaughton/CRM-15299
CRM-15299 extend sql operator test to reflect fixed entities
Eileen McNaughton [Mon, 27 Oct 2014 00:44:02 +0000 (13:44 +1300)]
Merge pull request #4446 from eileenmcnaughton/tidy-ups
Tidy ups
Eileen McNaughton [Sun, 26 Oct 2014 23:38:13 +0000 (12:38 +1300)]
Merge pull request #4443 from eileenmcnaughton/CRM-15526
CRM-15226 move generic code out of specific class
Eileen McNaughton [Sun, 26 Oct 2014 23:30:56 +0000 (12:30 +1300)]
CRM-15299 extend sql operator test to reflect fixed entities
Eileen McNaughton [Sun, 26 Oct 2014 22:35:28 +0000 (11:35 +1300)]
enotice fix
Eileen McNaughton [Mon, 15 Sep 2014 09:23:54 +0000 (21:23 +1200)]
spelling
Eileen McNaughton [Sat, 25 Oct 2014 21:18:50 +0000 (10:18 +1300)]
CRM-15226 move generic code out of specific class
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 ...
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
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
kurund [Tue, 21 Oct 2014 22:21:03 +0000 (15:21 -0700)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-21-15-20-57
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
Eileen McNaughton [Mon, 20 Oct 2014 23:22:19 +0000 (12:22 +1300)]
Merge pull request #4412 from eileenmcnaughton/CRM-15297-install
CRM-15297 add drupal 8 install class to core
Eileen McNaughton [Mon, 20 Oct 2014 23:17:45 +0000 (12:17 +1300)]
Merge pull request #4410 from eileenmcnaughton/CRM-15297
CRM-15297 drupal 8 integration
Eileen McNaughton [Mon, 20 Oct 2014 21:56:18 +0000 (10:56 +1300)]
CRM-15297 add drupal 8 install class to core
Tim Otten [Mon, 20 Oct 2014 21:46:21 +0000 (14:46 -0700)]
CaseType XML - Generate UTF-8 instead of ISO-8859-1
http://forum.civicrm.org/index.php?topic=34525.new
projects / civicrm-core.git / log