Skip to content

Commit

Permalink
Merge pull request #136 from pubnub/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ManuelFernando committed Aug 6, 2018
2 parents 9a58a46 + db31e92 commit bb44dde
Show file tree
Hide file tree
Showing 16 changed files with 1,387 additions and 1,033 deletions.
17 changes: 16 additions & 1 deletion .pubnub.yml
@@ -1,11 +1,26 @@
name: javascript
version: 4.21.2
version: 4.21.5
schema: 1
scm: github.com/pubnub/javascript
files:
- dist/web/pubnub.js
- dist/web/pubnub.min.js
changelog:
- version: v4.21.5
date: 2018-08-06
changes:
- type: improvement
text: update dependencies
- version: v4.21.4
date: 2018-08-04
changes:
- type: improvement
text: return error parameter into errorData when logVerbosity = true
- version: v4.21.3
date: 2018-07-10
changes:
- type: improvement
text: update dependencies
- version: v4.21.2
date: 2018-06-12
changes:
Expand Down
42 changes: 39 additions & 3 deletions CHANGELOG.md
@@ -1,8 +1,44 @@
## [v4.21.5](https://github.com/pubnub/javascript/tree/v4.21.5)
August-06-2018


[Full Changelog](https://github.com/pubnub/javascript/compare/v4.21.4...v4.21.5)



- ⭐update dependencies



## [v4.21.4](https://github.com/pubnub/javascript/tree/v4.21.4)
August-04-2018


[Full Changelog](https://github.com/pubnub/javascript/compare/v4.21.3...v4.21.4)



- ⭐return error parameter into errorData when logVerbosity = true



## [v4.21.3](https://github.com/pubnub/javascript/tree/v4.21.3)
July-10-2018


[Full Changelog](https://github.com/pubnub/javascript/compare/v4.21.2...v4.21.3)



- ⭐update dependencies



## [v4.21.2](https://github.com/pubnub/javascript/tree/v4.21.2)
June-12-2018


[Full Chan6gelog](https://github.com/pubnub/javascript/compare/v4.21.1...v4.21.2)
[Full Changelog](https://github.com/pubnub/javascript/compare/v4.21.1...v4.21.2)



Expand All @@ -14,7 +50,7 @@
June-08-2018


[Full Chan6gelog](https://github.com/pubnub/javascript/compare/v4.21.0...v4.21.1)
[Full Changelog](https://github.com/pubnub/javascript/compare/v4.21.0...v4.21.1)



Expand All @@ -26,7 +62,7 @@
June-06-2018


[Full Chan6gelog](https://github.com/pubnub/javascript/compare/v4.20.3...v4.21.0)
[Full Changelog](https://github.com/pubnub/javascript/compare/v4.20.3...v4.21.0)



Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -20,5 +20,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)

## CDN Links

* https://cdn.pubnub.com/sdk/javascript/pubnub.4.21.2.min.js
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.21.2.js
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.21.5.min.js
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.21.5.js
4 changes: 2 additions & 2 deletions dist/titanium/pubnub.js
@@ -1,4 +1,4 @@
/*! 4.21.2 / Consumer */
/*! 4.21.5 / Consumer */
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
Expand Down Expand Up @@ -586,7 +586,7 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: 'getVersion',
value: function getVersion() {
return '4.21.2';
return '4.21.5';
}
}, {
key: '_decideUUID',
Expand Down
2 changes: 1 addition & 1 deletion dist/titanium/pubnub.min.js

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions dist/web/pubnub.js
@@ -1,4 +1,4 @@
/*! 4.21.2 / Consumer */
/*! 4.21.5 / Consumer */
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
Expand Down Expand Up @@ -608,7 +608,7 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: 'getVersion',
value: function getVersion() {
return '4.21.2';
return '4.21.5';
}
}, {
key: '_decideUUID',
Expand Down Expand Up @@ -4721,7 +4721,15 @@ return /******/ (function(modules) { // webpackBootstrap
}

if (err) {
status.errorData = err;
if (err.response && err.response.text && !_this._config.logVerbosity) {
try {
status.errorData = JSON.parse(err.response.text);
} catch (e) {
status.errorData = err;
}
} else {
status.errorData = err;
}
status.category = _this._detectErrorCategory(err);
return callback(status, null);
}
Expand Down
4 changes: 2 additions & 2 deletions dist/web/pubnub.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/core/components/config.js

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

2 changes: 1 addition & 1 deletion lib/core/components/config.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/networking/index.js.map

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

10 changes: 9 additions & 1 deletion lib/networking/modules/web-node.js

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

0 comments on commit bb44dde

Please sign in to comment.