civicrm-core.git
8 years agoAdd a Backdrop CMS suggestion in the civi settings file.
Jen Lampton [Wed, 16 Dec 2015 01:19:08 +0000 (17:19 -0800)]
Add a Backdrop CMS suggestion in the civi settings file.

8 years agoAdd Backdrop support in CodeGen.
Jen Lampton [Wed, 16 Dec 2015 01:03:57 +0000 (17:03 -0800)]
Add Backdrop support in CodeGen.

8 years agoCRM-17711 - CRM_*_Backdrop - Fix enough to run setup.sh
Tim Otten [Tue, 15 Dec 2015 23:35:53 +0000 (15:35 -0800)]
CRM-17711 - CRM_*_Backdrop - Fix enough to run setup.sh

8 years agoCRM_*_Backdrop - Fix enough to run setup.sh
Tim Otten [Tue, 15 Dec 2015 23:35:53 +0000 (15:35 -0800)]
CRM_*_Backdrop - Fix enough to run setup.sh

8 years agoCopy CRM/*/Drupal.php to CRM/*/Backdrop.php
Tim Otten [Tue, 15 Dec 2015 23:18:19 +0000 (15:18 -0800)]
Copy CRM/*/Drupal.php to CRM/*/Backdrop.php

8 years agoMerge pull request #7450 from davejenx/CRM-17702
Dave Greenberg [Thu, 17 Dec 2015 01:43:44 +0000 (17:43 -0800)]
Merge pull request #7450 from davejenx/CRM-17702

CRM-17702 - Fix validation for multiple membership types when using price sets on back-end membership creation…

8 years agoMerge pull request #7454 from eileenmcnaughton/R8995
Dave Greenberg [Thu, 17 Dec 2015 00:15:39 +0000 (16:15 -0800)]
Merge pull request #7454 from eileenmcnaughton/R8995

CRM_17474 standardise address field addition to other reports

8 years agoMerge pull request #7456 from davejenx/CRM-17717
colemanw [Wed, 16 Dec 2015 19:57:33 +0000 (14:57 -0500)]
Merge pull request #7456 from davejenx/CRM-17717

CRM-17717 - send correct MIME type for .jpg files

8 years agoCRM-17717 - apply strtolower to file extension.
Dave Jenkins [Wed, 16 Dec 2015 16:54:16 +0000 (16:54 +0000)]
CRM-17717 - apply strtolower to file extension.

8 years agoCRM-17717 - send correct MIME type for .jpg files
Dave Jenkins [Wed, 16 Dec 2015 14:49:19 +0000 (14:49 +0000)]
CRM-17717 - send correct MIME type for .jpg files

8 years agoUpdate version to 4.7.beta4
CiviCRM [Wed, 16 Dec 2015 10:11:13 +0000 (02:11 -0800)]
Update version to 4.7.beta4

8 years agoMerge pull request #7455 from yashodha/minor-fix
Monish Deb [Wed, 16 Dec 2015 05:57:16 +0000 (11:27 +0530)]
Merge pull request #7455 from yashodha/minor-fix

get rid of auto-incremented column id

8 years agoget rid of auto-incremented column id
yashodha [Wed, 16 Dec 2015 05:53:38 +0000 (11:23 +0530)]
get rid of auto-incremented column id

8 years agoCRM_17474 standardise address field addition to other reports
eileenmcnaugton [Sat, 26 Sep 2015 02:22:28 +0000 (14:22 +1200)]
CRM_17474 standardise address field addition to other reports

This also adds add extra address fields to participant listing such as
address_name & county

Conflicts:
CRM/Report/Form/Event/ParticipantListing.php

8 years agoMerge pull request #7429 from seamuslee001/CRM-17693
Dave Greenberg [Tue, 15 Dec 2015 19:03:40 +0000 (11:03 -0800)]
Merge pull request #7429 from seamuslee001/CRM-17693

CRM-17693 Increase default string table size to be 255. 255 Character…

8 years agoMerge pull request #7432 from monishdeb/CRM-17492
Dave Greenberg [Tue, 15 Dec 2015 18:56:56 +0000 (10:56 -0800)]
Merge pull request #7432 from monishdeb/CRM-17492

CRM-17492 fix - Query speed issue searching on transaction ID

9 years agoCRM-17702 - Fix validation for multiple membership types when using price sets on...
Dave Jenkins [Tue, 15 Dec 2015 14:27:48 +0000 (14:27 +0000)]
CRM-17702 - Fix validation for multiple membership types when using price sets on back-end membership creation: (1) get the check for multiple membership types working - it got broken between 4.6.10 & 4.7; (2) fix bug where value of quantity field is treated as price_field_value.id .

9 years agoMerge pull request #7447 from yashodha/CRM-17704
Yashodha Chaku [Tue, 15 Dec 2015 13:55:13 +0000 (19:25 +0530)]
Merge pull request #7447 from yashodha/CRM-17704

CRM-17704: Export: Regression on Select Fields to Export - Current Em…

9 years agoMerge pull request #7448 from rohankatkar/test-fix-4.7
Monish Deb [Tue, 15 Dec 2015 13:30:37 +0000 (19:00 +0530)]
Merge pull request #7448 from rohankatkar/test-fix-4.7

Webtests fixes

9 years agoWebtests fixes
Web Access [Tue, 15 Dec 2015 13:27:07 +0000 (18:57 +0530)]
Webtests fixes

9 years agoformat fix
yashodha [Tue, 15 Dec 2015 12:11:48 +0000 (17:41 +0530)]
format fix

9 years agoCRM-17704: fix for select all primary fields
yashodha [Tue, 15 Dec 2015 09:06:44 +0000 (14:36 +0530)]
CRM-17704: fix for select all primary fields

----------------------------------------
* CRM-17704: Export: Regression on Select Fields to Export - Current Employer
  https://issues.civicrm.org/jira/browse/CRM-17704

9 years agoCRM-17704: Export: Regression on Select Fields to Export - Current Employer
yashodha [Tue, 15 Dec 2015 06:31:15 +0000 (12:01 +0530)]
CRM-17704: Export: Regression on Select Fields to Export - Current Employer

----------------------------------------
* CRM-17704: Export: Regression on Select Fields to Export - Current Employer
  https://issues.civicrm.org/jira/browse/CRM-17704

9 years agominor fix
monishdeb [Tue, 15 Dec 2015 05:45:28 +0000 (11:15 +0530)]
minor fix

9 years agoIncrease Default sizes to 255
Seamus Lee [Tue, 15 Dec 2015 01:16:35 +0000 (01:16 +0000)]
Increase Default sizes to 255

9 years agoMerge pull request #7423 from eileenmcnaughton/CRM-17691
Dave Greenberg [Mon, 14 Dec 2015 20:31:35 +0000 (12:31 -0800)]
Merge pull request #7423 from eileenmcnaughton/CRM-17691

CRM-17691 do not use default return properties from search screen …

9 years agoCRM-17691 when doing a query to retrieve ids for export ... only retrieve the ids
eileen [Thu, 10 Dec 2015 04:20:24 +0000 (17:20 +1300)]
CRM-17691 when doing a query to retrieve ids for export ... only retrieve the ids

This has a substantial impact on peformance

Change-Id: Iad952ec7d0a0725b24c982efcca8c35482d6ae63

9 years agoFree the DAO, if it comes back it's yours
eileen [Thu, 10 Dec 2015 04:19:18 +0000 (17:19 +1300)]
Free the DAO, if it comes back it's yours

Change-Id: Ida6c2a316f3fb5f505f7b24667e88fead174ce08

9 years agoCRM-17691 add the campaign id to selector even though it ? is not used?
eileen [Mon, 14 Dec 2015 19:28:25 +0000 (08:28 +1300)]
CRM-17691 add the campaign id to selector even though it ? is not used?

Without this we get enotices on a basic search - but there is no evidenc the field is actually rendered:-(

Change-Id: I0b57e1dcaf444ad54f3d1144542e13a55f162659

9 years agoCRM-17691 do not use default return properties from search screen
eileen [Thu, 10 Dec 2015 03:28:18 +0000 (16:28 +1300)]
CRM-17691 do not use default return properties from search screen

Change-Id: Ic6b3d7a2ac2b0ca691ed9fdb84a1ff86f6c73e52

Change-Id: Ib275a710fceceba2e10d0293dc3366c1f37d3397

9 years agoMerge pull request #7442 from seamuslee001/CRM-17654-further
Dave Greenberg [Mon, 14 Dec 2015 18:33:17 +0000 (10:33 -0800)]
Merge pull request #7442 from seamuslee001/CRM-17654-further

CRM-17654 Fix issue where it wasn't storing all selected relationship…

9 years agoMerge pull request #7445 from rohankatkar/4.7-webtests-fix
Monish Deb [Mon, 14 Dec 2015 13:52:43 +0000 (19:22 +0530)]
Merge pull request #7445 from rohankatkar/4.7-webtests-fix

Webtests fixes

9 years agoMerge pull request #7444 from yashodha/CRM-17687
Yashodha Chaku [Mon, 14 Dec 2015 13:48:10 +0000 (19:18 +0530)]
Merge pull request #7444 from yashodha/CRM-17687

CRM-17687: Import tag length

9 years agoWebtests fixes
Web Access [Mon, 14 Dec 2015 13:17:21 +0000 (18:47 +0530)]
Webtests fixes

9 years agoMerge pull request #7430 from sudhabisht/CRM-16997
Monish Deb [Mon, 14 Dec 2015 09:49:09 +0000 (15:19 +0530)]
Merge pull request #7430 from sudhabisht/CRM-16997

Fix for contribution repeat statistic bug

9 years agoCRM-17687: Import tag length
yashodha [Mon, 14 Dec 2015 08:14:37 +0000 (13:44 +0530)]
CRM-17687: Import tag length

----------------------------------------
* CRM-17687: Import tag length
  https://issues.civicrm.org/jira/browse/CRM-17687

9 years agoformat fixes
monishdeb [Fri, 11 Dec 2015 13:16:15 +0000 (18:46 +0530)]
format fixes

9 years agoCRM-17492 fix - Query speed issue searching on transaction ID
monishdeb [Fri, 11 Dec 2015 12:45:29 +0000 (18:15 +0530)]
CRM-17492 fix - Query speed issue searching on transaction ID

https://issues.civicrm.org/jira/browse/CRM-17492

9 years agoCRM-17654 Fix issue where it wasn't storing all selected relationship types in db
Seamus Lee [Mon, 14 Dec 2015 02:15:29 +0000 (02:15 +0000)]
CRM-17654 Fix issue where it wasn't storing all selected relationship types in db

9 years agoMerge pull request #7441 from colemanw/CRM-17698
colemanw [Sat, 12 Dec 2015 23:33:27 +0000 (18:33 -0500)]
Merge pull request #7441 from colemanw/CRM-17698

CRM-17698 - Fix editing multi-valued custom fields

9 years agoCRM-17698 - Fix editing multi-valued custom fields
Coleman Watts [Sat, 12 Dec 2015 22:17:42 +0000 (17:17 -0500)]
CRM-17698 - Fix editing multi-valued custom fields

9 years agoMerge pull request #7439 from colemanw/rmExt
colemanw [Sat, 12 Dec 2015 21:37:50 +0000 (16:37 -0500)]
Merge pull request #7439 from colemanw/rmExt

Remove old unused stuff from tools directory

9 years agoRemove old unused stuff from tools directory
Coleman Watts [Sat, 12 Dec 2015 02:58:13 +0000 (21:58 -0500)]
Remove old unused stuff from tools directory

9 years agoMerge pull request #7438 from colemanw/insertToken
colemanw [Sat, 12 Dec 2015 02:27:54 +0000 (21:27 -0500)]
Merge pull request #7438 from colemanw/insertToken

insertToken fix for message templates

9 years agoinsertToken fix for message templates
Coleman Watts [Sat, 12 Dec 2015 01:16:09 +0000 (20:16 -0500)]
insertToken fix for message templates

9 years agoMerge pull request #7431 from jitendrapurohit/CRM-17690
Dave Greenberg [Sat, 12 Dec 2015 00:25:59 +0000 (16:25 -0800)]
Merge pull request #7431 from jitendrapurohit/CRM-17690

CRM-17690 - Grant fields being retrieved by default when completely i…

9 years agoMerge pull request #7436 from mlutfy/47-crm17695
Dave Greenberg [Sat, 12 Dec 2015 00:12:12 +0000 (16:12 -0800)]
Merge pull request #7436 from mlutfy/47-crm17695

CRM-17695: ts() fixes.

9 years agoMerge pull request #7434 from rohankatkar/WebTest-master
Dave Greenberg [Sat, 12 Dec 2015 00:08:41 +0000 (16:08 -0800)]
Merge pull request #7434 from rohankatkar/WebTest-master

Webtests Fixes

9 years agoMerge pull request #7437 from colemanw/CRM-17670
colemanw [Fri, 11 Dec 2015 20:36:17 +0000 (15:36 -0500)]
Merge pull request #7437 from colemanw/CRM-17670

CRM-17670 - Fix bug caused by datatables refactor

9 years agoCRM-17670 - Fix bug caused by datatables refactor
Coleman Watts [Fri, 11 Dec 2015 18:23:55 +0000 (13:23 -0500)]
CRM-17670 - Fix bug caused by datatables refactor

9 years agoCRM-17695: ts() fixes.
Mathieu Lutfy [Fri, 11 Dec 2015 16:27:30 +0000 (11:27 -0500)]
CRM-17695: ts() fixes.

9 years agoMerge pull request #7433 from colemanw/CRM_Utils_Check
colemanw [Fri, 11 Dec 2015 14:24:12 +0000 (09:24 -0500)]
Merge pull request #7433 from colemanw/CRM_Utils_Check

CRM_Utils_Check Fixes

9 years agoMerge pull request #7428 from colemanw/config
colemanw [Fri, 11 Dec 2015 13:26:11 +0000 (08:26 -0500)]
Merge pull request #7428 from colemanw/config

Add some @property annotations to CRM_Core_Config

9 years agoMake assertValid do what it says it does
Coleman Watts [Fri, 11 Dec 2015 13:15:35 +0000 (08:15 -0500)]
Make assertValid do what it says it does

9 years agoWebtests Fixes
Web Access [Fri, 11 Dec 2015 13:14:43 +0000 (18:44 +0530)]
Webtests Fixes

9 years agoUpdate test with renamed class
Coleman Watts [Fri, 11 Dec 2015 13:02:01 +0000 (08:02 -0500)]
Update test with renamed class

9 years agoCRM-17690 - Grant fields being retrieved by default when completely irrelevant
jitendrapurohit [Fri, 11 Dec 2015 08:44:42 +0000 (14:14 +0530)]
CRM-17690 - Grant fields being retrieved by default when completely irrelevant

9 years agoFix for contribution repeat statistic bug
Sudha Bisht [Fri, 11 Dec 2015 08:27:46 +0000 (13:57 +0530)]
Fix for contribution repeat statistic bug

9 years agoCRM-17693 Increase default string table size to be 255. 255 Characters seems fairly...
Seamus Lee [Fri, 11 Dec 2015 07:58:08 +0000 (07:58 +0000)]
CRM-17693 Increase default string table size to be 255. 255 Characters seems fairly common on the db and matches max length of contribution page title

9 years agoAdd some @property annotations to CRM_Core_Config
Coleman Watts [Fri, 11 Dec 2015 02:56:15 +0000 (21:56 -0500)]
Add some @property annotations to CRM_Core_Config

9 years agoCleanup CRM_Utils_Check classes
Coleman Watts [Fri, 11 Dec 2015 02:32:59 +0000 (21:32 -0500)]
Cleanup CRM_Utils_Check classes

9 years agoMerge pull request #7000 from eileenmcnaughton/CRM-17275-import
Eileen McNaughton [Fri, 11 Dec 2015 02:14:12 +0000 (15:14 +1300)]
Merge pull request #7000 from eileenmcnaughton/CRM-17275-import

Crm 17275 import

9 years agopreliminary tidy up
eileenmcnaughton [Fri, 11 Dec 2015 01:10:55 +0000 (01:10 +0000)]
preliminary tidy up

9 years agoMerge pull request #7422 from colemanw/CRM-17637
colemanw [Thu, 10 Dec 2015 21:43:16 +0000 (16:43 -0500)]
Merge pull request #7422 from colemanw/CRM-17637

CRM-17637 - Add poor man's cron fallback for VersionCheck

9 years agoCRM-17637 - Ensure files directory is writeable
Coleman Watts [Thu, 10 Dec 2015 17:31:30 +0000 (12:31 -0500)]
CRM-17637 - Ensure files directory is writeable

9 years agoCRM-17637 - Add unit test for cron fallback
Coleman Watts [Thu, 10 Dec 2015 16:22:40 +0000 (11:22 -0500)]
CRM-17637 - Add unit test for cron fallback

9 years agoMerge pull request #7426 from jitendrapurohit/webtest47
Monish Deb [Thu, 10 Dec 2015 16:35:29 +0000 (22:05 +0530)]
Merge pull request #7426 from jitendrapurohit/webtest47

webtest fixes

9 years agoMerge pull request #6189 from sudhabisht/crm-16769
Monish Deb [Thu, 10 Dec 2015 13:20:31 +0000 (18:50 +0530)]
Merge pull request #6189 from sudhabisht/crm-16769

Add field mapping api

9 years agowebtest fixes
jitendrapurohit [Thu, 10 Dec 2015 13:16:11 +0000 (18:46 +0530)]
webtest fixes

9 years agoMerge pull request #7425 from yashodha/CRM-17682
Yashodha Chaku [Thu, 10 Dec 2015 12:33:05 +0000 (18:03 +0530)]
Merge pull request #7425 from yashodha/CRM-17682

CRM-17682: Membership status rule edit form won't save removal of 'ad…

9 years agoMerge pull request #7420 from davecivicrm/CRM-16526
Monish Deb [Thu, 10 Dec 2015 08:25:05 +0000 (13:55 +0530)]
Merge pull request #7420 from davecivicrm/CRM-16526

CRM-16525 - Remove $finType var assign since it throws an eNotice if …

9 years agoMerge pull request #7424 from jitendrapurohit/CRM-17692
Monish Deb [Thu, 10 Dec 2015 08:19:10 +0000 (13:49 +0530)]
Merge pull request #7424 from jitendrapurohit/CRM-17692

CRM-17692 - Improper advance search result for multiple tag set

9 years agoTest Fix
Sudha Bisht [Thu, 10 Dec 2015 08:09:46 +0000 (13:39 +0530)]
Test Fix

9 years agoRemoved api skipped part
Sudha Bisht [Fri, 7 Aug 2015 14:00:00 +0000 (19:30 +0530)]
Removed api skipped part

9 years agoTest Fix
Sudha Bisht [Thu, 6 Aug 2015 08:12:37 +0000 (13:42 +0530)]
Test Fix

9 years agoOperator related fix
Sudha Bisht [Wed, 15 Jul 2015 10:49:17 +0000 (16:19 +0530)]
Operator related fix

9 years agoFix for test failure
Sudha Bisht [Mon, 13 Jul 2015 09:33:49 +0000 (15:03 +0530)]
Fix for test failure

9 years agoFix for test failure
Sudha Bisht [Fri, 10 Jul 2015 13:02:23 +0000 (18:32 +0530)]
Fix for test failure

9 years agoremove contact_type field constraint
Tim Mallezie [Mon, 29 Jun 2015 13:01:33 +0000 (15:01 +0200)]
remove contact_type field constraint

9 years agoAdd Mapping and mappingfield API
Tim Mallezie [Mon, 29 Jun 2015 10:36:32 +0000 (12:36 +0200)]
Add Mapping and mappingfield API

9 years agoCRM-17692 - Improper advance search result for multiple tag set
jitendrapurohit [Thu, 10 Dec 2015 07:26:50 +0000 (12:56 +0530)]
CRM-17692 - Improper advance search result for multiple tag set

9 years agoCRM-17682: Membership status rule edit form won't save removal of 'admin only' attribute
yashodha [Thu, 10 Dec 2015 07:08:03 +0000 (12:38 +0530)]
CRM-17682: Membership status rule edit form won't save removal of 'admin only' attribute

----------------------------------------
* CRM-17682: Membership status rule edit form won't save removal of 'admin only' attribute
  https://issues.civicrm.org/jira/browse/CRM-17682

9 years agoMerge pull request #7416 from saurabhbatra96/CRM-17660
Yashodha Chaku [Thu, 10 Dec 2015 06:24:13 +0000 (11:54 +0530)]
Merge pull request #7416 from saurabhbatra96/CRM-17660

CRM-17660 - Missin "Littoral" and "Nord-Ouest" provinces in Cameroon

9 years agoCRM-17637 - Add poor man's cron fallback for VersionCheck
Coleman Watts [Thu, 10 Dec 2015 02:13:29 +0000 (21:13 -0500)]
CRM-17637 - Add poor man's cron fallback for VersionCheck

9 years agoCRM-17637 - VersionCheck - refactor & centralize lookup of scheduled job
Coleman Watts [Thu, 10 Dec 2015 01:12:05 +0000 (20:12 -0500)]
CRM-17637 - VersionCheck - refactor & centralize lookup of scheduled job

9 years agoCRM-16525 - Remove $finType var assign since it throws an eNotice if Financial Type...
Dave Greenberg [Thu, 10 Dec 2015 00:04:55 +0000 (16:04 -0800)]
CRM-16525 - Remove $finType var assign since it throws an eNotice if Financial Type ACLs are not enabled AND it does not appear to be used in any tpl file.

----------------------------------------
* CRM-16525: Add the possibility to enable/disable membership status for certain membership types
  https://issues.civicrm.org/jira/browse/CRM-16525

9 years agoMerge pull request #7419 from colemanw/help
colemanw [Wed, 9 Dec 2015 23:23:00 +0000 (18:23 -0500)]
Merge pull request #7419 from colemanw/help

SystemCheck help improvements

9 years agoSystemCheck help improvements
Coleman Watts [Wed, 9 Dec 2015 21:34:48 +0000 (16:34 -0500)]
SystemCheck help improvements

9 years agoMerge pull request #7408 from seamuslee001/CRM-17307
Dave Greenberg [Wed, 9 Dec 2015 21:06:15 +0000 (13:06 -0800)]
Merge pull request #7408 from seamuslee001/CRM-17307

CRM-17650 ensure that replyto_email is updated when re-using a previo…

9 years agoMerge pull request #7371 from eileenmcnaughton/CRM-17655
Eileen McNaughton [Wed, 9 Dec 2015 20:00:15 +0000 (09:00 +1300)]
Merge pull request #7371 from eileenmcnaughton/CRM-17655

CRM-17655 Adding a payment to a recurring contribution sequence shoul…

9 years agoMerge pull request #7417 from rohankatkar/Webtests-master-fix
Kurund Jalmi [Wed, 9 Dec 2015 15:18:08 +0000 (20:48 +0530)]
Merge pull request #7417 from rohankatkar/Webtests-master-fix

Webtests Fix

9 years agoCRM-17660 - Missin "Littoral" and "Nord-Ouest" provinces in Cameroon
Saurabh Batra [Wed, 9 Dec 2015 14:07:58 +0000 (19:37 +0530)]
CRM-17660 - Missin "Littoral" and "Nord-Ouest" provinces in Cameroon

https://issues.civicrm.org/jira/browse/CRM-17660

9 years agoWebtests Fix
Web Access [Wed, 9 Dec 2015 13:18:31 +0000 (18:48 +0530)]
Webtests Fix

9 years agoUpdate version to 4.7.beta3
CiviCRM [Wed, 9 Dec 2015 08:42:57 +0000 (00:42 -0800)]
Update version to 4.7.beta3

9 years agoadd code to help track down intermittant test fail
eileenmcnaugton [Wed, 9 Dec 2015 03:47:28 +0000 (16:47 +1300)]
add code to help track down intermittant test fail

9 years agoCRM-17655 Adding a payment to a recurring contribution sequence should update the...
eileenmcnaughton [Thu, 3 Dec 2015 09:32:03 +0000 (09:32 +0000)]
CRM-17655 Adding a payment to a recurring contribution sequence should update the contribution_recur table

9 years agoMerge pull request #7414 from davecivicrm/CRM-17656
Dave Greenberg [Tue, 8 Dec 2015 23:50:51 +0000 (15:50 -0800)]
Merge pull request #7414 from davecivicrm/CRM-17656

CRM-17656 - forward port web test for activity custom data.

9 years agoCRM-17656 - forward port web test for activity custom data.
Dave Greenberg [Tue, 8 Dec 2015 23:48:56 +0000 (15:48 -0800)]
CRM-17656 - forward port web test for activity custom data.

----------------------------------------
* CRM-17656: Cannot edit activities with custom fields in popup from a search results screen
  https://issues.civicrm.org/jira/browse/CRM-17656

9 years agoMerge pull request #7411 from jitendrapurohit/webtest
Dave Greenberg [Tue, 8 Dec 2015 17:25:50 +0000 (09:25 -0800)]
Merge pull request #7411 from jitendrapurohit/webtest

47 webtest fixes

9 years agoMerge pull request #7412 from colemanw/UpgradeCleanup
colemanw [Tue, 8 Dec 2015 17:22:06 +0000 (12:22 -0500)]
Merge pull request #7412 from colemanw/UpgradeCleanup

Upgrade cleanup