Merge branch 'master' of https://github.com/uComponents/nuPickers

uComponents · Mar 23, 2015 · da143ee · da143ee
2 parents e24186b + 07ec967
commit da143ee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -9,9 +9,6 @@ skip_tags: true
 init:
 - set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=
 
-install:
-  - cmd: npm install -g grunt-cli
-
 build_script:
 - cd package
 - Build.bat

diff --git a/package/package.proj b/package/package.proj
@@ -19,7 +19,7 @@
     <PackageName>nuPickers</PackageName>
     <MinUmbracoVersion>7.1.3</MinUmbracoVersion>
     <Readme>nuPickers is a collection of Umbraco v7 Property Editors</Readme>
-    <AuthorName>Hendy Racher, Jeavon Leopold, Stephen Roberts, Tom Fulton, Lennart Stoop, Lee Kelleher</AuthorName>
+    <AuthorName>Hendy Racher, Jeavon Leopold, Stephen Roberts, Shannon Deminick, Lennart Stoop, Tom Fulton, Lee Kelleher, Alain ?, Peter Gregory</AuthorName>
     <AuthorUrl>https://github.com/uComponents/nuPickers/graphs/contributors</AuthorUrl>
     <PackageLicenseName>MIT license</PackageLicenseName>
     <PackageLicenseUrl>http://www.opensource.org/licenses/mit-license.php</PackageLicenseUrl>
@@ -30,8 +30,8 @@
   <PropertyGroup>
     <PackageId>nuPickers</PackageId>
     <NuGetPackageName>Umbraco nuPickers</NuGetPackageName>
-    <Copyright>Hendy Racher</Copyright>
-    <Owners>Hendy Racher, Jeavon Leopold, Stephen Roberts, Tom Fulton, Lennart Stoop, Lee Kelleher</Owners>
+    <Copyright>The Umbraco Community</Copyright>
+    <Owners>Hendy Racher, Jeavon Leopold</Owners>
     <IconUrl>https://raw.githubusercontent.com/uComponents/nuPickers/master/package/icon.png</IconUrl>
     <Tags>umbraco, uComponents, nuPickers</Tags>
     <Language>en-GB</Language>

diff --git a/source/nuPickers/Properties/AssemblyInfo.cs b/source/nuPickers/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("nuPickers")]
-[assembly: AssemblyCopyright("Copyright ?  2014")]
+[assembly: AssemblyCopyright("Copyright The Umbraco Community 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.2.2.0")]
-[assembly: AssemblyVersion("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
-[assembly: AssemblyInformationalVersion("1.2.2")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: AssemblyInformationalVersion("1.4.1")]