Skip to content

Commit

Permalink
Merge branch 'release/0.13.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
budnix committed Oct 26, 2016
2 parents 59a3066 + 977c4b1 commit b8b7495
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 24 deletions.
24 changes: 24 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Editor conf
.idea
dump.rdb

# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

coverage
node_modules
bower_components

# Common
tmp
.DS_Store
*/.DS_Store
*/*/.DS_Store
lib-cov
dev.html
20 changes: 20 additions & 0 deletions .release.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"package_file_location": "./package.json",
"no_confirm": false,
"skip_git_pull": false,
"skip_git_push": false,
"release_message": true,
"remote": "origin",
"pre_commit_commands": [
"npm run build",
"npm run test"
],
"post_commit_commands": [],
"post_complete_commands": [
"npm publish"
],
"files_to_commit": [
"./dist/**/*",
"./demo/**/*"
]
}
9 changes: 3 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "ngHandsontable",
"dependencies": {
"angular": "~1.4",
"handsontable": "~0.25.0"
"angular": "~1.5.0",
"handsontable": "~0.28.4"
},
"homepage": "https://github.com/handsontable/ngHandsontable",
"authors": [
Expand All @@ -28,8 +28,5 @@
"src",
"test",
"tests"
],
"devDependencies": {
"angular-ui-router": "~0.2.15"
}
]
}
2 changes: 1 addition & 1 deletion demo/build/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
}
config.$inject = ['$sceDelegateProvider', '$httpProvider', '$stateProvider', '$compileProvider', '$urlRouterProvider', 'demoMapProvider'];

app.constant('version', 'v0.12.0');
app.constant('version', 'v0.13.0');
app.config(config);

angular.element(document).ready(function() {
Expand Down
8 changes: 4 additions & 4 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<!--
Loading Handsontable (full distribution that includes all dependencies)
-->
<link rel="stylesheet" media="screen" href="../bower_components/handsontable/dist/handsontable.full.css">
<script src="../bower_components/angular/angular.js"></script>
<script src="../bower_components/angular-ui-router/release/angular-ui-router.js"></script>
<script src="../bower_components/handsontable/dist/handsontable.full.js"></script>
<link rel="stylesheet" media="screen" href="../node_modules/handsontable/dist/handsontable.full.css">
<script src="../node_modules/angular/angular.js"></script>
<script src="../node_modules/angular-ui-router/release/angular-ui-router.js"></script>
<script src="../node_modules/handsontable/dist/handsontable.full.js"></script>
<script src="../dist/ngHandsontable.js"></script>

<script src="build/app.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/ngHandsontable.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/**
* ngHandsontable 0.12.0
* ng-handsontable 0.13.0
*
* Copyright 2012-2015 Marcin Warpechowski
* Copyright 2015 Handsoncode sp. z o.o. <hello@handsontable.com>
* Licensed under the MIT license.
* https://github.com/handsontable/ngHandsontable
* Date: Wed May 25 2016 15:56:21 GMT+0200 (CEST)
* Date: Wed Oct 26 2016 10:00:05 GMT+0200 (CEST)
*/

if (document.all && !document.addEventListener) { // IE 8 and lower
Expand Down
6 changes: 3 additions & 3 deletions dist/ngHandsontable.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<!--
Loading Handsontable (full distribution that includes all dependencies)
-->
<link data-jsfiddle="common" rel="stylesheet" media="screen" href="bower_components/handsontable/dist/handsontable.full.css">
<script data-jsfiddle="common" src="bower_components/angular/angular.js"></script>
<script data-jsfiddle="common" src="bower_components/handsontable/dist/handsontable.full.js"></script>
<link data-jsfiddle="common" rel="stylesheet" media="screen" href="node_modules/handsontable/dist/handsontable.full.css">
<script data-jsfiddle="common" src="node_modules/angular/angular.js"></script>
<script data-jsfiddle="common" src="node_modules/handsontable/dist/handsontable.full.js"></script>
<script data-jsfiddle="common" src="dist/ngHandsontable.js"></script>

<script data-jsfiddle="common" src="demo/js/services/dataFactory.js"></script>
Expand Down Expand Up @@ -48,6 +48,10 @@ <h2>Install</h2>
<pre><code class="bash">
$ bower install ngHandsontable --save
</code></pre>
using NPM:
<pre><code class="bash">
$ npm install ng-handsontable --save
</code></pre>
Or <a href="https://github.com/handsontable/ngHandsontable/archive/master.zip">download as ZIP</a>.

<h2>Usage</h2>
Expand Down
Loading

0 comments on commit b8b7495

Please sign in to comment.