Permalink
Browse files

Merge remote-tracking branch 'origin/master' into feature/v9 before c…

…ompleting v9 merge

# Conflicts:
#	gulp-config.js
#	gulpfile.js
#	src/Feature/Accounts/Tests/packages.config
#	src/Feature/Accounts/code/packages.config
#	src/Feature/Demo/code/packages.config
#	src/Feature/Demo/tests/packages.config
#	src/Feature/Identity/code/packages.config
#	src/Feature/Language/Tests/packages.config
#	src/Feature/Language/code/packages.config
#	src/Feature/Maps/code/packages.config
#	src/Feature/Maps/tests/packages.config
#	src/Feature/Media/Tests/packages.config
#	src/Feature/Media/code/packages.config
#	src/Feature/Metadata/code/packages.config
#	src/Feature/Multisite/code/packages.config
#	src/Feature/Multisite/tests/packages.config
#	src/Feature/Navigation/code/packages.config
#	src/Feature/News/Tests/packages.config
#	src/Feature/News/code/packages.config
#	src/Feature/PageContent/code/packages.config
#	src/Feature/Person/code/packages.config
#	src/Feature/Person/tests/packages.config
#	src/Feature/Search/code/packages.config
#	src/Feature/Social/code/packages.config
#	src/Feature/Teasers/code/packages.config
#	src/Feature/Teasers/tests/packages.config
#	src/Feature/faq/code/packages.config
#	src/Foundation/Accounts/code/packages.config
#	src/Foundation/Accounts/tests/packages.config
#	src/Foundation/Alerts/code/packages.config
#	src/Foundation/Alerts/tests/packages.config
#	src/Foundation/Assets/code/packages.config
#	src/Foundation/DependencyInjection/code/packages.config
#	src/Foundation/Dictionary/code/packages.config
#	src/Foundation/Dictionary/tests/packages.config
#	src/Foundation/FieldEditor/code/packages.config
#	src/Foundation/FieldEditor/tests/packages.config
#	src/Foundation/Forms/code/Sitecore.Foundation.Forms.csproj
#	src/Foundation/Forms/code/packages.config
#	src/Foundation/Forms/tests/Sitecore.Foundation.Forms.Tests.csproj
#	src/Foundation/Forms/tests/packages.config
#	src/Foundation/Indexing/Tests/packages.config
#	src/Foundation/Indexing/code/packages.config
#	src/Foundation/Installer/code/MongoRestore/MongoRestoreService.cs
#	src/Foundation/Installer/code/packages.config
#	src/Foundation/Installer/tests/packages.config
#	src/Foundation/LocalDatasource/code/packages.config
#	src/Foundation/LocalDatasource/tests/packages.config
#	src/Foundation/Multisite/code/packages.config
#	src/Foundation/Multisite/tests/packages.config
#	src/Foundation/Serialization/code/packages.config
#	src/Foundation/SitecoreExtensions/Tests/packages.config
#	src/Foundation/SitecoreExtensions/code/Extensions/SiteExtensions.cs
#	src/Foundation/SitecoreExtensions/code/packages.config
#	src/Foundation/Testing/tests/packages.config
#	src/Foundation/Theming/code/packages.config
#	src/Foundation/Theming/tests/packages.config
#	src/Project/Common/code/packages.config
#	src/Project/Habitat/code/packages.config
  • Loading branch information...
nickwesselman committed Jul 12, 2018
2 parents 2a01d04 + 76dca72 commit 4965c8f965fb1703a77d28132f71da9438bf0904
@@ -0,0 +1,29 @@
---
name: Bug report
about: Create a report to help us improve
---
Note: for support questions, please use [Sitecore Stackexchange](https://sitecore.stackexchange.com) or #helix-habitat on [Sitecore Community Slack](https://www.akshaysura.com/2015/10/27/how-to-join-sitecore-slack-community-chat/). This repository's issues are reserved for feature requests and bug reports.
**Describe the bug**
A clear and concise description of what the bug is.
**Sitecore Version**
The specific version and revision of Sitecore you have installed.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Additional context**
Add any other context about the problem here.
@@ -0,0 +1,19 @@
---
name: Feature request
about: Suggest an idea for this project
---
Note: for support questions, please use [Sitecore Stackexchange](https://sitecore.stackexchange.com) or #helix-habitat on [Sitecore Community Slack](https://www.akshaysura.com/2015/10/27/how-to-join-sitecore-slack-community-chat/). This repository's issues are reserved for feature requests and bug reports.
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.
@@ -1,4 +1,4 @@
###Contributors
### Contributors
A huge thanks to people who have contributed to the project in different ways:
* [Anders Laub Christoffersen](https://community.sitecore.net/members/anderschristoffersen_5f00_688677062)
* [Kam Figy](https://community.sitecore.net/members/kamfigy_5f00_1576112879)
@@ -19,7 +19,7 @@ A huge thanks to people who have contributed to the project in different ways:
*Any omissions are completely unintentional*
###How do I contribute?
### How do I contribute?
When developing a contribution to the project, we suggest using Githubs fork feature. When you have completed your work, please use the Pull Request feature to submit your work back to the project. We will review and comment is necessary and when your contribution is approved, we will add a merge task into our backlog for the next release, this will assure that the new feature goes through the internal test and QA processes.
You can read more about the tools here: https://help.github.com/categories/collaborating/
@@ -32,7 +32,7 @@ In summary:
5. If the feature is accepted, the team will submit a task to the internal project backlog to merge in the feature.
6. Your feature will be distributed a part of the Habitat project - and you will be in the Hall of Fame forever.
###What can I contribute?
### What can I contribute?
We are looking for all types of features and functionality which makes sense in a Sitecore solution. This means: If you have created a cool feature or functionality on your latest website project, then tell us about it! If you have a module on marketplace which would fit neatly into the project framework, lets have it!
Your contribution should typically be in the form of a new Feature module in the Domain layer. This means it should extend the functionality of the website. Please make sure that the feature is running in the Habitat website without additional design or layout changes. If you have suggestions for the Framework layer then please let us know too. We are always looking for good stuff.
@@ -1,3 +1,4 @@
/// <binding />
var gulp = require("gulp");
var msbuild = require("gulp-msbuild");
var debug = require("gulp-debug");
@@ -23,15 +23,15 @@ public static Item GetRootItem(this SiteContext site)
if (site == null)
throw new ArgumentNullException(nameof(site));
return site.Database.GetItem(Context.Site.RootPath);
return site.Database.GetItem(site.RootPath);
}
public static Item GetStartItem(this SiteContext site)
{
if (site == null)
throw new ArgumentNullException(nameof(site));
return site.Database.GetItem(Context.Site.StartPath);
return site.Database.GetItem(site.StartPath);
}
}
}

0 comments on commit 4965c8f

Please sign in to comment.