Commit Graph

4607 Commits

Author SHA1 Message Date
JC Brand
c39c5df2db Merge branch 'master' of github.com:jcbrand/converse.js 2018-02-14 01:51:38 +01:00
Weblate
e361081d6f Merge remote-tracking branch 'origin/master' 2018-02-14 00:43:37 +01:00
linkmauve
af6867e638 improve @title on roster item (#1013) 2018-02-14 00:43:33 +01:00
Weblate
4e87fa104f Merge remote-tracking branch 'origin/master' 2018-02-14 00:40:00 +01:00
Senya
2b8f6c4363 Add backbone.overview as a dependency for chatboxes (#1016) 2018-02-14 00:39:56 +01:00
Weblate
1546851096 Merge remote-tracking branch 'origin/master' 2018-02-14 00:39:18 +01:00
Senya
6d3114b5d8 PR template: Changes.md is not in the docs directory (#1018) 2018-02-14 00:39:14 +01:00
Максим Якимчук
fe243408f6 Translated using Weblate (Ukrainian)
Currently translated at 60.3% (172 of 285 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/uk/
2018-02-13 20:39:46 +01:00
Alexandre Thadeu Clemente Bass
e7d17a8a7e Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (285 of 285 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/pt_BR/
2018-02-10 19:39:10 +01:00
JC Brand
4e599600e4 Drop the .js 2018-02-10 19:06:40 +01:00
Translator
8ca7ef6c18 Translated using Weblate (Russian)
Currently translated at 100.0% (285 of 285 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/ru/
2018-02-10 16:39:31 +01:00
Seve
e47bc5eff3 Get files from CDN (#1015) 2018-02-10 16:30:08 +01:00
Alexandre Thadeu Clemente Bass
e395ea865b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (285 of 285 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/pt_BR/
2018-02-09 19:31:55 +01:00
anonymous
4888472b39 Translated using Weblate (Portuguese (Brazil))
Currently translated at 91.2% (260 of 285 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/pt_BR/
2018-02-09 19:24:57 +01:00
Alexandre Thadeu Clemente Bass
d4ac6f0fd2 Translated using Weblate (Portuguese (Brazil))
Currently translated at 90.5% (258 of 285 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/pt_BR/
2018-02-09 19:24:31 +01:00
JC Brand
e8dd75a126 Add dist/converse-muc-embedded.js 2018-02-09 17:22:28 +01:00
JC Brand
2d746d2a1e Make converse-muc-embedded a core plugin.
1. Add a new `view_mode` value: `embedded`.

   This value is used to determine wether the `converse-muc-embedded`
   plugin is active or not.

2. Remove the need for the #converse-embedded-chat element.

   Instead we reuse the #conversejs element and embed inside that.

3. Removed the need to manually blacklist core plugins

   This is now done automatically if `view_mode` is set to `embedded`.
   Perhaps eventually we don't blacklist at all and instead use the
   `enable` plugin method. For some that probably won't work, like
   `converse-chatview`, which we still need to be active.
2018-02-09 16:37:55 +01:00
JC Brand
56aa45b1d3 Set auto_reconnect to true by default. 2018-02-09 16:37:55 +01:00
JC Brand
ba9c3b01ed Set converse on the window and trigger an event after loaded.
Setting it on `window` is necessary to have it available inside a
webcomponent.

Triggering an event is necessary so that we don't call
`converse.initialize` too early.
2018-02-09 16:37:55 +01:00
JC Brand
03371c1815 Add css file with only fonts.
Needed when converse.js is included inside a webcomponent.
The fonts.css file is then copied over to the host DOM.

Necessary due to this bug:
  https://bugs.chromium.org/p/chromium/issues/detail?id=336876
2018-02-09 16:37:55 +01:00
Translator
588d30b317 Translated using Weblate (Russian)
Currently translated at 100.0% (285 of 285 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/ru/
2018-02-09 16:21:19 +01:00
JC Brand
5517e3554c Add a new configuration setting: root 2018-02-09 16:08:39 +01:00
JC Brand
50f03c90e1 Write "chat room" as "chatroom" and "chat box" as chatbox"
We have bedroom, bathroom, classroom and boardroom as one word.
Living room is spelled separately because of the present participle (+ing) in living.

With "chatbox" it's a bit more subjective.
We have chatbot as one word (but litter box as two).
For consistency with chatroom, I'll go with one word.
2018-02-09 12:13:11 +01:00
Weblate
828258fb6d Merge remote-tracking branch 'origin/master' 2018-02-09 11:41:47 +01:00
JC Brand
055a854891 We no longer have a separate mobile build 2018-02-09 11:41:29 +01:00
Weblate
5bbe67fc36 Merge remote-tracking branch 'origin/master' 2018-02-08 17:48:26 +01:00
JC Brand
03b9447f1d Asynchronously render spoiler button only if all clients support it 2018-02-08 17:48:15 +01:00
JC Brand
680f30412a Bugfix. Object values for defaults passed-by-reference 2018-02-08 17:06:36 +01:00
JC Brand
055c4d2104 New config setting allow_public_bookmarks 2018-02-08 15:39:27 +01:00
Weblate
75cf81db2d Merge remote-tracking branch 'origin/master' 2018-02-08 09:51:22 +01:00
JC Brand
4d77d0c0b3 Update changelog 2018-02-08 09:51:16 +01:00
Weblate
28fbf90c8e Merge remote-tracking branch 'origin/master' 2018-02-08 09:49:31 +01:00
JC Brand
ba09996998 Don't allow PEP bookmarks if #publish-options is not advertised 2018-02-08 09:49:05 +01:00
Weblate
9d031d6fce Merge remote-tracking branch 'origin/master' 2018-02-07 22:00:10 +01:00
JC Brand
fbef370b65 Listen for new room bookmarks pushed from the user's PEP service 2018-02-07 21:59:45 +01:00
Emmanuel Gil Peyrot
6269729ab8 Translated using Weblate (French)
Currently translated at 100.0% (285 of 285 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/
2018-02-07 21:36:23 +01:00
JC Brand
5f3761dc7f Only initialize bookmarks and show icon if PEP is supported
which we check by checking if the PEP identity is provided.
https://xmpp.org/extensions/xep-0163.html#support
2018-02-07 21:05:38 +01:00
JC Brand
bbe47b465d Looks like this ain't necessary
Also, the condition was the opposite of what it should have been.
2018-02-07 17:26:09 +01:00
JC Brand
1759cc1672 Advertise support for spoilers 2018-02-07 17:25:49 +01:00
JC Brand
d4ceb6d340 Add the ability to query for a disco identity 2018-02-07 17:24:25 +01:00
JC Brand
2f19fd983f Fix mastodon logo for firefox 2018-02-07 15:51:14 +01:00
JC Brand
3a743dd974 Update docs concerning XEP-0382 2018-02-07 15:32:32 +01:00
JC Brand
4732f315ed Use "hidden message" instead of spoiler 2018-02-07 14:39:45 +01:00
JC Brand
f267ee5ae0 Looks like new messages can have an archive_id 2018-02-07 14:28:35 +01:00
JC Brand
4742e66b69 Fix linting errors and failing tests 2018-02-07 14:21:46 +01:00
JC Brand
e7aed050b4 Move test pages into the tests folder 2018-02-07 13:26:39 +01:00
JC Brand
9c3e9233e4 Test that the spoiler button is hidden when OTR is active 2018-02-07 13:16:34 +01:00
JC Brand
0031938b97 Make the toolbar a little lighter 2018-02-07 13:16:34 +01:00
JC Brand
aab957b0b8 Show only icon for OTR button 2018-02-07 11:16:24 +01:00
JC Brand
86a962bee2 Don't render message form via separate Backbone.View
Appeared to only complicate things...
2018-02-07 11:16:24 +01:00