Skip to content

Commit

Permalink
Merge branch 'gh-pages'
Browse files Browse the repository at this point in the history
  • Loading branch information
Syl committed Jun 30, 2014
2 parents 54de8a0 + ad4e671 commit 8fcdd94
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 13 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "desoslide",
"version": "2.0.1",
"version": "2.1.0",
"homepage": "https://github.com/sylouuu/desoslide",
"description": "Take control of your slideshow with this powerful jQuery plugin",
"keywords": [
Expand All @@ -17,4 +17,4 @@
"animate.css": "~3.1.0",
"magic": "~1.0.0"
}
}
}
2 changes: 1 addition & 1 deletion desoslide.jquery.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "desoslide",
"title": "desoSlide",
"version": "2.0.1",
"version": "2.1.0",
"description": "Take control of your slideshow with this powerful jQuery plugin",
"keywords": [
"slider",
Expand Down
2 changes: 1 addition & 1 deletion dist/css/jquery.desoslide.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Version 2.0.1
* Version 2.1.0
* jQuery: desoSlide plugin
* Copyright - 2014 - https://github.com/sylouuu/desoslide
* This source code is under the MIT License
Expand Down
2 changes: 1 addition & 1 deletion dist/css/jquery.desoslide.min.css

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

2 changes: 1 addition & 1 deletion dist/js/jquery.desoslide.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Version 2.0.1
* Version 2.1.0
* jQuery: desoSlide plugin
* Copyright - 2014 - https://github.com/sylouuu/desoslide
* This source code is under the MIT License
Expand Down
4 changes: 2 additions & 2 deletions dist/js/jquery.desoslide.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/less/jquery.desoslide.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Version 2.0.1
* Version 2.1.0
* jQuery: desoSlide plugin
* Copyright - 2014 - https://github.com/sylouuu/desoslide
* This source code is under the MIT License
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h1>Documentation</h1>
<div class="row">
<article class="col-lg-12">
<p>
Documentation covers: 2.0.1
Documentation covers: 2.1.0
</p>
</article>
</div>
Expand Down
27 changes: 26 additions & 1 deletion doc/release-notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h1>Release Notes</h1>
<div class="row">
<article class="col-lg-12">
<p>
Current stable release: 2.0.1
Current stable release: 2.1.0
</p>
</article>
</div>
Expand All @@ -107,6 +107,30 @@ <h1>Release Notes</h1>
<!-- Changelog section -->
<section class="changelog">

<!-- Release date 2.1.0 -->
<article class="section-title section-alizarin">
<i class="fa fa-calendar section-icon"></i>
<h2 class="section-text">
2014-06-30
<br />
<span class="label label-primary">2.1.0</span>
</h2>
</article>

<!-- Changelog 2.1.0 -->
<div class="container text-center">
<div class="row">
<article class="col-lg-12">
<ul class="list-unstyled list-changelog text-left">
<li>
<span class="label label-success">New</span>
Allowed instant transition with <code>effect: 'none'</code>.
</li>
</ul>
</article>
</div>
</div>

<!-- Release date 2.0.1 -->
<article class="section-title section-alizarin">
<i class="fa fa-calendar section-icon"></i>
Expand All @@ -130,6 +154,7 @@ <h2 class="section-text">
</article>
</div>
</div>

<!-- Release date 2.0 -->
<article class="section-title section-alizarin">
<i class="fa fa-calendar section-icon"></i>
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ <h3>Your browser is too old!</h3>
</ul>

<small>
Current stable release: 2.0.1
Current stable release: 2.1.0
</small>
</div>

Expand Down
2 changes: 1 addition & 1 deletion tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ <h1>Tests</h1>
<div class="row">
<article class="col-lg-12">
<p>
Tests cover: 2.0.1
Tests cover: 2.1.0
</p>
</article>
</div>
Expand Down

0 comments on commit 8fcdd94

Please sign in to comment.