Commit Graph

5132 Commits

Author SHA1 Message Date
JC Brand
bb5dff9a74 Merge branch 'better-chat_status' of https://github.com/linkmauve/converse.js into linkmauve-better-chat_status 2018-07-16 01:05:45 +02:00
JC Brand
6717315d05 Add support for message corrections in MUC. 2018-07-16 00:49:00 +02:00
JC Brand
16faf62d3f Fixes #1129 Hide "Contacts" section when logged in anonymously 2018-07-16 00:09:54 +02:00
Emmanuel Gil Peyrot
d518596a2e Add missing closing quote in label_download. 2018-07-14 18:27:25 +02:00
Emmanuel Gil Peyrot
d643d4c9cf Remove order constraint in file upload error message. 2018-07-14 18:26:42 +02:00
Emmanuel Gil Peyrot
3fcf9acfcc Remove order constraint in chatstate message. 2018-07-14 18:26:42 +02:00
Emmanuel Gil Peyrot
422757832b Remove order constraint in chat_status message. 2018-07-14 18:26:42 +02:00
JC Brand
b4d2007972 Allow any earlier message to be edited.
updates #421
2018-07-08 15:20:58 +02:00
JC Brand
a9bb99a1a7 Show animation when a message has been corrected
updates #421
2018-07-08 13:43:28 +02:00
JC Brand
84a10d77d9 Cancel message correction by pressing the down arrow
Also, add a class `correcting` to the message being corrected, to
provide a visual cue.

updates #421
2018-07-08 11:30:15 +02:00
Weblate push user
39c85db181 Update from Weblate. (#1124)
* Translated using Weblate (Norwegian Bokmål)

Currently translated at 63.3% (207 of 327 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100,0% (327 of 327 strings)

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

* Translated using Weblate (Flemish)

Currently translated at 100,0% (332 of 332 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 97.8% (320 of 327 strings)

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

* Translated using Weblate (Hungarian)

Currently translated at 100,0% (327 of 327 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/hu/
2018-07-08 00:48:46 +02:00
JC Brand
2929647e16 Add support for correcting the last message sent
fixes #421
2018-07-08 00:39:28 +02:00
JC Brand
be58e2b9c8 Add test for groupchat message corrections 2018-07-07 14:20:49 +02:00
JC Brand
f3f58a8da4 Test multiple corrections of the same message 2018-07-06 01:51:27 +02:00
JC Brand
9e965fa20e Add a rudimentary message versions modal 2018-07-06 01:36:34 +02:00
JC Brand
19b9aeadfd Show an indicator that the message has been edited 2018-07-06 01:18:03 +02:00
JC Brand
9f42f09d1e Get the first message correction test to pass 2018-07-06 01:04:34 +02:00
JC Brand
52d5677e40 Rename message to stanza to avoid confusion 2018-07-06 00:59:16 +02:00
JC Brand
461cebfed5 Add test for receiving message corrections 2018-07-06 00:43:47 +02:00
JC Brand
8283d58988 Don't make the controlbox too narrow at certain viewport sizes 2018-07-04 12:00:02 +02:00
JC Brand
7b86e24b9a Add missing CSS class to bookmark list item and fix test
updates #1069
2018-07-04 11:24:02 +02:00
JC Brand
388719ff2d Update CSS of controlbox list items
Trying to use more generic CSS selectors and to extract out common patterns.
2018-07-04 10:57:30 +02:00
JC Brand
47ec7501ed updates #1069 Don't show room-info icon for bookmarks
Currently we can only show the room info modal for open rooms, because
we need the Backbone.Model.

Querying the room info and displaying it for non-open rooms will be more
work and will require a separate modal.
2018-07-04 09:18:54 +02:00
JC Brand
145167baae Don't remove ourselves as occupant
when removing offline users who are no longer on the member lists
2018-07-04 09:08:23 +02:00
JC Brand
efa5e30596 updates #1069 Highlight currently open private chat in the sidebar 2018-07-04 09:08:22 +02:00
JC Brand
58ee1460fe Updates #1069
Highlight the currently open groupchat in the sidebar (in singleton mode).
2018-07-02 23:29:57 +02:00
JC Brand
a67fa6d4e5 Render URLs in the topic in the room details modal 2018-07-02 21:20:37 +02:00
JC Brand
3c1db0fec8 Fixes #1069 Only show bookmark icons on hover 2018-07-02 21:13:15 +02:00
JC Brand
a2fef1277c Don't render labels for hidden inputs 2018-07-02 20:22:16 +02:00
JC Brand
d335173fd7 Bootstrap markup for auto-generated forms 2018-07-02 20:18:22 +02:00
Weblate push user
1540d81126 Translated using Weblate (Norwegian Bokmål) (#1121)
Currently translated at 79.2% (252 of 318 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/nb/
2018-07-02 16:38:52 +02:00
JC Brand
a200ff953a Make new pot and po files 2018-07-02 16:33:57 +02:00
JC Brand
e64edf19b4 Use "Groupchat" instead of "Chatroom" 2018-07-02 16:27:58 +02:00
JC Brand
102505c1a9 Generate new translation strings 2018-07-02 15:44:37 +02:00
JC Brand
d2ffdcef8e Merge branch 'master' into weblate-translations 2018-07-02 15:39:52 +02:00
JC Brand
4331f920cf Fix failing tests 2018-07-02 15:23:49 +02:00
JC Brand
c6d7317bb2 Show the topic in the room info modal 2018-07-02 13:41:15 +02:00
JC Brand
1880b3f209 Nicer rendering of MUC disconnection messages 2018-07-02 12:52:19 +02:00
JC Brand
eb1f462e07 Handle all presence stanzas sent from the room
Our handler was too restrictive due to the namespace matching.
When joining a room and the room's remote server can not be found, then
the resulting error messages doesn't not have the MUC namespace.
2018-07-02 12:52:13 +02:00
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