Merge pull request #49 from InteractiveIntelligence/v3.2.1-update

V3.2.1 update
GenesysPureConnect · Nov 15, 2016 · 890c1c5 · 890c1c5
2 parents 13e06e2 + 2cd853d
commit 890c1c5
Show file tree

Hide file tree

Showing 163 changed files with 19,489 additions and 144,419 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 sudo: false # defaults to sending build to container-based infrastructure on Travis
 
 node_js:
-  - '0.10'
+  - 4
 
 notifications:
   webhooks:
@@ -31,6 +31,7 @@ branches:
   only:
     - master
     - /^3\.0$/
+    - /^3\.x$/
     - /^release-.*$/
 
 before_install:

diff --git a/BS-Flatly-2.3.css b/BS-Flatly-2.3.css
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,3 +1,5 @@
+# New Issues are for bug reports or feature requests only!!  Questions on how to use the grid should be posted to Stack Overflow or Gitter https://gitter.im/angular-ui/ui-grid.
+
 # Contributing to UI Grid
 
 Please take a moment to review this document in order to make the contribution
@@ -74,7 +76,8 @@ Example:
 Feature requests are welcome. But take a moment to find out whether your idea
 fits with the scope and aims of the project. It's up to *you* to make a strong
 case to convince the project's developers of the merits of this feature. Please
-provide as much detail and context as possible.
+provide as much detail and context as possible. Please also see the note in the
+[Developer guidelines](DEVELOPER.md) about implementing new features as plugins.
 
 
 <a name="pull-requests"></a>
@@ -92,6 +95,10 @@ project's developers might not want to merge into the project.
 Please adhere to the coding conventions used throughout a project (indentation,
 accurate comments, etc.) and any other requirements (such as test coverage).
 
+**Include Examples** If possible, include links to a youtube video or GIF
+demonstrating your fix or your feature. It will help us understand what you
+are doing and why we want to merge it in.
+
 Adhering to the following this process is the best way to get your work
 included in the project:
 
@@ -133,25 +140,34 @@ included in the project:
    git pull [--rebase] upstream master
    ```
 
-6. Push your topic branch up to your fork:
+6. Squash your change into one commit
+  ```bash
+  git rebase -i master
+  ```
+
+7. Push your topic branch up to your fork:
 
    ```bash
-   git push origin <topic-branch-name>
+   git push [--force] origin <topic-branch-name>
    ```
 
-7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
+8. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
     with a clear title and description.
 
 **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
-license your work under the the terms of the [MIT License](LICENSE.md).
+license your work under the terms of the [MIT License](LICENSE.md).
 
 ## <a name="commit"></a> Git Commit Guidelines
 
 We have very precise rules over how our git commit messages can be formatted.  This leads to **more
 readable messages** that are easy to follow when looking through the **project history**.  But also,
 we use the git commit messages to **generate the UIGrid change log**.
 
+Alternatively you can install [commitizen](https://github.com/commitizen/cz-cli) **OR**
+use the wizard. To use the wizard, run `npm run commit` in your terminal after staging your changes in git.
+
 ### Commit Message Format
+**If you do not follow this style guide your commit message will fail to be created.**
 Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
 format that includes a **type**, a **scope** and a **subject**:
 

diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -22,7 +22,7 @@ http://localhost:9003/docs/#/tutorial to browse each tutorial.
 <br/> fast - alias for --no-e2e --core --angular=1.3.6
 
 ```
-grunt dev --no-e2e --angular=1.3.16
+grunt dev --no-e2e --angular=1.5.0
 ```
 
 # Code Structure
@@ -32,16 +32,20 @@ The core angular module (ui.grid) provides the basics
  - Virtualization
  - Row Selection
 
-Everything else should be added as new angular modules unless the grid team agrees that it's a core feature.
+Everything else should be added as new angular modules unless the grid team agrees that it's a core feature. All new feature
+modules should be developed as plugins, and be hosted in their own repositories. There is a great [blog post](http://brianhann.com/write-your-own-ui-grid-plugin/)
+about developing a plugin for ui-grid. Your plugin should use the available publicApi, if you need something in the publicApi that isn't
+currently exposed, we welcome pull requests.
+
+The grid team has limited time to spend on this project, and as the list of features grows, so does the effort required to support
+ those features. In a future release we will be working to move some of the existing features out of the core repository. The basic
+ rule of thumb for any new features is: "If it is possible to implement it as a plugin, it should be a plugin".
 
 ## Feature module design
-* We prefer no 3rd party dependencies other than angular. Contact grid team if you have a 3rd party need that can't be avoided.
+* We prefer no 3rd party dependencies other than angular.
 * jQuery is only used in Unit Tests
 * unit test your code! not that hard. see test/unit for examples. Features will be rejected if the test coverage isn't adequate.
 * use ngDoc to document how to use your feature.  see examples in existing code.
-* New module should be named ui.grid.feature
-* feature folder is added below src
-* One js file per feature
 * no global variables
 * public methods and events are registered in grid.api (more on that later)
 * design and code the angular way. What do we mean by that? Dependency injection, small directives, emphasis the model, not the DOM, tests!

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,7 +9,7 @@ var util = require('./lib/grunt/utils.js');
 /*global module:false*/
 module.exports = function(grunt) {
   require('time-grunt')(grunt);
-  
+
   // use load-grunt-config to load config settings for each individual task from grunt/
   require('load-grunt-config')(grunt, {
     // use jitGrunt to automatically load the grunt tasks that we have defined in our package.json
@@ -36,6 +36,8 @@ module.exports = function(grunt) {
       pkg: grunt.file.readJSON('package.json'),
       version: util.getVersion(),
       stable_version: util.getStableVersion(),
+      latestAngular: util.latestAngular(),
+      angularTestVersions: util.angulars(),
       dist: 'dist',
       site: process.env.TRAVIS ? 'ui-grid.info' : '127.0.0.1:<%= connect.docs.options.port %>',
       banner: '/*!\n' +
@@ -47,7 +49,7 @@ module.exports = function(grunt) {
     }
 
   });
-  
+
   util.updateConfig();
 
   grunt.loadTasks('lib/grunt');

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,8 @@
+Please make sure each of the following is true before submitting a new issue.  We are a small team with limited time and it is very difficult to manage issues if they aren't reported correctly.
+
+- [ ] This is a bug report, not a question on how to use the grid.  
+Use [Stack Overflow](http://stackoverflow.com/questions/tagged/angular-ui-grid) or [Gitter](https://gitter.im/angular-ui/ui-grid) for questions.
+- [ ] You have searched the open issues to see if this bug has been filed before.  We don't want duplicate issues.
+- [ ] You have reviewed the tutorials and documentation to ensure you are using the grid correctly. [ui-grid.info](http://ui-grid.info/docs/#/tutorial)
+- [ ] You are using the latest version of the grid. Older versions are not patched or supported.
+- [ ] You have provided steps to recreate your bug.  A plunkr is even better.
diff --git a/README.md b/README.md
@@ -1,7 +1,13 @@
 # UI-Grid : An AngularJS data grid
 
-[![Build Status](https://api.travis-ci.org/angular-ui/ui-grid.png?branch=3.0)](https://travis-ci.org/angular-ui/ui-grid) [![Coverage Status](https://coveralls.io/repos/angular-ui/ui-grid/badge.png?branch=master)](https://coveralls.io/r/angular-ui/ui-grid?branch=master)
+[![Build Status](https://travis-ci.org/angular-ui/ui-grid.svg?branch=master)](https://travis-ci.org/angular-ui/ui-grid)
+[![Coverage Status](https://coveralls.io/repos/github/angular-ui/ui-grid/badge.svg?branch=master)](https://coveralls.io/github/angular-ui/ui-grid?branch=master)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/ui-grid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![npm](https://img.shields.io/npm/dm/angular-ui-grid.svg)](https://www.npmjs.com/package/angular-ui-grid)
+[![npm](https://img.shields.io/npm/dt/angular-ui-grid.svg)](https://www.npmjs.com/package/angular-ui-grid)
+[![OpenCollective](https://opencollective.com/ui-grid/backers/badge.svg)](#backers) 
+[![OpenCollective](https://opencollective.com/ui-grid/sponsors/badge.svg)](#sponsors)
 
 [![Selenium Test Status](https://saucelabs.com/browser-matrix/nggrid.svg)](https://saucelabs.com/u/nggrid)
 
@@ -33,8 +39,8 @@ Need Some Inspiration? Have a look at our open [PRs Plz!](https://github.com/ang
 ```
 
 ```html
-    <link rel="stylesheet" type="text/css" href="node_modules/angular-ui-grid/ui.grid.min.css">
-    <script src="node_modules/angular-ui-grid/ui.grid.min.js">
+    <link rel="stylesheet" type="text/css" href="node_modules/angular-ui-grid/ui-grid.min.css">
+    <script src="node_modules/angular-ui-grid/ui-grid.min.js">
 ```
 
 ## CDN
@@ -74,6 +80,12 @@ Feature           | Release state
 
 For more details on the features check the [Tutorials](http://ui-grid.info/docs/#/tutorial).
 
+# Plugins
+
+UI-Grid has an excellent plugin system. Most new features can be added as plugins. Please see some discussion of that in the [Developer guidelines](DEVELOPER.md).
+There is a [list of known plugins](http://ui-grid.info/docs/#/tutorial/299_third_party_features) on the tutorial site. If you would
+like your plugin added to that list, please [edit the tutorial page](misc/tutorial/299_third_party_features.ngdoc) and send a pull request.
+
 # Building
 
 Install dependencies
@@ -163,8 +175,83 @@ With the 3.0 release, the repository has been renamed from "ng-grid" to "ui-grid
 
 All network traffic to GitHub should redirect automatically but they say you should update your git remote url:
 
-  git remote set-url origin https://github.com/angular-ui/ui-grid.git
+    git remote set-url origin https://github.com/angular-ui/ui-grid.git
 
 # Thanks
 
 Thanks to [Sauce Labs](http://saucelabs.com) and [BrowserStack](http://www.browserstack.com) for providing their testing platforms to open source projects for free.
+
+
+
+# Backers
+
+Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/ui-grid#backer)]
+
+<a href="https://opencollective.com/ui-grid/backer/0/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/0/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/1/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/1/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/2/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/2/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/3/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/3/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/4/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/4/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/5/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/5/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/6/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/6/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/7/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/7/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/8/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/8/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/9/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/9/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/10/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/10/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/11/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/11/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/12/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/12/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/13/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/13/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/14/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/14/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/15/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/15/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/16/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/16/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/17/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/17/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/18/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/18/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/19/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/19/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/20/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/20/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/21/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/21/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/22/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/22/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/23/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/23/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/24/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/24/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/25/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/25/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/26/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/26/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/27/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/27/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/28/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/28/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/backer/29/website" target="_blank"><img src="https://opencollective.com/ui-grid/backer/29/avatar.svg"></a>
+
+
+# Sponsors
+
+Become a sponsor and get your logo on our website and on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/ui-grid#sponsor)]
+
+<a href="https://opencollective.com/ui-grid/sponsor/0/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/1/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/2/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/3/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/4/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/5/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/6/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/7/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/8/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/9/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/9/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/10/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/10/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/11/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/11/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/12/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/12/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/13/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/13/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/14/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/14/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/15/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/15/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/16/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/16/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/17/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/17/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/18/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/18/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/19/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/19/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/20/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/20/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/21/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/21/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/22/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/22/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/23/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/23/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/24/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/24/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/25/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/25/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/26/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/26/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/27/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/27/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/28/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/28/avatar.svg"></a>
+<a href="https://opencollective.com/ui-grid/sponsor/29/website" target="_blank"><img src="https://opencollective.com/ui-grid/sponsor/29/avatar.svg"></a>
+
+
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-grid",
-  "version": "3.0.6",
+  "version": "3.2.9",
   "homepage": "http://ui-grid.info",
   "repository": {
     "type": "git",