Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasRannou committed Nov 24, 2016
2 parents 3c58032 + 6f959af commit 288d5ab
Show file tree
Hide file tree
Showing 31 changed files with 1,002 additions and 294 deletions.
4 changes: 3 additions & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ ratings:
- "**.js"
exclude_paths:
- assets/**/*
- build/*
- data/**/*
- dist/**/*
- examples/**/*
- lessons/**/*
- external/**/*
- deprecated/**/*
- legacy/**/*
- specs/**/*
- src/controls/**/*
- gulpfile.js
- karma.conf.js
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,23 @@ Please submit pull request, open issues or contact us for any question, feature
</div>
</td>
</tr>
<tr>
<!-- Lesson 08 -->
<td valign="middle" width="100">
<a href='http://jsfiddle.net/gh/get/library/pure/fnndsc/ami/tree/master/lessons/08#run' target=_blank>
<img src="https://cloud.githubusercontent.com/assets/214063/20597899/9b7ec102-b246-11e6-804b-be8ac6dc9a68.gif" style="width:128x, height:128px" alt="lesson00" title="Click me!">
<img src="http://xtk.github.com/fiddlelogo_small2.png">
</a>
</td>
<td valign="top" width="326">
<a href='http://jsfiddle.net/gh/get/library/pure/fnndsc/ami/tree/master/lessons/08#run'>
<b>Lesson 08: Custom progress bar</b>
</a>
<div>
Custom progress bars.
</div>
</td>
</tr>
</table>

### (more) Advanced demos
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ami.js",
"version": "v0.0.10",
"version": "v0.0.11",
"dependencies": {}
}
Loading

0 comments on commit 288d5ab

Please sign in to comment.