Skip to content

Commit 8a8aef3

Browse files
author
Igor Khomenko
committed
set license to BSD
1 parent c3f8491 commit 8a8aef3

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

LICENSE

100644100755
Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
The MIT License (MIT)
1+
Copyright (c) 2015, Igor Khomenko
2+
All rights reserved.
23

3-
Copyright (c) 2013 QuickBlox
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
46

5-
Permission is hereby granted, free of charge, to any person obtaining a copy of
6-
this software and associated documentation files (the "Software"), to deal in
7-
the Software without restriction, including without limitation the rights to
8-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9-
the Software, and to permit persons to whom the Software is furnished to do so,
10-
subject to the following conditions:
7+
* Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
119

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
10+
* Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
14+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
15+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
18+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
20+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
21+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
22+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1424

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
17-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.17.0",
55
"homepage": "http://quickblox.com/developers/Javascript",
66
"main": "quickblox.js",
7-
"license": "MIT",
7+
"license": "BSD",
88
"keywords": [
99
"quickblox",
1010
"javascript",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"main": "js/qbMain.js",
77
"license": [
88
{
9-
"type": "MIT",
9+
"type": "BSD",
1010
"url": "https://github.com/QuickBlox/quickblox-javascript-sdk/blob/master/LICENSE"
1111
}
1212
],

spec/QB-ChatSpec.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ describe('Chat API', function() {
197197
if(error){
198198
done.fail("Create or update list error: " + JSON.stringify(error));
199199
}else{
200-
expect(error).toBe(null);
201-
202200
console.info("can create new list with items");
203201
done();
204202
}
@@ -218,8 +216,6 @@ describe('Chat API', function() {
218216
if(error){
219217
done.fail("Update list error: " + JSON.stringify(error));
220218
}else{
221-
expect(error).toBe(null);
222-
223219
console.info("can update list by name");
224220
done();
225221
}

0 commit comments

Comments
 (0)