11 Commits

Author SHA1 Message Date
Sebastiaan Janssen 2fcd7f3911 Better gulp runner 2017-06-04 12:05:57 +02:00
Sebastiaan Janssen efa0659742 Merge branch 'refs/heads/master' into move-masterpages-to-views
# Conflicts:
#	.gitignore
#	OurUmbraco.Client/package.json
#	OurUmbraco.Site/config/Dashboard.config
#	OurUmbraco.Site/masterpages/Release.master
#	OurUmbraco.Site/usercontrols/Deli/Package/Editor.ascx
#	OurUmbraco.Site/usercontrols/Deli/Package/Steps/Complete.ascx
#	OurUmbraco.Site/usercontrols/Deli/Package/Steps/Details.ascx
#	OurUmbraco.Site/usercontrols/Deli/Package/Steps/Files.ascx
#	OurUmbraco.Site/usercontrols/Deli/Package/Steps/Screenshots.ascx
#	OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx
#	OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectCollabRequest.ascx
#	OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectContributors.ascx
#	OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectEditor.ascx
#	OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectFileUpload.ascx
#	OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectForums.ascx
#	OurUmbraco/Our/MigrationsHandler.cs
#	OurUmbraco/OurUmbraco.csproj
#	build/BuildClientFiles.bat
2016-11-07 08:45:46 +01:00
Sebastiaan Janssen f39bbc2979 Adds client to solution so task runner explorer can be used to build the client-side files in VS 2016-10-23 13:42:58 +02:00
Sebastiaan Janssen 27f88dfb80 Fix detection of npm folder 2016-09-18 12:44:10 +02:00
Sebastiaan Janssen 252a9015dc Detect if npm is already there and don't download it again 2016-09-18 12:20:42 +02:00
Sebastiaan Janssen 166007c668 Use node 4.5 for building 2016-09-18 12:12:52 +02:00
Sebastiaan Janssen 6b94c119a4 Reverts to old build method that works on build server 2016-08-15 15:11:27 +02:00
Sebastiaan Janssen da4f1f0f8a Hopefully helps with the TeamCity build 2015-12-18 12:12:28 +01:00
Sebastiaan Janssen a89a103993 Move search options outside of the debug panel
Adds easy batch for me to run gulp
2015-06-26 14:54:53 +02:00
Sebastiaan Janssen ab25334b8b move dependency to package.json
Conflicts:
	OurUmbraco.Client/package.json
	build/BuildClientFiles.bat
2015-06-23 16:33:28 +02:00
Sebastiaan Janssen a35a7e9a03 Adds the client files + builds using gulp automatically on a project rebuild or using the BuildClientFiles.bat 2015-06-23 15:15:55 +02:00