Commit Graph

5394 Commits

Author SHA1 Message Date
JC Brand
181b1836b0 Update and further style toolbars 2018-03-06 15:26:05 +01:00
JC Brand
af5a9fbfc4 Merge branch 'master' into bootstrap4 2018-03-06 12:01:02 +01:00
Weblate
1c0bc95895 Merge remote-tracking branch 'origin/master' 2018-03-06 11:41:12 +01:00
JC Brand
d36a7b51a3 Update .travis.yml 2018-03-06 11:41:05 +01:00
JC Brand
439e2a25ca Merge branch 'master' into bootstrap4 2018-03-06 11:40:10 +01:00
Weblate
3cf8356d98 Merge remote-tracking branch 'origin/master' 2018-03-06 11:32:27 +01:00
JC Brand
25b345f677 Update moment 2018-03-06 11:32:18 +01:00
JC Brand
37a182d4c0 Clean up and condense Makefile 2018-03-06 11:26:47 +01:00
Тони
925907e931 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (290 of 290 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/bg/
2018-03-06 03:53:19 +01:00
JC Brand
95645413c4 Darken modal overlay 2018-03-05 18:43:43 +01:00
JC Brand
2f2e687a18 Use flex column for occupant sidebar 2018-03-05 18:38:00 +01:00
JC Brand
6bdf204be4 Show occupants sidebar again 2018-03-05 16:58:31 +01:00
JC Brand
076265f108 Listen for click in the bookmarks view 2018-03-05 16:51:51 +01:00
JC Brand
d4d3d4c838 Merge branch 'split-muc' into bootstrap4 2018-03-05 16:51:33 +01:00
JC Brand
0013ee5506 Split MUC views into separate file/plugin 2018-03-05 16:32:13 +01:00
Weblate
a8ec78a532 Merge remote-tracking branch 'origin/master' 2018-03-05 15:12:42 +01:00
JC Brand
de66a7ddfa Cleanup post release 2018-03-05 15:12:29 +01:00
Weblate
fee500b359 Merge remote-tracking branch 'origin/master' 2018-03-05 14:53:11 +01:00
JC Brand
8211ed8f70 Release 3.3.4 2018-03-05 14:43:53 +01:00
Weblate
2657261484 Merge remote-tracking branch 'origin/master' 2018-03-05 14:30:45 +01:00
JC Brand
1a2c1441a1 Updates #1021 Fix TypeError: Cannot read property 'firstChild' of null 2018-03-05 14:29:49 +01:00
Weblate
4828744cf3 Merge remote-tracking branch 'origin/master' 2018-03-05 14:20:41 +01:00
JC Brand
983c94a619 converse-fullscreen not relevant to mobile view mode 2018-03-05 14:20:32 +01:00
Weblate
073c698752 Merge remote-tracking branch 'origin/master' 2018-03-04 07:29:46 +01:00
JC Brand
dcc6244fc2 Don't overwrite default avatar with undefined 2018-03-04 07:29:24 +01:00
Weblate
b7f6817005 Merge remote-tracking branch 'origin/master' 2018-03-04 06:44:49 +01:00
Тони
c12184d816 Translated using Weblate (Bulgarian)
Currently translated at 82.7% (240 of 290 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/bg/
2018-03-04 06:44:47 +01:00
JC Brand
759603eea5 Hook in bg and tr locales 2018-03-04 06:11:18 +01:00
Weblate
ee95634051 Merge remote-tracking branch 'origin/master' 2018-03-03 11:46:18 +01:00
Тони
130d4aeaa4 Translated using Weblate (Bulgarian)
Currently translated at 80.0% (232 of 290 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/bg/
2018-03-03 11:46:17 +01:00
JC Brand
3c182b5a26 Server field in Rooms tab showed MUC supporting clients 2018-03-03 11:45:57 +01:00
Weblate
fb165a992c Merge remote-tracking branch 'origin/master' 2018-03-02 19:35:32 +01:00
JC Brand
c4c154cfa1 Fixes #1022 Include stored status message in presences. 2018-03-02 19:35:06 +01:00
Weblate
afe8f1d983 Merge remote-tracking branch 'origin/master' 2018-03-02 16:30:39 +01:00
JC Brand
38dfc7b65b Hook in turkish as locale, update changelog. 2018-03-02 16:30:00 +01:00
Weblate
9d7c88654d Merge remote-tracking branch 'origin/master' 2018-03-02 16:22:40 +01:00
Weblate push user
ef72752254 Update from Weblate. (#1030) 2018-03-02 16:22:36 +01:00
Weblate
b2aad6b273 Merge remote-tracking branch 'origin/master' 2018-03-02 15:56:30 +01:00
JC Brand
1a518f3df3
Merge pull request #1029 from ChaosKid42/send_emojis_as_unicode_muc
send emojis as unicode also in MUCs
2018-03-02 15:56:24 +01:00
JC Brand
ca0bd1c50e
Merge branch 'master' into send_emojis_as_unicode_muc 2018-03-02 15:55:59 +01:00
Weblate
5591351f30 Merge remote-tracking branch 'origin/master' 2018-03-02 15:55:00 +01:00
Тони
a1a34d937a Translated using Weblate (Bulgarian)
Currently translated at 50.0% (145 of 290 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/bg/
2018-03-02 15:54:59 +01:00
JC Brand
0a28e7aae4 Fixes #1027 Backwards compatibility fix for IE11 2018-03-02 15:54:28 +01:00
Christoph Scholz
2195e8de7e send emojis as unicode also in MUCs 2018-03-02 15:45:36 +01:00
Weblate
c8c74b172e Merge remote-tracking branch 'origin/master' 2018-03-02 12:36:35 +01:00
JC Brand
34ac7e99ab Fixes #1024
Use sizzle, otherwise we sometimes get null returned.
2018-03-02 12:36:08 +01:00
Weblate
7c42f9daf8 Merge remote-tracking branch 'origin/master' 2018-03-02 12:12:19 +01:00
Тони
e049cbb155 Translated using Weblate (Bulgarian)
Currently translated at 40.3% (117 of 290 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/bg/
2018-03-02 12:12:18 +01:00
JC Brand
860befcab9 Fixes #1025
Rename icon to avoid confusion. Add back the OTR status text.
2018-03-02 12:11:47 +01:00
JC Brand
e630339a69 Update spec to test sent out stanza as well 2018-03-02 11:59:25 +01:00