Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev into feature-redesign #4227

Merged
merged 56 commits into from
Jun 19, 2017
Merged

Merge dev into feature-redesign #4227

merged 56 commits into from
Jun 19, 2017

Conversation

joelverhagen
Copy link
Member

Observe the last commit to verify merge conflicts.

ryuyu and others added 30 commits May 22, 2017 09:53
[ReleasePrep][2017.05.19]RI of dev into master
Fixes #4002. Relevant to [VSTS #395879](https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems?id=395879&_a=edit). This help-text bug was for the sign-in page, but this also affects the Report Abuse page.

* Fixed accessibility of email field in report abuse page
* Fixed signature accessibility
* Added Nuget.Services.Logging; moved to TelemetryResponseCodeProcessor
* Added binding redirect for AI
* adding new optional semVerLevel query parameter to v2 odata endpoints

* adding new optional semVerLevel query parameter to v2 autocomplete endpoints

* Applying semVerLevel filter on v2 OData endpoints

* Use [FromUri] attribute on semVerLevel
(avoids having single quotes in the parameter value)

* Ensure navigation links on v2 feeds use normalized version

* Clarifying comment on Get(Id=,Version=) v2 API

* Properly default to semver2 inclusion on Get(Id=,Version=)

* Compare NormalizedVersion to be able to retrieve matching SemVer2 package versions for a given normalized version string.

* Code review feedback

* Update and fix broken test data
…ns (#3761)

* Keep legacy version compatibility checks in place for non-semver2 versions

* Added comment to clarify the reasons behind the legacy version check.

* Fix typo

* Rename test for clarity

* code review feedback
…equesting a specific version, and compare on NormalizedVersion
xavierdecoster and others added 21 commits June 1, 2017 09:15
Merge dev into master - SemVer2
* Average download shown incorrectly when its 1.x #4039

* Moved logic to viewmodel and added UTs
* SemVer2 - Missing db index on Packages table #498

* SemVer2 - Missing db index on Packages table for partial search #499 (#4074)
- Added inline confirmation when adding new package owner
- Added package URL link to package owner request emails
- Added new notification to co-owners when package owner request is confirmed
- Added secure push policy messaging to communication above (confirmation, request, and notification)
- Added secure push policy messaging to package view for owners and admins
- Fixed bug on security policy admin view where toggle all broken if multiple subscriptions
- Updated security policy admin view to not reload page on update postback
# Conflicts:
#	content/PROD/Home.html
#	src/NuGetGallery/Queries/AutoCompleteDatabasePackageVersionsQuery.cs
#	src/NuGetGallery/Services/PackageService.cs
#	src/NuGetGallery/Strings.Designer.cs
#	src/NuGetGallery/Strings.resx
#	src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
#	src/NuGetGallery/Views/Packages/ReportAbuse.cshtml
#	src/NuGetGallery/Views/Statistics/_PivotTable.cshtml
#	src/NuGetGallery/Views/Users/Profiles.cshtml
#	tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
#	tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
@joelverhagen joelverhagen merged commit 25413b0 into NuGet:feature-redesign Jun 19, 2017
@joelverhagen joelverhagen deleted the merge-dev branch June 19, 2017 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants