Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2018-02-06 18:02:13 +01:00
commit 8b9338edb9
5 changed files with 547 additions and 648 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -1,7 +1,6 @@
# converse.js # converse.js
[![Greenkeeper badge](https://badges.greenkeeper.io/jcbrand/converse.js.svg)](https://greenkeeper.io/) [![inVerse](https://inverse.chat/badge.svg?room=discuss@conference.conversejs.org)](https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org)
[![Travis](https://api.travis-ci.org/jcbrand/converse.js.png?branch=master)](https://travis-ci.org/jcbrand/converse.js) [![Travis](https://api.travis-ci.org/jcbrand/converse.js.png?branch=master)](https://travis-ci.org/jcbrand/converse.js)
[![Bountysource bounties](https://img.shields.io/bountysource/team/converse.js/activity.svg?maxAge=2592000)](https://www.bountysource.com/teams/converse.js/issues?tracker_ids=194169) [![Bountysource bounties](https://img.shields.io/bountysource/team/converse.js/activity.svg?maxAge=2592000)](https://www.bountysource.com/teams/converse.js/issues?tracker_ids=194169)
[![Translation status](https://hosted.weblate.org/widgets/conversejs/-/svg-badge.svg)](https://hosted.weblate.org/engage/conversejs/?utm_source=widget) [![Translation status](https://hosted.weblate.org/widgets/conversejs/-/svg-badge.svg)](https://hosted.weblate.org/engage/conversejs/?utm_source=widget)

1184
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -56,14 +56,14 @@
"lodash": "4.17.4", "lodash": "4.17.4",
"lodash-template-loader": "^2.0.0", "lodash-template-loader": "^2.0.0",
"moment": "~2.18.1", "moment": "~2.18.1",
"otr": "0.2.16", "otr": "jcbrand/otr",
"pluggable.js": "2.0.0", "pluggable.js": "2.0.0",
"po2json": "^0.4.4", "po2json": "^0.4.4",
"requirejs": "2.3.5", "requirejs": "2.3.5",
"run-headless-chromium": "^0.1.1", "run-headless-chromium": "^0.1.1",
"sinon": "^2.1.0", "sinon": "^2.1.0",
"sizzle": "^2.3.3", "sizzle": "^2.3.3",
"snabbdom": "jcbrand/snabbdom", "snabbdom": "0.7.1",
"snyk": "^1.21.2", "snyk": "^1.21.2",
"strophe.js": "1.2.14", "strophe.js": "1.2.14",
"strophejs-plugin-disco": "0.0.1", "strophejs-plugin-disco": "0.0.1",

2
sass/_chatbox.scss
View File

@ -150,6 +150,8 @@
} }
} }
.chat-image { .chat-image {
height: auto;
width: auto;
max-height: 24em; max-height: 24em;
max-width: 100%; max-width: 100%;
} }

2
src/converse-core.js
View File

@ -302,7 +302,7 @@
include_offline_state: false, include_offline_state: false,
jid: undefined, jid: undefined,
keepalive: true, keepalive: true,
locales_url: '/locale/{{{locale}}}/LC_MESSAGES/converse.json', locales_url: 'locale/{{{locale}}}/LC_MESSAGES/converse.json',
locales: [ locales: [
'af', 'ca', 'de', 'es', 'en', 'fr', 'he', 'af', 'ca', 'de', 'es', 'en', 'fr', 'he',
'hu', 'id', 'it', 'ja', 'nb', 'nl', 'hu', 'id', 'it', 'ja', 'nb', 'nl',