Merge pull request gridstack#650 from radiolips/feature/start-10

radiolips · web-flow · commit ed5fb7be730b · 2017-04-29T14:04:21.000-04:00
Update copyright, fix dev dependency, start 1.0.0-dev.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -4,7 +4,6 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-doctoc');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-jscs');
     grunt.loadNpmTasks('grunt-contrib-watch');
@@ -58,27 +57,6 @@ module.exports = function(grunt) {
             }
         },
 
-        doctoc: {
-            options: {
-                removeAd: false
-            },
-            readme: {
-                options: {
-                    target: './README.md'
-                }
-            },
-            doc: {
-                options: {
-                    target: './doc/README.md'
-                }
-            },
-            faq: {
-                options: {
-                    target: './doc/FAQ.md'
-                }
-            },
-        },
-
         jshint: {
             all: ['src/*.js']
         },
@@ -99,13 +77,7 @@ module.exports = function(grunt) {
                 tasks: ['sass', 'cssmin'],
                 options: {
                 },
-            },
-            docs: {
-                files: ['README.md', 'doc/README.md', 'doc/FAQ.md'],
-                tasks: ['doctoc'],
-                options: {
-                },
-            },
+            }
         },
 
         protractor: {
@@ -134,6 +106,6 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify', 'doctoc']);
+    grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify']);
     grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
 };
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 Pavel Reznikov, Dylan Weiss
+Copyright (c) 2014-2017 Pavel Reznikov, Dylan Weiss
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ Join gridstack.js on Slack: https://gridstackjs.troolee.com
       - [Using gridstack.js with jQuery UI](#using-gridstackjs-with-jquery-ui)
   - [Install](#install)
   - [Basic usage](#basic-usage)
+  - [gridstack.js News](#gridstackjs-news)
   - [Migrating to v0.3.0](#migrating-to-v030)
   - [Migrating to v0.2.5](#migrating-to-v025)
   - [API Documentation](#api-documentation)
@@ -140,6 +141,12 @@ $(function () {
 </script>
 ```
 
+## gridstack.js News
+
+Version 1.0 is coming! Check out the blog post here for more information:
+[https://dylandreams.com/2017/04/26/gridstack-10-coming-soon/](https://dylandreams.com/2017/04/26/gridstack-10-coming-soon/)
+
+
 ## Migrating to v0.3.0
 
 As of v0.3.0, gridstack introduces a new plugin system. The drag'n'drop functionality has been modified to take advantage of this system. Because of this, and to avoid dependency on core code from jQuery UI, the plugin was functionality was moved to a separate file.
@@ -167,7 +174,7 @@ when they will be completely removed.
 
 ## API Documentation
 
-Please check out `doc/README.md` for more information about gridstack.js API.
+Documentation can be found [here](https://github.com/troolee/gridstack.js/tree/develop/doc).
 
 ## Questions and Answers
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.3.0",
+  "version": "1.0.0-dev",
   "homepage": "https://github.com/troolee/gridstack.js",
   "authors": [
     "Pavel Reznikov <pashka.reznikov@gmail.com>"
diff --git a/dist/gridstack.all.js b/dist/gridstack.all.js
diff --git a/dist/gridstack.jQueryUI.js b/dist/gridstack.jQueryUI.js
@@ -1,7 +1,7 @@
 /**
- * gridstack.js 0.3.0
+ * gridstack.js 1.0.0-dev
  * http://troolee.github.io/gridstack.js/
- * (c) 2014-2016 Pavel Reznikov, Dylan Weiss
+ * (c) 2014-2017 Pavel Reznikov, Dylan Weiss
  * gridstack.js may be freely distributed under the MIT license.
  * @preserve
 */
diff --git a/dist/gridstack.jQueryUI.min.js b/dist/gridstack.jQueryUI.min.js
diff --git a/dist/gridstack.js b/dist/gridstack.js
@@ -1,7 +1,7 @@
 /**
- * gridstack.js 0.3.0
+ * gridstack.js 1.0.0-dev
  * http://troolee.github.io/gridstack.js/
- * (c) 2014-2016 Pavel Reznikov, Dylan Weiss
+ * (c) 2014-2017 Pavel Reznikov, Dylan Weiss
  * gridstack.js may be freely distributed under the MIT license.
  * @preserve
 */
diff --git a/dist/gridstack.min.js b/dist/gridstack.min.js
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "gridstack",
-  "version": "0.3.0",
+  "version": "1.0.0-dev",
   "description": "gridstack.js is a jQuery plugin for widget layout",
   "main": "dist/gridstack.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/troolee/gridstack.js.git"
   },
   "scripts": {
-    "build": "grunt",
+    "build": "grunt ; doctoc ./README.md ; doctoc ./doc/README.md ; doctoc ./doc/FAQ.md",
     "test": "karma start karma.conf.js"
   },
   "keywords": [
@@ -19,6 +19,7 @@
     "jquery"
   ],
   "author": "Pavel Reznikov <pashka.reznikov@gmail.com>",
+  "contributors": ["Dylan Weiss <dylan.weiss@gmail.com> (https://dylandreams.com)"],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/troolee/gridstack.js/issues"
@@ -41,7 +42,6 @@
     "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-uglify": "^2.3.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-doctoc": "https://github.com/nickyout/grunt-doctoc.git#master",
     "grunt-jscs": "^3.0.1",
     "grunt-protractor-runner": "^5.0.0",
     "grunt-protractor-webdriver": "^0.2.5",
diff --git a/src/gridstack.jQueryUI.js b/src/gridstack.jQueryUI.js
@@ -1,7 +1,7 @@
 /**
- * gridstack.js 0.3.0
+ * gridstack.js 1.0.0-dev
  * http://troolee.github.io/gridstack.js/
- * (c) 2014-2016 Pavel Reznikov, Dylan Weiss
+ * (c) 2014-2017 Pavel Reznikov, Dylan Weiss
  * gridstack.js may be freely distributed under the MIT license.
  * @preserve
 */
diff --git a/src/gridstack.js b/src/gridstack.js
@@ -1,7 +1,7 @@
 /**
- * gridstack.js 0.3.0
+ * gridstack.js 1.0.0-dev
  * http://troolee.github.io/gridstack.js/
- * (c) 2014-2016 Pavel Reznikov, Dylan Weiss
+ * (c) 2014-2017 Pavel Reznikov, Dylan Weiss
  * gridstack.js may be freely distributed under the MIT license.
  * @preserve
 */

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gridstack",`
`3`		`- "version": "0.3.0",`
	`3`	`+ "version": "1.0.0-dev",`
`4`	`4`	`"homepage": "https://github.com/troolee/gridstack.js",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Pavel Reznikov <[email protected]>"`