Skip to content

Commit 6471600

Browse files
committed
Merge remote-tracking branch 'remotes/origin/gh-pages' into develop
# Conflicts: # .github/CONTRIBUTING.md # quickblox.min.js
2 parents 5ee6aee + 842714e commit 6471600

File tree

6 files changed

+1082
-1167
lines changed

6 files changed

+1082
-1167
lines changed

.github/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Please follow all rules from our [code style guidelines](https://github.com/Quic
88

99
## Modify and build the library
1010

11-
The quickblox.js library is build from a number of **CommonJS modules** contained in the `src` folder. For example the `src/modules/qbUsers.js` module contains the code that deals with the [Users API](http://quickblox.com/developers/Users).
11+
The quickblox.min.js library is build from a number of **CommonJS modules** contained in the `src` folder. For example the `src/modules/qbUsers.js` module contains the code that deals with the [Users API](http://quickblox.com/developers/Users).
1212

13-
These modules are combined through [browserify](http://browserify.org/) into a single `quickblox.js` file in the root and so this is the only file that needs to be included in a `<script>` tag OR in a RequireJS application OR in Node.js environment (everywhere).
13+
These modules are combined through [browserify](http://browserify.org/) into a single `quickblox.min.js` file in the root and so this is the only file that needs to be included in a `<script>` tag OR in a RequireJS application OR in Node.js environment (everywhere).
1414
To build the library, uses [gulp](http://gulpjs.com/) task runner.
1515

1616
* You need to have the dependencies listed in the package.json available, use `npm install` to load them;

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For correct work of JS SDK you must include the library in your html before `qu
1919

2020
```html
2121
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
22-
<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.3.4/quickblox.min.js"></script>
22+
<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.4.0/quickblox.min.js"></script>
2323
```
2424

2525
## Bower and RequireJS

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "quickblox",
33
"description": "QuickBlox JavaScript SDK",
4-
"version": "2.3.4",
4+
"version": "2.4.0",
55
"homepage": "https://quickblox.com/developers/Javascript",
66
"main": "quickblox.js",
77
"license": "Apache 2.0",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "quickblox",
33
"description": "QuickBlox JavaScript SDK",
4-
"version": "2.3.4",
4+
"version": "2.4.0",
55
"homepage": "https://quickblox.com/developers/Javascript",
66
"main": "src/qbMain.js",
77
"license": "(Apache-2.0)",

0 commit comments

Comments
 (0)