Commit Graph

5243 Commits

Author SHA1 Message Date
JC Brand
fad6b5368d Fix incorrect merge (from master into converse-omemo branch) 2018-07-01 12:04:45 +02:00
JC Brand
4127d1126b fixup 2018-07-01 12:03:55 +02:00
JC Brand
118a84f111 Bugfix. Make sure outgoing messages all have unique ids 2018-07-01 12:01:07 +02:00
JC Brand
e2b5f1d15e Don't reuse the forwarded stanza's id 2018-07-01 11:46:16 +02:00
JC Brand
648c0387dd Refactor message sending
so that we don't have to always wait for stanza creation.
We only need to wait when OMEMO is active, so we keep the waiting
contained to that usecase.
2018-07-01 11:45:58 +02:00
JC Brand
6785eff4a7 Merge branch 'master' into converse-omemo 2018-07-01 11:44:04 +02:00
JC Brand
e5c030c15a Render max 2 newlines 2018-06-30 16:15:27 +02:00
JC Brand
4361d0d66a Fix failing tests due to time tag 2018-06-30 15:25:25 +02:00
JC Brand
40272351a7 Merge branch 'Zash-timetag' 2018-06-30 15:13:08 +02:00
JC Brand
6e99af698d Merge branch 'timetag' of https://github.com/Zash/converse.js into Zash-timetag 2018-06-30 15:12:57 +02:00
JC Brand
b5a27b34a1 Render newlines 2018-06-30 15:07:30 +02:00
JC Brand
cc98cea009 Fix failing tests by waiting appropriately 2018-06-30 14:01:47 +02:00
JC Brand
9a60b5bb15 Let api.disco.info use api.sendIQ (and therefore be promise based) 2018-06-30 14:01:47 +02:00
Lejo
172f6302e7 Translated using Weblate (German)
Currently translated at 84.3% (264 of 313 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/
2018-06-24 11:38:52 +02:00
Joachim Vandersmissen
878b106c7b Allow for shift-enter to insert newlines (#1115)
* Allow for shift-enter to insert newlines

See issue #1081

* Update CHANGES.md
2018-06-19 06:41:22 +02:00
Lyn
7ea0225da2 Translated using Weblate (German)
Currently translated at 83.3% (261 of 313 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/
2018-06-18 15:39:27 +02:00
James Bond
4894ce5242 Translated using Weblate (German)
Currently translated at 83.3% (261 of 313 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/
2018-06-18 15:39:26 +02:00
JC Brand
81ed773baa Updated css and fix some niggles in the Makefile 2018-06-14 10:22:16 +02:00
JC Brand
3dac4ae45c Add support for logging in with OAuth 2018-06-13 18:39:51 +02:00
JC Brand
a2dec2371d Bugfix. jid of null was set on own VCard
Also made a few other minor improvements and did some cleanup.
2018-06-12 12:14:49 +02:00
Maxime Buquet
2ff9a3c6fd Fix build targets in Makefile (#1112)
The 'dist/converse-no-dependencies-es5.js' rule is called
'dist/converse-no-dependencies-es2015.js'.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
2018-06-11 22:50:06 +02:00
JC Brand
7b19483271 Rename push_services to push_app_servers to avoid confusion 2018-06-11 14:17:34 +02:00
aitzol berasategi
06410b6e2f Translated using Weblate (Basque)
Currently translated at 100.0% (313 of 313 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/eu/
2018-06-10 11:34:55 +02:00
aitzol berasategi
9d928ec119 Translated using Weblate (Basque)
Currently translated at 100.0% (313 of 313 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/eu/
2018-06-09 10:43:39 +02:00
JC Brand
907775d784 No further need for a separate babel file and transpile step 2018-06-07 19:06:35 +02:00
JC Brand
a09333f82c Allow multiple push services to be enabled and also allow disabling 2018-06-07 16:25:59 +02:00
JC Brand
5954cd8f29 Avoid duplicating entities 2018-06-07 15:27:11 +02:00
JC Brand
6126781d83 Proper checking of disco support for push notifications 2018-06-07 15:00:36 +02:00
JC Brand
6cd9d2e813 Rename _tearDown to tearDown and rebuild 2018-06-07 14:30:10 +02:00
JC Brand
2cdd46f6dc Don't close chatboxes after disconnection has already happened
Otherwise it attemtps to send out stanzas (causing `this.socket is null`
errors when using websocket).
2018-06-07 14:29:47 +02:00
JC Brand
5d62023701 Only fetch VCards once we're already connected 2018-06-07 14:28:20 +02:00
JC Brand
d4d03925b8 Set hidden to true by default for chats in singleton mode.
However, when a new chat is created due to an incoming message, and
there aren't any other chats visible, then show it.
2018-06-07 14:09:19 +02:00
JC Brand
37b622251e Improve and simplify unread message notifications in the roster
Use one event instead of two, by listening to `num_unread` on chatboxes.
2018-06-07 13:40:20 +02:00
JC Brand
083f191ead Consider delayed, non-archived messages as "new"
New in the sense that we haven't seen them before
2018-06-07 13:06:32 +02:00
JC Brand
ec65bb3512 createMessage doesn't need the delay parameter 2018-06-07 12:37:56 +02:00
aitzol berasategi
d5ee022a1f Translated using Weblate (Basque)
Currently translated at 98.0% (307 of 313 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/eu/
2018-06-07 12:34:54 +02:00
JC Brand
ce3ba2a4f8 Fix linting errors 2018-06-07 07:04:45 +02:00
JC Brand
0575ca485a Specify controlbox size for lg breakpoint 2018-06-07 06:58:37 +02:00
JC Brand
57b4dec5a0 Bugfix. Validation messages wasn't being shown
due to Awesomplete doing things to the DOM and then confusing Snabbdom.
2018-06-06 18:31:04 +02:00
JC Brand
7ee71b0132 Add a plugin for XEP-0357
Currently only allows enabling an "App Service", based on pass-in
configuration values.
2018-06-06 14:00:52 +02:00
JC Brand
eed141b53e Remove unnecessary path aliases from the webpack config 2018-06-06 11:04:23 +02:00
JC Brand
1dac1d781f Don't show own typing notifications in groupchats 2018-06-06 09:57:37 +02:00
JC Brand
734f3469dd Bugfix. Message indicator wasn't shown
when we received a message for a yet non-existing chat in singleton
mode.
2018-06-06 09:56:46 +02:00
JC Brand
54c6bcd861 Disconnect chatrooms upon tab reload (when using websocket)
This is a workaround until we have support for XEP-0198

updates #1111
2018-06-06 09:56:35 +02:00
JC Brand
3153604823 Inform user of error messages which don't have text 2018-06-05 13:14:24 +02:00
JC Brand
a3fe6162c1 Proper MUC reconnection is handled in converse-muc-views 2018-06-05 13:01:47 +02:00
JC Brand
ca9d53a653 These didn't have the intended effect.
Calling `remove` without models does nothing
2018-06-05 12:42:49 +02:00
JC Brand
bea76e5b2b Use the logout event, instead of an override 2018-06-05 12:42:49 +02:00
JC Brand
ee5e77e851 Remove call to non-existing method 2018-06-05 11:14:51 +02:00
JC Brand
d32e9322ce Only show rooms-list icons upon hover.
updates #1068
2018-06-04 21:48:19 +02:00