Skip to content

C
converse.js
Commit 1b139d9d authored by Weblate's avatar Weblate
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 1ed233d0 3310df88
Hide whitespace changes
Inline Side-by-side
Showing with 20137 additions and 18403 deletions
.gitignore
View file @ 1b139d9d
...@@ -49,19 +49,7 @@ develop-eggs ...@@ -49,19 +49,7 @@ develop-eggs
.DS_Store .DS_Store
# Builds # Builds
dist/converse-no-dependencies.min.js dist/*
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
css/*.map css/*.map
css/*.min.css css/*.min.css
.sv? .sv?
......
Makefile
View file @ 1b139d9d
# You can set these variables from the command line. # You can set these variables from the command line.
BABEL ?= node_modules/.bin/babel
BOURBON_TEMPLATES = ./node_modules/bourbon/app/assets/stylesheets/ BOURBON_TEMPLATES = ./node_modules/bourbon/app/assets/stylesheets/
BUILDDIR = ./docs BUILDDIR = ./docs
BUNDLE ?= ./.bundle/bin/bundle 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 GRUNT ?= ./node_modules/.bin/grunt
HTTPSERVE ?= ./node_modules/.bin/http-server HTTPSERVE ?= ./node_modules/.bin/http-server
ESLINT ?= ./node_modules/.bin/eslint
PAPER = PAPER =
CHROMIUM ?= ./node_modules/.bin/run-headless-chromium
RJS ?= ./node_modules/.bin/r.js
PO2JSON ?= ./node_modules/.bin/po2json PO2JSON ?= ./node_modules/.bin/po2json
RJS ?= ./node_modules/.bin/r.js
SASS ?= ./.bundle/bin/sass SASS ?= ./.bundle/bin/sass
CLEANCSS ?= ./node_modules/clean-css-cli/bin/cleancss --skip-rebase
SPHINXBUILD ?= ./bin/sphinx-build SPHINXBUILD ?= ./bin/sphinx-build
SPHINXOPTS = SPHINXOPTS =
...@@ -147,6 +148,10 @@ css/mobile.min.css:: stamp-npm sass/* ...@@ -147,6 +148,10 @@ css/mobile.min.css:: stamp-npm sass/*
watch: stamp-bundler 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 $(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 \ BUILDS = dist/converse.js \
dist/converse.min.js \ dist/converse.min.js \
dist/inverse.js \ dist/inverse.js \
...@@ -201,8 +206,8 @@ build:: dev css ...@@ -201,8 +206,8 @@ build:: dev css
.PHONY: eslint .PHONY: eslint
eslint: stamp-npm eslint: stamp-npm
# $(ESLINT) src/ $(ESLINT) src/
# $(ESLINT) spec/ $(ESLINT) spec/
.PHONY: check .PHONY: check
check: eslint check: eslint
......
css/inverse.css
View file @ 1b139d9d
...@@ -2272,6 +2272,8 @@ body { ...@@ -2272,6 +2272,8 @@ body {
margin-top: 4em; } margin-top: 4em; }
#conversejs #controlbox.fullscreen { #conversejs #controlbox.fullscreen {
width: 100%; } width: 100%; }
#conversejs #controlbox.fullscreen .controlbox-pane {
height: 100%; }
#conversejs #controlbox.fullscreen .box-flyout { #conversejs #controlbox.fullscreen .box-flyout {
width: 100%; } width: 100%; }
#conversejs #controlbox .box-flyout { #conversejs #controlbox .box-flyout {
......
dist/converse-mobile.js
View file @ 1b139d9d
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/converse.js
View file @ 1b139d9d
This source diff could not be displayed because it is too large. You can view the blob instead.
inverse.html
View file @ 1b139d9d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/> <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="css/inverse.css" /> <link type="text/css" rel="stylesheet" media="screen" href="css/inverse.css" />
<![if gte IE 9]> <![if gte IE 9]>
<script src="dist/inverse.min.js"></script> <script src="dist/inverse.js"></script>
<![endif]> <![endif]>
</head> </head>
<body> <body>
...@@ -20,17 +20,11 @@ ...@@ -20,17 +20,11 @@
converse.initialize({ converse.initialize({
authentication: 'login', authentication: 'login',
auto_away: 300, 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'], blacklisted_plugins: ['converse-minimize', 'converse-dragresize', 'converse-otr'],
whitelisted_plugins: ['converse-inverse', 'converse-singleton'], whitelisted_plugins: ['converse-inverse', 'converse-singleton'],
auto_reconnect: true, auto_reconnect: true,
bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
message_archiving: 'always', message_archiving: 'always',
debug: true
}); });
</script> </script>
</body> </body>
......
sass/inverse/_controlbox.scss
View file @ 1b139d9d
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
&.fullscreen { &.fullscreen {
width: 100%; width: 100%;
.controlbox-pane {
height: 100%;
}
.box-flyout { .box-flyout {
width: 100%; width: 100%;
} }
......
src/templates/brand_heading.html
View file @ 1b139d9d
<span> <span>
<h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1> <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> <span>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7