Skip to content

Add the github helpers files #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# How to contribute

First off, thanks that you help us to make Quickblox better.

Feedback and suggestions for improvement always welcome :)

## Modify and build the library

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).

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). To build the library, use the [Grunt](http://gruntjs.com/) task runner.

* You need to have the dependencies listed in the package.json available, use `npm install` to load them;
* Install **grunt-cli** `npm install -g grunt-cli`;
* Also you need install **jasmine** global `npm i -g jasmine` for tests;
* Change the 'version' properties in next files:
* https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/src/qbConfig.js;
* https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/bower.json;
* https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/package.json;
* Rebuild SDK: `grunt`;
* Update README.md;
* Commit your changes to git repository and create a new "git tag" for new version. This action updates SDK for GIT and also for bower package manager;
* `npm publish`. This action updates SDK for node package manager, but maybe you will be needed some author credentials for it (you should be in owner list);
* Update QuickBlox developers section.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = function (grunt) {
},
all: {
files: {
'quickblox.js': ['js/qbMain.js']
'quickblox.js': ['src/qbMain.js']
}
}
},
Expand All @@ -45,7 +45,7 @@ module.exports = function (grunt) {
},

watch: {
files: ['js/*.js', 'js/modules/*.js', 'js/modules/webrtc/*.js'],
files: ['src/*.js', 'src/modules/*.js', 'src/modules/webrtc/*.js'],
tasks: ['browserify', 'notify:browserify', 'uglify', 'notify:uglify'],
options: {
spawn: false,
Expand Down
20 changes: 2 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,8 @@ Please raise questions, requests for help etc. via http://stackoverflow.com/ques

Feedback and suggestions for improvement always welcome :)

# Modifying and building the library

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

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). To build the library, use the [Grunt](http://gruntjs.com/) task runner:

* You need to have the dependencies listed in the package.json available, use `npm install` to load them.
* Install **grunt-cli** `npm install -g grunt-cli`
* Also you need install **jasmine** global `npm i -g jasmine` for tests.
* Change the 'version' properties in next files:
* https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/js/qbConfig.js
* https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/bower.json
* https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/package.json
* Rebuild SDK: `grunt`
* Update README.md
* Commit your changes to git repository and create a new "git tag" for new version. This action updates SDK for GIT and also for bower package manager.
* `npm publish`. This action updates SDK for node package manager, but maybe you will be needed some author credentials for it (you should be in owner list)
* Update QuickBlox developers section
# How to contribute
See more information at [contributing.md](https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/.github/CONTRIBUTING.md)

# License
BSD
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"ignore": [
"**/.*",
"examples",
"js",
"src",
"lib",
"node_modules",
"plugins",
Expand Down
20 changes: 10 additions & 10 deletions quickblox.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion spec/QB-ChatSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('Chat API', function() {

var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';

var QB = isNodeEnv ? require('../js/qbMain') : window.QB;
var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
var CREDENTIALS = isNodeEnv ? require('./config').CREDENTIALS : window.CREDENTIALS;
var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
var QBUser2 = isNodeEnv ? require('./config').QBUser2 : window.QBUser2;
Expand Down
2 changes: 1 addition & 1 deletion spec/QB-ContentSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe('Content API', function() {
var REST_REQUESTS_TIMEOUT = 3000;

var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';
var QB = isNodeEnv ? require('../js/qbMain') : window.QB;
var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
var CREDENTIALS = isNodeEnv ? require('./config').CREDENTIALS : window.CREDENTIALS;
var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;

Expand Down
2 changes: 1 addition & 1 deletion spec/QB-CoreSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('Session API', function() {
var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';
var request = isNodeEnv ? require('request') : {};

var QB = isNodeEnv ? require('../js/qbMain') : window.QB;
var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
var CREDENTIALS = isNodeEnv ? require('./config').CREDENTIALS : window.CREDENTIALS;
var CONFIG = isNodeEnv ? require('./config').CONFIG : window.CONFIG;
var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
Expand Down
2 changes: 1 addition & 1 deletion spec/QB-DataSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('Custom Objects API', function() {
var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';
var request = isNodeEnv ? require('request') : {};

var QB = isNodeEnv ? require('../js/qbMain') : window.QB;
var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
var CREDENTIALS = isNodeEnv ? require('./config').CREDENTIALS : window.CREDENTIALS;
var CONFIG = isNodeEnv ? require('./config').CONFIG : window.CONFIG;
var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
Expand Down
2 changes: 1 addition & 1 deletion spec/QB-LocationSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe('Location API', function() {
var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';
var request = isNodeEnv ? require('request') : {};

var QB = isNodeEnv ? require('../js/qbMain') : window.QB;
var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
var CREDENTIALS = isNodeEnv ? require('./config').CREDENTIALS : window.CREDENTIALS;
var CONFIG = isNodeEnv ? require('./config').CONFIG : window.CONFIG;
var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
Expand Down
2 changes: 1 addition & 1 deletion spec/QB-PushnotificationsSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ describe('PushNotifications API', function() {

var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';

var QB = isNodeEnv ? require('../js/qbMain') : window.QB;
var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
var CREDENTIALS = isNodeEnv ? require('./config').CREDENTIALS : window.CREDENTIALS;
var CONFIG = isNodeEnv ? require('./config').CONFIG : window.CONFIG;
var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
Expand Down
4 changes: 2 additions & 2 deletions spec/QB-UsersSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('Users API', function() {
var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';
var request = isNodeEnv ? require('request') : {};

var QB = isNodeEnv ? require('../js/qbMain') : window.QB;
var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
var CREDENTIALS = isNodeEnv ? require('./config').CREDENTIALS : window.CREDENTIALS;
var CONFIG = isNodeEnv ? require('./config').CONFIG : window.CONFIG;
var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
Expand All @@ -19,7 +19,7 @@ describe('Users API', function() {
done.fail("Create session error: " + JSON.stringify(err));
} else {
expect(result).not.toBeNull();

done();
}
}, REST_REQUESTS_TIMEOUT);
Expand Down
2 changes: 1 addition & 1 deletion spec/QB-WebRTCSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe('WebRTC API', function() {

var isNodeEnv = typeof window === 'undefined' && typeof exports === 'object';

var QB = isNodeEnv ? require('../js/qbMain') : window.QB;
var QB = isNodeEnv ? require('../src/qbMain') : window.QB;
var CREDENTIALS = isNodeEnv ? require('./config').CREDENTIALS : window.CREDENTIALS;
var CONFIG = isNodeEnv ? require('./config').CONFIG : window.CONFIG;
var QBUser1 = isNodeEnv ? require('./config').QBUser1 : window.QBUser1;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.