please add feature filter with enter key

.travis.yml

@@ -62,4 +62,5 @@ after_failure:
   - ./travis_print_logs.sh
 
 after_script:
+  - killall -9 sc
   - ./travis_print_logs.sh

CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="v3.2.11"></a>
+### v3.2.11 (2017-03-28)
+
+
+#### Bug Fixes
+
+* **6130:** Renaming font files to match icon.less expectation. ([53b9e33a](http://github.com/angular-ui/ng-grid/commit/53b9e33a8771a81e86d0d56b38a1eb6cd880c230))
+
+<a name="v3.2.10"></a>
+### v3.2.10 (2017-03-27)
+
+
+#### Bug Fixes
+
+* **#6017:** Fixes ui-grid-viewport scroll issue in chrome v56. Credit to @Joel-Kornbluh ([cc8afa8](https://github.com/angular-ui/ui-grid/pull/6125/commits/cc8afa88d2facd70f37653b6d8fabb926996fbbb))
+
 <a name="v3.2.9"></a>
 ### v3.2.9 (2016-09-21)
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-grid",
-  "version": "3.2.9",
+  "version": "3.2.11",
   "homepage": "http://ui-grid.info",
   "repository": {
     "type": "git",

grunt/aliases.js

@@ -10,7 +10,7 @@ module.exports = function (grunt, options) {
     'default': ['before-test', 'test:single', 'after-test'],
 
     // Build with no testing
-    'build': ['ngtemplates', 'concat', 'uglify', 'fontello', 'less', 'ngdocs', 'copy:site', 'copy:less_customizer',],
+    'build': ['ngtemplates', 'concat', 'uglify', 'less', 'ngdocs', 'copy:font_dist', 'copy:site', 'copy:less_customizer',],
 
     // Auto-test tasks for development
     'autotest:unit': ['karmangular:start'],
@@ -53,10 +53,10 @@ module.exports = function (grunt, options) {
   var currentTag = semver.clean( util.getCurrentTag() );
 
   if (currentTag) {
-    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
+    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
   }
   else {
-    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site'];
+    baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release'];
   }
 
   return baseTasks;

grunt/copy.js

@@ -18,6 +18,34 @@ module.exports = function ( grunt ) {
         }
       ]
     },
+    font_dist: {
+      files: [
+        {
+          expand: true,
+          cwd: 'src/font',
+          src: '**/*.eot',
+          dest: '<%= dist %>/release/'
+        },
+        {
+          expand: true,
+          cwd: 'src/font',
+          src: '**/*.svg',
+          dest: '<%= dist %>/release/'
+        },
+        {
+          expand: true,
+          cwd: 'src/font',
+          src: '**/*.ttf',
+          dest: '<%= dist %>/release/'
+        },
+        {
+          expand: true,
+          cwd: 'src/font',
+          src: '**/*.woff',
+          dest: '<%= dist %>/release/'
+        }
+      ]
+    },
     less_customizer: {
       files: [
         {

grunt/font-config.json

@@ -0,0 +1,148 @@
+{
+	"name": "29f50de8e70e0efa40c762200582c08b",
+	"css_prefix_text": "ui-grid-icon-",
+	"css_use_suffix": false,
+	"hinting": true,
+	"units_per_em": 1000,
+	"ascent": 850,
+	"glyphs": [
+		{
+			"uid": "5d2d07f112b8de19f2c0dbfec3e42c05",
+			"css": "spin5",
+			"code": 60001,
+			"src": "fontelico"
+		},
+		{
+			"uid": "9dd9e835aebe1060ba7190ad2b2ed951",
+			"css": "search",
+			"code": 50002,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "12f4ece88e46abd864e40b35e05b11cd",
+			"css": "ok",
+			"code": 50018,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "5211af474d3a9848f67f945e2ccaf143",
+			"css": "cancel",
+			"code": 50003,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "1a5cfa186647e8c929c2b17b9fc4dac1",
+			"css": "plus-squared",
+			"code": 50000,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "f755a58fb985eeb70bd47d9b31892a34",
+			"css": "minus-squared",
+			"code": 50001,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "e82cedfa1d5f15b00c5a81c9bd731ea2",
+			"css": "info-circled",
+			"code": 50004,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "c1f1975c885aa9f3dad7810c53b82074",
+			"css": "lock",
+			"code": 50005,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "657ab647f6248a6b57a5b893beaf35a9",
+			"css": "lock-open",
+			"code": 50006,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6",
+			"css": "pencil",
+			"code": 50007,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "559647a6f430b3aeadbecd67194451dd",
+			"css": "menu",
+			"code": 50019,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "2d6150442079cbda7df64522dc24f482",
+			"css": "down-dir",
+			"code": 50008,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "80cd1022bd9ea151d554bec1fa05f2de",
+			"css": "up-dir",
+			"code": 50009,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "9dc654095085167524602c9acc0c5570",
+			"css": "left-dir",
+			"code": 50010,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "fb1c799ffe5bf8fb7f8bcb647c8fe9e6",
+			"css": "right-dir",
+			"code": 50011,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "d870630ff8f81e6de3958ecaeac532f2",
+			"css": "left-open",
+			"code": 50012,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "399ef63b1e23ab1b761dfbb5591fa4da",
+			"css": "right-open",
+			"code": 50013,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "e4dde1992f787163e2e2b534b8c8067d",
+			"css": "angle-down",
+			"code": 50014,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "594e9271c08ff732c04b3bf3117b9040",
+			"css": "indent-left",
+			"code": 59392,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "4d2dfc45d8176b1f26aed973fa84a91e",
+			"css": "indent-right",
+			"code": 59393,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "4109c474ff99cad28fd5a2c38af2ec6f",
+			"css": "filter",
+			"code": 50015,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "0cd2582b8c93719d066ee0affd02ac78",
+			"css": "sort-alt-up",
+			"code": 50016,
+			"src": "fontawesome"
+		},
+		{
+			"uid": "27b13eff5eb0ca15e01a6e65ffe6eeec",
+			"css": "sort-alt-down",
+			"code": 50017,
+			"src": "fontawesome"
+		}
+	]
+}

grunt/fontello.js

@@ -2,9 +2,18 @@ module.exports = {
   options: {
     sass: false
   },
+  dev: {
+    options: {
+      config  : 'grunt/font-config.json',
+      fonts   : 'src/font',
+      styles  : '.tmp/font',
+      scss    : false
+      // force   : true
+    }
+  },
   dist: {
     options: {
-      config  : 'src/font/config.json',
+      config  : 'grunt/font-config.json',
       fonts   : 'dist/release',
       styles  : '.tmp/font',
       scss    : false

grunt/shell.js

@@ -1,29 +1,39 @@
-module.exports = {
-  // selenium no longer used
-  selenium: {
-    command: './selenium/start',
-    options: {
-      async: true
-    }
-  },
-  'protractor-install': {
-    command: 'node ./node_modules/protractor/bin/webdriver-manager update'
-  },
-  'protractor-start': {
-    command: 'node ./node_modules/protractor/bin/webdriver-manager start',
-    options: {
-      // apparently webdriver/selenium writes lots of trash on stderr, and the real output on stdout.  No idea why....
-      stderr: false,
-      async: true,
-      execOptions: {
+module.exports = function() {
+  var webdriverManagerPath = './node_modules/protractor/bin/webdriver-manager';
+  var bowerPath = './node_modules/bower/bin/bower';
+
+  if(process.platform === 'win32') {
+    webdriverManagerPath = '.\\node_modules\\protractor\\bin\\webdriver-manager';
+    bowerPath = '.\\node_modules\\bower\\bin\\bower';
+  }
+
+  return {
+    // selenium no longer used
+    selenium: {
+      command: './selenium/start',
+      options: {
+        async: true
+      }
+    },
+    'protractor-install': {
+      command: 'node ' + webdriverManagerPath + ' update'
+    },
+    'protractor-start': {
+      command: 'node ' + webdriverManagerPath + ' start',
+      options: {
+        // apparently webdriver/selenium writes lots of trash on stderr, and the real output on stdout.  No idea why....
+        stderr: false,
+        async: true,
+        execOptions: {
           maxBuffer: 400*1024 // or whatever other large value you want
+        }
       }
+    },
+    'bower-install': {
+      command: 'node ' + bowerPath + ' install'
+    },
+    'hooks-install': {
+      command: 'npm run init'
     }
-  },
-  'bower-install': {
-    command: 'node ./node_modules/bower/bin/bower install'
-  },
-  'hooks-install': {
-    command: 'npm run init'
-  }
+  };
 };

lib/grunt/plugins.js

@@ -9,6 +9,7 @@ var reader = require('../../node_modules/grunt-ngdocs/src/reader.js');
 
 var projectPath = path.resolve(__dirname, '../..');
 var pkg = require(path.resolve(projectPath, 'package.json'));
+var bwr = require(path.resolve(projectPath, 'bower.json'));
 
 module.exports = function(grunt) {
 
@@ -289,6 +290,13 @@ module.exports = function(grunt) {
     done();
   });
 
+  // Copies a file into the release directory
+  function copyIntoRelease(tagggedReleaseDir, filePath) {
+    var file = path.resolve(projectPath, filePath);
+
+    shell.cp('-f', file, tagggedReleaseDir);
+  }
+
   // Create the bower.json file
   grunt.registerTask('update-bower-json', function () {
     var currentTag = semver.clean( util.getVersion() );
@@ -304,16 +312,21 @@ module.exports = function(grunt) {
 			});
 
     // Copy a README file
-    var readme = path.resolve(projectPath, 'misc/publish/README.md');
-    shell.cp('-f', readme, taggedReleaseDir);
+    copyIntoRelease(taggedReleaseDir, 'misc/publish/README.md');
+
+    // Copy a CHANGELOG file
+    copyIntoRelease(taggedReleaseDir, 'CHANGELOG.md');
+
+    // Copy a index.js file
+    copyIntoRelease(taggedReleaseDir, 'misc/publish/index.js');
 
     var bowerJsonFile = path.join(taggedReleaseDir, 'bower.json');
     var pkgJsonFile = path.join(taggedReleaseDir, 'package.json');
 
     var json = {
       'name': 'angular-ui-grid',
       'description': pkg.description,
-      'main': releaseFiles,
+      'main': bwr.main,
       'ignore': [],
       'dependencies': {
         'angular': '>=1.2.16 1.4.x'
@@ -329,7 +342,7 @@ module.exports = function(grunt) {
 
     // For package.json
     json.version = currentTag;
-    json.main = "ui-grid.js";
+    json.main = pkg.main;
     json.files = releaseFiles;
 
     fs.writeFileSync(pkgJsonFile, JSON.stringify(json, null, 2));