Pin to latest backbone.browserStorage, then make clean && make dist
This commit is contained in:
parent
bf187560ee
commit
fd41994672
1
Makefile
1
Makefile
@ -87,6 +87,7 @@ release:
|
||||
$(SED) -ri s/Version:\ [0-9]\+\.[0-9]\+\.[0-9]\+/Version:\ $(VERSION)/ COPYRIGHT
|
||||
$(SED) -ri s/Project-Id-Version:\ Converse\.js\ [0-9]\+\.[0-9]\+\.[0-9]\+/Project-Id-Version:\ Converse.js\ $(VERSION)/ locale/converse.pot
|
||||
$(SED) -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ package.json
|
||||
$(SED) -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ src/headless/package.json
|
||||
$(SED) -ri s/--package-version=[0-9]\+\.[0-9]\+\.[0-9]\+/--package-version=$(VERSION)/ Makefile
|
||||
$(SED) -ri s/v[0-9]\+\.[0-9]\+\.[0-9]\+\.zip/v$(VERSION)\.zip/ index.html
|
||||
$(SED) -ri s/v[0-9]\+\.[0-9]\+\.[0-9]\+\.tar\.gz/v$(VERSION)\.tar\.gz/ index.html
|
||||
|
1216
css/converse.css
1216
css/converse.css
File diff suppressed because it is too large
Load Diff
1060
css/website.css
1060
css/website.css
File diff suppressed because it is too large
Load Diff
85412
dist/converse-no-dependencies.js
vendored
85412
dist/converse-no-dependencies.js
vendored
File diff suppressed because it is too large
Load Diff
14
dist/converse.js
vendored
14
dist/converse.js
vendored
@ -617,7 +617,7 @@ module.exports = Awesomplete;
|
||||
|
||||
/**
|
||||
* Backbone localStorage and sessionStorage Adapter
|
||||
* Version 0.0.4
|
||||
* Version 0.0.5
|
||||
*
|
||||
* https://github.com/jcbrand/Backbone.browserStorage
|
||||
*/
|
||||
@ -63337,7 +63337,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
|
||||
} else if (current_affiliation === 'outcast') {
|
||||
this.showChatEvent(__("%1$s has been banned from this groupchat", occupant.get('nick')));
|
||||
} else if (current_affiliation === 'admin' || current_affiliation == 'owner') {
|
||||
this.showChatEvent(__(`%1$s is now an ${current_affiliation} of this groupchat`, occupant.get('nick')));
|
||||
this.showChatEvent(__('%1$s is now an %2$s of this groupchat', occupant.get('nick'), current_affiliation));
|
||||
}
|
||||
},
|
||||
|
||||
@ -63550,7 +63550,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
|
||||
});
|
||||
|
||||
if (!_.includes(roles, me.get('role'))) {
|
||||
this.showErrorMessage(__(`Forbidden: you do not have the necessary role in order to do that.`));
|
||||
this.showErrorMessage(__('Forbidden: you do not have the necessary role in order to do that.'));
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -63563,7 +63563,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
|
||||
});
|
||||
|
||||
if (!_.includes(affiliations, me.get('affiliation'))) {
|
||||
this.showErrorMessage(__(`Forbidden: you do not have the necessary affiliation in order to do that.`));
|
||||
this.showErrorMessage(__('Forbidden: you do not have the necessary affiliation in order to do that.'));
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -63719,7 +63719,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
|
||||
|
||||
case 'register':
|
||||
if (args.length > 1) {
|
||||
this.showErrorMessage(__(`Error: invalid number of arguments`));
|
||||
this.showErrorMessage(__('Error: invalid number of arguments'));
|
||||
} else {
|
||||
this.model.registerNickname().then(err_msg => {
|
||||
if (err_msg) this.showErrorMessage(err_msg);
|
||||
@ -76388,9 +76388,9 @@ _converse_core__WEBPACK_IMPORTED_MODULE_6__["default"].plugins.add('converse-muc
|
||||
'xmlns': Strophe.NS.REGISTER
|
||||
})).then(iq => {}).catch(iq => {
|
||||
if (sizzle('item-not-found[xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"]', iq).length) {
|
||||
this.feedback.set('error', __(`Error: the groupchat ${this.model.getDisplayName()} does not exist.`));
|
||||
this.feedback.set('error', __('Error: the groupchat %1$s does not exist.', this.model.getDisplayName()));
|
||||
} else if (sizzle('not-allowed[xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"]').length) {
|
||||
this.feedback.set('error', __(`Sorry, you're not allowed to register in this groupchat`));
|
||||
this.feedback.set('error', __("Sorry, you're not allowed to register in this groupchat"));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
5
package-lock.json
generated
5
package-lock.json
generated
@ -3195,8 +3195,9 @@
|
||||
}
|
||||
},
|
||||
"backbone.browserStorage": {
|
||||
"version": "github:jcbrand/Backbone.browserStorage#03bfa13f68b71f97be361840adc5a5064f57b47e",
|
||||
"from": "github:jcbrand/Backbone.browserStorage#03bfa13f68b71f97be361840adc5a5064f57b47e",
|
||||
"version": "0.0.5",
|
||||
"resolved": "https://registry.npmjs.org/backbone.browserStorage/-/backbone.browserStorage-0.0.5.tgz",
|
||||
"integrity": "sha512-Cf8B90EIWyHMm/ReS5yFmFMOXPVNda6QcTFcdyp1RW/1zM3LZF2Nf4U601/seIaEu/X8cRVEKqTINpPKql3sxA==",
|
||||
"requires": {
|
||||
"backbone": "~1.x.x",
|
||||
"underscore": ">=1.4.0"
|
||||
|
@ -23,7 +23,7 @@
|
||||
"gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2",
|
||||
"dependencies": {
|
||||
"backbone": "1.3.3",
|
||||
"backbone.browserStorage": "jcbrand/Backbone.browserStorage#03bfa13f68b71f97be361840adc5a5064f57b47e",
|
||||
"backbone.browserStorage": "0.0.5",
|
||||
"es6-promise": "^4.1.0",
|
||||
"filesize": "^3.6.1",
|
||||
"lodash": "^4.17.10",
|
||||
|
Loading…
Reference in New Issue
Block a user