Skip to content

Commit 21f63a2

Browse files
committed
Merge pull request #49 from alfredobarron/dev
update release v2.1.5
2 parents 9df9357 + c60ae49 commit 21f63a2

24 files changed

+121
-709
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.grunt
33
node_modules
44
docsHTML
5+
docs/node_modules
56

67
# Extension to ognore
78
*.zip

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = function(grunt){
3737
compress: {
3838
main: {
3939
options: {
40-
archive: 'smoke-v2.1.4.zip'
40+
archive: 'smoke-v2.1.5.zip'
4141
},
4242
files: [
4343
//{src: ['path/*'], dest: 'internal_folder/', filter: 'isFile'}, // includes files in path

LICENSE

Lines changed: 0 additions & 674 deletions
This file was deleted.

README.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ To get started, check out [http://alfredobarron.github.io/smoke/#/](http://alfre
1919
- [Quick start](#quick-start)
2020
- [Required](#required)
2121
- [Documentation](#documentation)
22+
- [Community](#community)
2223
- [Creators](#creators)
24+
- [Collaborators](#collaborators)
2325
- [Copyright and license](#copyright-and-license)
2426

2527

2628

29+
2730
## Quick start
2831

2932
Several quick start options are available:
@@ -34,21 +37,37 @@ Several quick start options are available:
3437

3538
Read the [Getting started page](http://alfredobarron.github.io/smoke/#/getting-started) for information on the plugin contents.
3639

40+
41+
3742
##Required
3843

3944
Smoke plugin requires the [Jquery](http://jquery.com/) library and [Bootstrap 3.](http://getbootstrap.com/) framework.
4045

46+
47+
4148
##Documentation
4249

4350
Documentation can check the [http://alfredobarron.github.io/smoke/#/](http://alfredobarron.github.io/smoke/#/)
4451

4552

53+
54+
##Community
55+
56+
- Join [the official Slack room](https://smokejs.slack.com).
57+
4658
##Creators
4759

4860
[@AlfredoBarronC](https://twitter.com/AlfredoBarronC)
4961

62+
63+
64+
##Collaborators
65+
5066
[+MisaelRojas](https://plus.google.com/+MisaelRojas)
67+
[+mostrosonido](https://twitter.com/mostrosonido)
68+
69+
5170

5271
##Copyright and license
5372

54-
Code and documentarion (c) Copyright 2015 Alfredo Barron. Code published under [licencia GPL v3.](https://github.com/alfredobarron/smoke/blob/master/LICENSE)
73+
Code and documentarion (c) Copyright 2015 Alfredo Barron. Code published under [license LGPL](https://github.com/alfredobarron/smoke/blob/master/LICENSE)

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "smoke",
3-
"version": "2.1.3",
3+
"version": "2.1.5",
44
"description": "Smoke is the most complete jQuery Plugin and designed for use with Bootstrap 3",
5-
"license": "GPLv3",
5+
"license": "LGPL",
66
"authors": [
77
"Alfredo Barron <[email protected]>"
88
],

dist/css/smoke.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
/**
2-
* Smoke Jquery Plugin diseñado para usarse en Bootstrap 3. *
2+
* Smoke is the most complete jQuery Plugin and designed for use with Bootstrap 3. *
33
* @package Smoke
44
* @version 2.0
55
* @link https://github.com/alfredobarron/smoke The Smoke GitHub project
66
* @author Alfredo Barron <[email protected]>
7-
* @copyright 2014 Alfredo Barron
8-
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
7+
* @copyright 2015 Alfredo Barron
8+
* @license https://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
99
* @note This program is free software: you can redistribute it and/or modify
10-
* it under the terms of the GNU General Public License as published by
10+
* it under the terms of the GNU Lesser General Public License as published by
1111
* the Free Software Foundation, either version 3 of the License, or
1212
* (at your option) any later version.
1313
* This program is distributed in the hope that it will be useful,
1414
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1515
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
16+
* GNU Lesser General Public License for more details.
1717
*/
1818

1919
/*

dist/js/smoke.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
/**
2-
* Smoke Jquery Plugin diseñado para usarse en Bootstrap 3. *
2+
* Smoke is the most complete jQuery Plugin and designed for use with Bootstrap 3. *
33
* @package Smoke
44
* @version 2.0
55
* @link https://github.com/alfredobarron/smoke The Smoke GitHub project
66
* @author Alfredo Barron <[email protected]>
7-
* @copyright 2014 Alfredo Barron
8-
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
7+
* @copyright 2015 Alfredo Barron
8+
* @license https://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
99
* @note This program is free software: you can redistribute it and/or modify
10-
* it under the terms of the GNU General Public License as published by
10+
* it under the terms of the GNU Lesser General Public License as published by
1111
* the Free Software Foundation, either version 3 of the License, or
1212
* (at your option) any later version.
1313
* This program is distributed in the hope that it will be useful,
1414
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1515
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
16+
* GNU Lesser General Public License for more details.
1717
*/
1818

1919
(function($) {

dist/lang/de.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/lang/es.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/lang/fr.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/css/smoke.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
/**
2-
* Smoke Jquery Plugin diseñado para usarse en Bootstrap 3. *
2+
* Smoke is the most complete jQuery Plugin and designed for use with Bootstrap 3. *
33
* @package Smoke
44
* @version 2.0
55
* @link https://github.com/alfredobarron/smoke The Smoke GitHub project
66
* @author Alfredo Barron <[email protected]>
7-
* @copyright 2014 Alfredo Barron
8-
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
7+
* @copyright 2015 Alfredo Barron
8+
* @license https://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
99
* @note This program is free software: you can redistribute it and/or modify
10-
* it under the terms of the GNU General Public License as published by
10+
* it under the terms of the GNU Lesser General Public License as published by
1111
* the Free Software Foundation, either version 3 of the License, or
1212
* (at your option) any later version.
1313
* This program is distributed in the hope that it will be useful,
1414
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1515
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
16+
* GNU Lesser General Public License for more details.
1717
*/
1818

1919
/*

0 commit comments

Comments
 (0)