Skip to content
This repository has been archived by the owner on Dec 6, 2019. It is now read-only.

Merged Master into Develop #468

Open
wants to merge 181 commits into
base: develop
Choose a base branch
from
Open

Merged Master into Develop #468

wants to merge 181 commits into from

Conversation

KayeeNL
Copy link

@KayeeNL KayeeNL commented Apr 8, 2019

Did a git flow, and found out that the Develop branch wasn't updated anymore since May 16th, 2017, while the master branch was updated for the last time by @nickwesselman on November 28, 2018.

Aligned them, so that it is up to date again.

// cc @jeanfrancoislarente @scottmulligan

p.s. not sure who's the main responsible now for the original Habitat source-code.

Eldblom-zz and others added 30 commits May 31, 2017 12:24
…nd ip addresses

Fixes exception thrown from the demo panel when MongoDB is offline
TFS Bug 40412
Fixed unit tests
Upgraded to VS 2017
Added ability to have .user files for publishsettings.targets and gulp-config.js
Removed confusing TeamCity and CI gulp files
Support for .user file in publishingsettings.target
This Foundation layer module appears to incorrectly refer to itself as a Feature layer module. This corrects the information to match the title.
Fix product name of Foundation.SitecoreExtensions
Added missing serialization for Project modules
Updated README.md på link to Helix docs
Implemented uninstall
Fixed Solr field mapping Updated installer
Added Helix layers in the config layers
Added setting to explicitly disable the demo panel
Updated tracker and marketing registrations to use xConnect API
Removed engagement plan from Register page.yml
Added ProjectInfo.cs with shared assembly info attributes
Renamed .transform to .xdt to align with WDP standards
Updated package generation
Added missing files
Moved package.xml to App_Data/packages/Habitat.xml
New version policy aligned with Sitecore versions
Added support for Standalone, ContentDelivery and ContentManagement roles
Renamed publishing profiles to Standalone, to align with role naming
Added install guide in README.md Emphasized standalone/xp0 in install and uninstall
Added post-install steps to README.md
Using standard Sitecore v9 dynamic placeholders
Fixed Solr facet bug
Added support for Federated Authentication
Added Facebook login support
Removed the "habitat" domain and aligned with the standard "extranet" domain
Updated to SC RC5 Added Facebook properties to xDB tags
Added Facebook picture to xDB contact Updated xDB demo panel
Added missing build files
Added uninstall script
Updated to RC6, SFI 1.0.2 Added additional install checks
Track Edit Profile Fixed bug in registration
Fixed xConnect facets tracking
Added profiling to Habitat layers
Added generation of the SOLR certificates
Added install checks for Solr SSL and .NET framework
Updated gulp-sass
Changed default PSRepository name and SQL server hostname
Removed relative paths in install scripts
Fixed compilerconfig publish
Fixed item ID mismatch with SXA
Added Solr certificate generation
Moved menu to right
Fixed DI lifetime issue in NavigationRepository.cs
nickwesselman and others added 26 commits July 12, 2018 11:59
The script didn't show any errors so it was unclear if the script generated the keystore, if the keystore file doesn't exist the script will create it automatically.
Link to docs was broken.
Fixes bug causing gulp.watch() to monitor only the first 16 bin folders found in the solution
* Update for new versions
* Use 9.1 XP0-SingleDeveloper config
* Use 9.1 uninstall cmdlet
* Use 9.1 prerequisites config
* Make prerequisites check optional
* Improve logic for installing SIF
* Set sitecore admin password
…ct files

* to aid parsing and addition of conditional local references
…Configuration.csproj

* To allow building against internal Sitecore previews
* So it only needs to be maintained in one place
* no real reason to limit InternalsVisibleTo to Debug build, may want to run tests in Release build
…ilding / running

* Updated target framework
* updated PackageReference's to use new nuget feed
  * No NoReference packages
  * New versioning
  * Included script for converting PackageReference in projects
  * Organized / cleaned up other nuget-related scripts
  * Script to add NoWarn tags for NU1603, which pops up from the new nuget structure
* Allow for conditional local assembly references (for development against internal Sitecore previews)
* Other tweaks / upgrades to references (e.g. MVC, DI, Owin, Logging, Newtonsoft versions)
* Added many missing references that were broken previous to 9.0 and then fixed, likely being saved by CopyLocal?
* Some minor breaking API changes
* Updated CopyLocal on test projects to make assemblies available
* Added some missing runtime dependencies to unit tests
…ative to ProjectDir instead of SolutionDir

* To work with msbuild from command line
@KayeeNL
Copy link
Author

KayeeNL commented Apr 8, 2019

Apparently a lot of internal checks fail @nickwesselman @jeanfrancoislarente , not sure why the current master would be okay then....

@jeanfrancoislarente
Copy link
Member

Hey @KayeeNL - @nickwesselman is responsible for the repo and I believe he chose to go straight to a master and not use develop... but he can answer that :)

@KayeeNL
Copy link
Author

KayeeNL commented Apr 8, 2019

Hey @KayeeNL - @nickwesselman is responsible for the repo and I believe he chose to go straight to a master and not use develop... but he can answer that :)

thanks, wait on @nickwesselman to finish on playing with his new Lego set then ;-), thanks @jeanfrancoislarente

@nickwesselman
Copy link
Contributor

I've just been making feature branches off of master. Given the plans to retire Habitat after 9.2, is this worth the effort?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet