Commit Graph

4023 Commits

Author SHA1 Message Date
Weblate
7831be8f5e Merge remote-tracking branch 'origin/master' 2018-01-04 17:12:17 +01:00
JC Brand
f7cf1fb70d Fix broken tests 2018-01-04 16:12:09 +00:00
Weblate
29386dd289 Merge remote-tracking branch 'origin/master' 2018-01-04 14:22:01 +01:00
JC Brand
16b8946dd9 Updates #978: Use moment and generate date in correct format 2018-01-04 13:11:51 +00:00
JC Brand
ee751ec58e Update jquery and sizzle and fix/improve some tests
Fixes #825
2018-01-04 13:11:50 +00:00
Weblate
8179543674 Merge remote-tracking branch 'origin/master' 2018-01-04 13:11:13 +01:00
JC Brand
cdfd1e2d42 Add units (webkit fix) 2018-01-04 12:11:03 +00:00
JC Brand
199e2e7e27 The refreshWebkit hack appears to no longer be necessary 2018-01-04 12:11:03 +00:00
JC Brand
4652385bb4 Remove jQuery from non-tests config 2018-01-04 12:11:03 +00:00
Weblate
78b9bf2138 Merge remote-tracking branch 'origin/master' 2018-01-04 12:31:13 +01:00
JC Brand
7cf9c9ef8f Fix linting error 2018-01-04 11:31:04 +00:00
Weblate
3f39418a67 Merge remote-tracking branch 'origin/master' 2018-01-03 21:41:31 +01:00
JC Brand
671691353a Use Backbone.NativeView instead of Backbone.View 2018-01-03 20:41:03 +00:00
Weblate
566a388197 Merge remote-tracking branch 'origin/master' 2018-01-03 17:53:17 +01:00
JC Brand
ccb97eb7fd Remove jquery from converse-controlbox 2018-01-03 16:49:08 +00:00
Weblate
7985b92d87 Merge remote-tracking branch 'origin/master' 2018-01-03 17:10:17 +01:00
JC Brand
29b5c3e3c3 Remove jquery from converse-dragresize 2018-01-03 16:08:45 +00:00
JC Brand
f1820e5fcd Set dependencies for chatview and muc 2018-01-03 16:08:30 +00:00
Weblate
95ac01b860 Merge remote-tracking branch 'origin/master' 2018-01-03 16:50:39 +01:00
JC Brand
8bdaa410db Also take delayed messages into account when checking if new 2018-01-03 15:50:02 +00:00
JC Brand
3a6f7ed109 Remove jquery from converse-minimize 2018-01-03 14:20:10 +00:00
Weblate
3a0dac3ada Merge remote-tracking branch 'origin/master' 2018-01-03 14:37:36 +01:00
JC Brand
da3670d9f0 MUC Join/Leave messages now also show a new day indicator 2018-01-03 13:37:25 +00:00
JC Brand
46e54667c3 Simplify insertDayIndicator method 2018-01-03 13:37:25 +00:00
JC Brand
cc29d16929 Simplify message insertion into the chat area 2018-01-03 13:37:25 +00:00
Weblate
d0e116a05c Merge remote-tracking branch 'origin/master' 2018-01-03 12:44:14 +01:00
Mako N
314bd1ad7c Updated Japanese translation (#980) 2018-01-03 11:44:10 +00:00
Weblate
ae502a53c2 Merge remote-tracking branch 'origin/master' 2018-01-02 22:53:07 +01:00
JC Brand
e360d9eead Removed jquery from converse-chatview 2018-01-02 21:52:55 +00:00
Weblate
98923bd2d1 Merge remote-tracking branch 'origin/master' 2018-01-02 21:25:48 +01:00
JC Brand
ee15e9e331 Fix and test message ordering 2018-01-02 20:25:30 +00:00
Weblate
b90a516d8e Merge remote-tracking branch 'origin/master' 2018-01-02 15:03:17 +01:00
Cindy Dallaire
9a452aff5d Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/
2018-01-02 15:03:17 +01:00
gensitu
ad7be52ac7 Translated using Weblate (Chinese (Simplified))
Currently translated at 29.9% (85 of 284 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/zh_Hans/
2018-01-02 15:03:15 +01:00
JC Brand
393d2fbacb Add logo and sponsor-link for diasporing.ch 2018-01-02 14:02:31 +00:00
gensitu
a809baa955 Added translation using Weblate (Chinese (Simplified)) 2017-12-28 02:46:35 +01:00
Weblate
5a272fa358 Merge remote-tracking branch 'origin/master' 2017-12-25 13:00:07 +01:00
JC Brand
21a46a15ae Bugfix. markScrolled wasn't debounced for MUC. 2017-12-25 11:59:54 +00:00
JC Brand
308cbf5fb7 Call canPlayType as documented on MDN 2017-12-25 11:59:54 +00:00
Weblate
c553150645 Merge remote-tracking branch 'origin/master' 2017-12-25 11:46:27 +01:00
linkmauve
1d14bdb005 Simplify the SVG logo (#974)
The changes are:
- Removal of useless metadata.
- Simplification of shapes.
- Simplification of coordinates.
- Addition of a white background, to make the logo look correct on dark
  backgrounds.
2017-12-25 10:46:24 +00:00
Weblate
3bd166436e Merge remote-tracking branch 'origin/master' 2017-12-25 11:45:27 +01:00
Weblate push user
713522953e Update from Weblate. (#973)
* Translated using Weblate (French)

Currently translated at 100.0% (284 of 284 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (284 of 284 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (284 of 284 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/
2017-12-25 10:45:23 +00:00
Weblate
4140e5446b Merge remote-tracking branch 'origin/master' 2017-12-25 10:46:37 +01:00
JC Brand
91526c3a46 Bugfix. Query all messages 2017-12-25 09:46:13 +00:00
Weblate
5a3bb1e3f1 Merge remote-tracking branch 'origin/master' 2017-12-24 18:43:55 +01:00
JC Brand
d327da68ea Also check out vdomview via https 2017-12-24 17:43:48 +00:00
Weblate
3563db17e9 Merge remote-tracking branch 'origin/master' 2017-12-24 18:35:47 +01:00
JC Brand
f0c97ee3aa Use https instead of ssh 2017-12-24 17:35:35 +00:00
Weblate
3973018238 Merge remote-tracking branch 'origin/master' 2017-12-24 18:15:21 +01:00