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 2017-06-21 22:26:26 +02:00
commit 1b139d9d0e
8 changed files with 7921 additions and 6187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@ -49,19 +49,7 @@ develop-eggs
.DS_Store
# Builds
dist/converse-no-dependencies.min.js
dist/converse-no-locales-no-otr.js
dist/converse-no-locales-no-otr.min.js
dist/converse-no-otr.js
dist/converse-no-otr.min.js
dist/converse.min.js
dist/inverse.min.js
dist/converse-no-jquery.js
dist/converse-no-jquery.min.js
dist/converse-mobile.min.js
dist/converse-muc-embedded.js
dist/converse-muc-embedded.min.js
dist/*
css/*.map
css/*.min.css
.sv?

17
Makefile
View File

@ -1,16 +1,17 @@
# You can set these variables from the command line.
BABEL ?= node_modules/.bin/babel
BOURBON_TEMPLATES = ./node_modules/bourbon/app/assets/stylesheets/
BUILDDIR = ./docs
BUNDLE ?= ./.bundle/bin/bundle
CHROMIUM ?= ./node_modules/.bin/run-headless-chromium
CLEANCSS ?= ./node_modules/clean-css-cli/bin/cleancss --skip-rebase
ESLINT ?= ./node_modules/.bin/eslint
GRUNT ?= ./node_modules/.bin/grunt
HTTPSERVE ?= ./node_modules/.bin/http-server
ESLINT ?= ./node_modules/.bin/eslint
PAPER =
CHROMIUM ?= ./node_modules/.bin/run-headless-chromium
RJS ?= ./node_modules/.bin/r.js
PO2JSON ?= ./node_modules/.bin/po2json
RJS ?= ./node_modules/.bin/r.js
SASS ?= ./.bundle/bin/sass
CLEANCSS ?= ./node_modules/clean-css-cli/bin/cleancss --skip-rebase
SPHINXBUILD ?= ./bin/sphinx-build
SPHINXOPTS =
@ -147,6 +148,10 @@ css/mobile.min.css:: stamp-npm sass/*
watch: stamp-bundler
$(SASS) --watch -I ./node_modules/bourbon/app/assets/stylesheets/ sass/converse.scss:css/converse.css sass/_muc_embedded.scss:css/converse-muc-embedded.css
.PHONY: watchjs
watchjs: stamp-npm
$(BABEL) --source-maps --watch=./src --out-dir=./build
BUILDS = dist/converse.js \
dist/converse.min.js \
dist/inverse.js \
@ -201,8 +206,8 @@ build:: dev css
.PHONY: eslint
eslint: stamp-npm
# $(ESLINT) src/
# $(ESLINT) spec/
$(ESLINT) src/
$(ESLINT) spec/
.PHONY: check
check: eslint

2
css/inverse.css
View File

@ -2272,6 +2272,8 @@ body {
margin-top: 4em; }
#conversejs #controlbox.fullscreen {
width: 100%; }
#conversejs #controlbox.fullscreen .controlbox-pane {
height: 100%; }
#conversejs #controlbox.fullscreen .box-flyout {
width: 100%; }
#conversejs #controlbox .box-flyout {

11887
dist/converse-mobile.js vendored
View File

File diff suppressed because it is too large Load Diff

2175
dist/converse.js vendored
View File

File diff suppressed because it is too large Load Diff

8
inverse.html
View File

@ -7,7 +7,7 @@
<link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="css/inverse.css" />
<![if gte IE 9]>
<script src="dist/inverse.min.js"></script>
<script src="dist/inverse.js"></script>
<![endif]>
</head>
<body>
@ -20,17 +20,11 @@
converse.initialize({
authentication: 'login',
auto_away: 300,
i18n: 'en',
auto_join_rooms: ['eee@conference.opkode.com'],
notify_all_room_messages: [
'discuss@conference.conversejs.org'
],
blacklisted_plugins: ['converse-minimize', 'converse-dragresize', 'converse-otr'],
whitelisted_plugins: ['converse-inverse', 'converse-singleton'],
auto_reconnect: true,
bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
message_archiving: 'always',
debug: true
});
</script>
</body>

3
sass/inverse/_controlbox.scss
View File

@ -18,6 +18,9 @@
&.fullscreen {
width: 100%;
.controlbox-pane {
height: 100%;
}
.box-flyout {
width: 100%;
}

2
src/templates/brand_heading.html
View File

@ -1,4 +1,4 @@
<span>
<h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>
<p><a href="https://github.com/jcbrand/converse.js">Open Source</a> XMPP chat client</p>
<p><a href="https://conversejs.org">Open Source</a> XMPP chat client</p>
<span>