Skip to content

Commit

Permalink
Merge branch '2.0.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
c0bra committed Apr 22, 2014
2 parents 4b5079d + 37281bc commit 8c392ed
Show file tree
Hide file tree
Showing 45 changed files with 12,133 additions and 5,324 deletions.
4 changes: 2 additions & 2 deletions GruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@
},
ngtemplates: {
ngGrid: {
options: { base: 'src/templates' },
src: ['src/templates/**.html'],
cwd: 'src/templates',
src: '*.html',
dest: 'build/templates.js'
}
},
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ ng-grid Team:
* [Tim Sweet](http://ornerydevelopment.blogspot.com/)
* [Jonathon Ricaurte](https://github.com/jonricaurte)
* [Brian Hann](https://github.com/c0bra)
* [Rob Larsen](https://github.com/roblarsen)
* [Shane Walters](https://github.com/swalters)

License: [MIT](http://www.opensource.org/licenses/mit-license.php)

Expand All @@ -20,7 +22,7 @@ Dependencies: jQuery & angular.js. (JqueryUi draggable for non-HTML5 compliant b
## About
__ng-grid__ Originally built on knockout we wanted to port it to angular.

version 2.0.7
version 2.0.8

[nuGet](https://nuget.org/packages/ng-grid)

Expand Down
28 changes: 26 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
{
"name": "ng-grid",
"version": "2.0.7",
"main": ["./ng-grid.min.css", "./build/ng-grid.min.js"]
"version": "2.0.8",
"homepage": "https://github.com/angular-ui/ng-grid",
"description": "Angular data grid",
"keywords": [
"angular",
"grid"
],
"license": "MIT",
"main": ["./ng-grid.css", "./build/ng-grid.js"],
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"config",
"lib",
"scripts",
"src",
"test",
"workbench",
"conf.js",
"GruntFile.js"
],
"dependencies": {
"jquery": "^1.8.0",
"angularjs": "^1.0.8"
}
}
Loading

0 comments on commit 8c392ed

Please sign in to comment.