Commit Graph

3900 Commits

Author SHA1 Message Date
lduburas
eef483cb4d Fix regarding ChatRoomView.getDefaultNickName() and muc_nickname_from_jid (#911)
* ChatRoomView.getDefaultNickName() when muc_nickname_from_jid  is used

Allows to overridde nickname by plugins when muc_nickname_from_jid is used.

* CHANGES.md updated
2017-08-28 09:27:59 +02:00
Weblate
b69f23512c Merge remote-tracking branch 'origin/master' 2017-08-23 12:02:24 +02:00
JC Brand
979d486935 Regenerate pot, po and json files.
Refs #909
2017-08-23 12:00:49 +02:00
JC Brand
32d574039d Translateable strings must not be template literals
xgettext doesn't support them yet, which causes errors in the pot/po files.

https://savannah.gnu.org/bugs/?50920

updates #909
2017-08-23 12:00:49 +02:00
JC Brand
6ba923223a No apparent need to use python as gettext langauage fallback 2017-08-23 11:56:40 +02:00
JC Brand
6c6b85347a Move functions out to make containing function smaller 2017-08-23 11:54:19 +02:00
Weblate
41c141e8fe Merge remote-tracking branch 'origin/master' 2017-08-23 11:05:15 +02:00
Weblate push user
b31cdd7754 Update from Weblate. (#910)
* Translated using Weblate (German and French)

Currently translated at 98.4% (260 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (French)

Currently translated at 99.6% (263 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/
2017-08-23 11:05:11 +02:00
Jean-Baptiste
fa5da1ee8c Translated using Weblate (French)
Currently translated at 99.6% (263 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/
2017-08-23 11:02:52 +02:00
Weblate
4e331df4cb Merge remote-tracking branch 'origin/master' 2017-08-21 15:45:56 +02:00
JC Brand
ab0ec7301f Various fixes for browser that don't support ES2015
Specifically for IE11.

* Add a polyfill for String.prototype.includes
* Make sure all bundled code is transpiled
* Add IE specific fix in converse-otr.js
2017-08-21 15:43:36 +02:00
Weblate
4439fd06e1 Merge remote-tracking branch 'origin/master' 2017-08-21 12:53:22 +02:00
JC Brand
75301d2875 Bugfix. info called on object that doesn't implement interface Console 2017-08-21 12:52:18 +02:00
Weblate
b386179242 Merge remote-tracking branch 'origin/master' 2017-08-21 11:29:18 +02:00
JC Brand
016bca74b8 console.warn is not supported on FF < 52 2017-08-21 11:29:06 +02:00
Weblate
2e85bb361d Merge remote-tracking branch 'origin/master' 2017-08-16 16:32:33 +02:00
JC Brand
d70746d6ef Fix linting error 2017-08-16 16:32:25 +02:00
Weblate
ebc2995643 Merge remote-tracking branch 'origin/master' 2017-08-16 16:01:40 +02:00
JC Brand
9e8c034b42 Handle cases where Jed and/or Strophe.disco aren't available 2017-08-16 16:01:31 +02:00
Weblate
1d03e38657 Merge remote-tracking branch 'origin/master' 2017-08-16 15:19:54 +02:00
JC Brand
56c5a9c8d0 Move form utilities to form-utils.js 2017-08-16 15:19:41 +02:00
Weblate
6b09416ba6 Merge remote-tracking branch 'origin/master' 2017-08-16 15:03:58 +02:00
JC Brand
3b8c2d1b00 Various bug and timing fixes due to the previous refactoring 2017-08-16 14:16:24 +02:00
JC Brand
694eabfc0e Use promises to determine when to create the controlbox 2017-08-16 13:22:18 +02:00
JC Brand
956340aa8c Make initialized a promise and use it in the controlbox 2017-08-16 12:32:15 +02:00
JC Brand
bc6b5ca930 controlbox: Set connected immediately 2017-08-16 12:32:15 +02:00
JC Brand
273da9e876 Move chatboxes collection and overview into separate plugin 2017-08-16 12:32:15 +02:00
Weblate
d00412e120 Merge remote-tracking branch 'origin/master' 2017-08-16 10:10:50 +02:00
JC Brand
ad695c253d Trying to fix timing bug in tests (for Travis) 2017-08-16 10:10:38 +02:00
Weblate
9eaf970e8e Merge remote-tracking branch 'origin/master' 2017-08-16 09:53:47 +02:00
JC Brand
4938621048 Nicer CSS and markup for room configuration forms. 2017-08-16 09:39:13 +02:00
JC Brand
add3b8efb3 utils now no longer depends on jquery. 2017-08-16 09:05:15 +02:00
Weblate
7fcc698e4a Merge remote-tracking branch 'origin/master' 2017-08-15 21:52:19 +02:00
JC Brand
6c3aa34c23 Some work on removing jquery from converse-bookmarks 2017-08-15 21:47:06 +02:00
JC Brand
1c80fa41c8 Improved CSS for the registration form. 2017-08-15 21:46:47 +02:00
Weblate
2b64f7352f Merge remote-tracking branch 'origin/master' 2017-08-15 16:47:10 +02:00
JC Brand
3afe5eb8f3 Run the lodash converter only once. 2017-08-15 16:46:55 +02:00
Weblate
aec471f8fb Merge remote-tracking branch 'origin/master' 2017-08-15 16:37:11 +02:00
JC Brand
e4d95eb794 Don't load lodash.fp in converse-core. It's not being used there. 2017-08-15 16:36:43 +02:00
Weblate
0c70ca83ff Merge remote-tracking branch 'origin/master' 2017-08-15 10:25:11 +02:00
JC Brand
bfeb297ffc Clarify usage of locked_domain.
Also, declare it in the controlbox plugin, not in core, where it's not used.
2017-08-15 10:23:57 +02:00
flobee
ee2ab56f10 Translated using Weblate (German)
Currently translated at 98.4% (260 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/
2017-08-13 21:45:24 +02:00
JC Brand
f07f6e7bb7 Fix output files. 2017-08-09 18:43:05 +02:00
JC Brand
779ce605af Merge branch 'master' of github.com:jcbrand/converse.js 2017-08-09 18:24:57 +02:00
JC Brand
d6784201eb Bugfix. Uglify can't handle emojis 2017-08-09 18:24:20 +02:00
JC Brand
a717481b2c Merge branch 'master' of github.com:jcbrand/converse.js 2017-08-09 18:13:24 +02:00
JC Brand
8f88f35e0b New release 3.2.0 2017-08-09 18:00:09 +02:00
JC Brand
4d2c807cf2 Fixes #220. Enable usage of both _ and fp in non-AMD case 2017-08-09 17:35:48 +02:00
JC Brand
93e67567ce Make sure transpiling is done before building individual files 2017-08-09 17:33:41 +02:00
JC Brand
c5c35487fc Fixes #898 2017-08-09 16:25:45 +02:00