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 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
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
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
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
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
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
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
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...
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
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
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...
Eileen McNaughton [Mon, 20 Oct 2014 19:40:51 +0000 (08:40 +1300)]
Merge pull request #4402 from eileenmcnaughton/CRM-15236
CRM-15236 fix bugs in reports & extend testing
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
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 [Fri, 5 Sep 2014 00:30:34 +0000 (12:30 +1200)]
CRM-15236 apply same fix to Household summary
Eileen McNaughton [Fri, 5 Sep 2014 00:24:48 +0000 (12:24 +1200)]
reformat whitespace
Eileen McNaughton [Fri, 5 Sep 2014 00:13:17 +0000 (12:13 +1200)]
CRM-15236 fix organizationsummary report php warning & make test work
Eileen McNaughton [Fri, 5 Sep 2014 00:09:07 +0000 (12:09 +1200)]
CRM-15236 extend report testing to include organizationsummary
Conflicts:
tests/phpunit/api/v3/ReportTemplateTest.php
Eileen McNaughton [Fri, 5 Sep 2014 00:24:48 +0000 (12:24 +1200)]
reformat whitespace
Eileen McNaughton [Fri, 5 Sep 2014 00:13:17 +0000 (12:13 +1200)]
CRM-15236 fix organizationsummary report php warning & make test work
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 06:18:38 +0000 (19:18 +1300)]
Merge pull request #4401 from eileenmcnaughton/CRM-14730
CRM-14730 temp fix for over-long URLs
Eileen McNaughton [Mon, 20 Oct 2014 04:37:01 +0000 (17:37 +1300)]
Merge pull request #4393 from eileenmcnaughton/CRM-15491
CRM-15491 fix membership_status api to be more appropriate on update
Eileen McNaughton [Wed, 10 Sep 2014 00:12:57 +0000 (12:12 +1200)]
CRM-15271 - broken last viewed links
Eileen McNaughton [Thu, 22 May 2014 03:55:28 +0000 (15:55 +1200)]
CRM-14730 temp fix for over-long URLs
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
Eileen McNaughton [Sun, 19 Oct 2014 21:01:50 +0000 (10:01 +1300)]
RM-15491 fix membership_status api to be more appropriate on update
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
Eileen McNaughton [Sun, 19 Oct 2014 19:59:18 +0000 (08:59 +1300)]
Merge pull request #4392 from eileenmcnaughton/CRM-15446
CRM-15446 extend alter tests
Eileen McNaughton [Sun, 19 Oct 2014 11:30:17 +0000 (00:30 +1300)]
SyntaxConformanceTest enable 2 mor entities for singleValueAlter
Eileen McNaughton [Sun, 19 Oct 2014 11:13:53 +0000 (00:13 +1300)]
syntaxconformancetest enable a couple more entities for testing
Eileen McNaughton [Sun, 19 Oct 2014 10:58:28 +0000 (23:58 +1300)]
SyntaxConformanceTest fix tag to work on singlevaluealter
Eileen McNaughton [Sun, 19 Oct 2014 10:50:01 +0000 (23:50 +1300)]
SyntaxConformanceTest fix pricefieldvalue to pass singlevaluealter
Eileen McNaughton [Sun, 19 Oct 2014 10:48:01 +0000 (23:48 +1300)]
SyntaxConformanceTest in singlevalue alter reset fields with foreign keys so we can clean up after ok without constraints all over the show
Eileen McNaughton [Sun, 19 Oct 2014 09:58:55 +0000 (22:58 +1300)]
fix typo
Eileen McNaughton [Sun, 19 Oct 2014 09:58:09 +0000 (22:58 +1300)]
enable price set single value alter test
Eileen McNaughton [Sun, 19 Oct 2014 09:12:32 +0000 (22:12 +1300)]
Merge pull request #4351 from eileenmcnaughton/CRM-15446
CRM-15446 ensure net_amount always set on create contribution
Eileen McNaughton [Sun, 19 Oct 2014 08:15:53 +0000 (21:15 +1300)]
minor tidy ups
Eileen McNaughton [Sun, 19 Oct 2014 08:11:38 +0000 (21:11 +1300)]
to get tests to pass add a hack-around to allow us to clear static var
Eileen McNaughton [Sun, 19 Oct 2014 07:31:39 +0000 (20:31 +1300)]
fix membership_type to be editable within tests so we can address test failure
Eileen McNaughton [Sun, 19 Oct 2014 06:21:23 +0000 (19:21 +1300)]
remove unused parameter (no other calls to this fn)
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
eileenmcnaughton [Sat, 18 Oct 2014 11:04:02 +0000 (11:04 +0000)]
CRM-15446 fix test to reflect actual returned value
eileenmcnaughton [Sat, 18 Oct 2014 10:52:22 +0000 (10:52 +0000)]
api example updates
Eileen McNaughton [Mon, 13 Oct 2014 08:08:51 +0000 (21:08 +1300)]
CRM-15446 additional test to check minor restructure of defaults
Eileen McNaughton [Mon, 13 Oct 2014 07:55:43 +0000 (20:55 +1300)]
CRM-15446 fix for net_amount not being set
Eileen McNaughton [Mon, 13 Oct 2014 07:55:05 +0000 (20:55 +1300)]
CRM-15466 add test to ensure net_amount is set correctly
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