Commit Graph

159 Commits

Author SHA1 Message Date
bobakoftadeh
8613e7c1e9 Improve htmlDecode function 2019-03-05 18:21:33 +00:00
Chad Pilkey
97f84dec43 allow html5 viewers to chat with moderators 2019-02-25 16:27:51 -08:00
bobakoftadeh
d26ebe4212 Fix save chat with urls 2019-02-25 21:38:57 +00:00
Vitor Mateus
9f526f730b Collection moved to the chat service 2019-02-05 10:29:06 -02:00
Vitor Mateus
a9989e1107 Fix chat alert (push and audio) #6430 2019-01-14 11:23:35 -02:00
João Francisco Siebel
a0fac637e8 remove moderator message in save/copy 2019-01-09 09:41:52 -02:00
João Francisco Siebel
fa70c04375 add welcome message and moderator only message to save/copy chat feature and fix a race condition bug when clearing the chat. close #6314 2019-01-09 09:36:14 -02:00
Anton Georgiev
758b316061
Merge pull request #6445 from jfsiebel/chat-old-messages-re-render
Chat not updating some messages
2018-12-19 16:44:57 -05:00
João Francisco Siebel
9cb36f22a7 set a default idChatOpen value and fix unread messages counter 2018-12-19 17:25:13 -02:00
João Francisco Siebel
14b5877ab5 clean a little bit the props and close #6121 2018-12-19 16:51:03 -02:00
João Francisco Siebel
b626795217 fix sending message and close chat button. close #6439 2018-12-19 12:39:32 -02:00
Anton Georgiev
b2df10c635 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-16 16:06:37 +00:00
Anton Georgiev
0d1b085d54 improved on logic for open private chat 2018-10-15 20:03:17 +00:00
João Francisco Siebel
74dfa52071 handle system messages on main public chat 2018-10-08 11:22:45 -03:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Anton Georgiev
e03eccab2e combine isViewer and isLocked by using existing property from mapUser 2018-08-29 17:21:39 +00:00
Anton Georgiev
e756ce1548 comply to lock settings for chat 2018-08-29 16:00:53 +00:00
Joao Siebel
32516bfbbf implement welcome message and clear message in group chat messages 2018-08-03 11:03:16 -03:00
Joao Siebel
03389a8adc fix unread message counter for private chats 2018-07-31 14:13:36 -03:00
João Francisco Siebel
655483576f fix unread messages counter on public chat and remove some old chat configurations 2018-07-27 10:44:21 -03:00
Joao Siebel
d8391f450b use group chat messages in html5 client 2018-07-26 11:56:26 -03:00
Tainan Felipe
e59c8df71e Remove unnecessary export 2018-05-29 14:32:41 -03:00
Tainan Felipe
b180a7c350 add messages for chat notification and add link to chat 2018-05-29 13:43:11 -03:00
Maxim Khlobystov
a0497b2dd9 Assign server time to outgoing chat messages. 2018-05-15 16:08:30 -04:00
Maxim Khlobystov
6d84db0bd1 Linting. 2017-12-18 12:41:26 -05:00
Maxim Khlobystov
bb5c0a1390 Made sure that when we open a new chat, it is not on the list of closed ones anymore. 2017-12-18 12:38:46 -05:00
Tainan Felipe
4bda76c5bb Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-12 15:36:52 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03:00
Klaus
b947e27086 Fix makeCall from component, and user.isLocked from mapUser 2017-09-28 15:19:57 -03:00
Oleksandr Zhurbenko
c9552247b2 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-18 12:08:14 -07:00
KDSBrowne
72acea229b remove single quotes from variable 2017-09-12 10:01:07 -07:00
Oleksandr Zhurbenko
43b3b89c6a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-11 12:11:03 -07:00
KDSBrowne
ef6d3059a7 fix lint issue 2017-09-07 12:06:48 -07:00
KDSBrowne
13e6357b19 fix line endings 2017-09-07 07:31:19 -07:00
KDSBrowne
5a6183dc34 fix undefined check 2017-09-06 12:57:24 -07:00
KDSBrowne
9193ae8849 handle UserLockedInMeetingEvtMsg 2017-09-06 12:53:07 -07:00
KDSBrowne
fd9a4cd98e fix bug in undefined check 2017-09-06 11:13:24 -07:00
KDSBrowne
d34f138b56 check if lock settings are undefined 2017-09-06 10:50:48 -07:00
KDSBrowne
572bb0b8d3 remove ternary operation 2017-09-06 09:08:26 -07:00
KDSBrowne
b20859d1c9 fix chat being locked for moderators 2017-08-31 14:49:13 -07:00
KDSBrowne
7a9cb7d04f fix the disabling of chat when locked 2017-08-31 14:29:18 -07:00
Oswaldo Acauan
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Oswaldo Acauan
0022c121d3 Fix chat bug and styles 2017-08-04 14:58:55 -03:00
Klaus
e4e7f1da2c Move domain functions to service.js 2017-08-03 11:10:05 -03:00
Klaus
e02e5d75ce Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-03 09:17:50 -03:00
Klaus
e7b9eab5b6 Move makeCall to service file 2017-08-02 14:05:20 -03:00
Klaus
63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-02 11:36:16 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Klaus
eea2c0ee8b Refactor user 2017-07-26 11:09:07 -03:00
Klaus
39288e6e70 Add clear history, copy and save as chat options 2017-07-21 13:27:28 -03:00
Klaus
a63d8d5cf4 Add function to export public chat to clipboard and file 2017-07-21 11:39:51 -03:00
Anton Georgiev
586c51fcac Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
[HTML5 2.0]  Move emoji messages to 2.0
2017-07-14 10:39:16 -04:00
Klaus
54234cecac Handling emoji messages 2017-07-13 10:15:42 -03:00
Klaus
f0e26c1bbb Change missing strings to const 2017-07-12 17:22:26 -03:00
Klaus
8cd4b752ef Remove strings and add constants 2017-07-12 17:02:55 -03:00
Klaus
2aa603d195 Merge branch 'bbb-2x-mconf' into html5-2x-chat-messages 2017-07-12 16:29:07 -03:00
Klaus
1dfb054323 A few hotfixes to make the html5 client join again 2017-07-12 15:51:29 -03:00
Klaus
eb5712e96c Fix chat list 2017-07-12 13:47:58 -03:00
Klaus
e1004b64d3 Filtering correct the messages 2017-07-12 10:54:54 -03:00
Klaus
898f7c97e3 Sending private message 2017-07-12 10:18:26 -03:00
Klaus
73f49bb46a Sending public message 2017-07-12 09:42:16 -03:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
Oswaldo Acauan
067bd96272 Fix merge conflicts 2017-06-01 14:27:12 +00:00
Oswaldo Acauan
3702da3e08 Add check for min/max length for chat message 2017-06-01 14:24:29 +00:00
KDSBrowne
df76d33cba set files permission to 644 2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c Fix client lint issues except those which are comment related 2017-05-16 08:37:17 -07:00
Klaus Klein
e56546137b Change callServer function name 2017-04-26 10:47:44 -03:00
Klaus Klein
3ad7f9b5a0 Fix a few lint problems 2017-04-12 17:19:39 -03:00
Klaus Klein
3ac33c79d6 Fix merge algoritm problem 2017-04-12 09:03:14 -03:00
Klaus Klein
419902cc8b Fixed user leave problem on private chat, close #3799 HTML5 2017-04-11 16:46:51 -03:00
JaeeunCho
fd08d99b6f HTML5 - removed unused imports, fixed variable names 2017-03-23 12:02:40 -07:00
JaeeunCho
75dbfc23b6 HTML5 - changed underscore to lodash 2017-03-21 14:52:10 -07:00
JaeeunCho
eb176e77ac HTML5 - changed session and variables name 2017-03-17 08:27:37 -07:00
JaeeunCho
3fb3d614fa HTML5 - changed comment and moved into block 2017-03-06 09:25:35 -08:00
JaeeunCho
3355ad5d82 HTML5 - did lint code and chaged it 2017-03-02 13:42:39 -08:00
JaeeunCho
a67ef17930 HTML5 - changed code for session 2017-03-02 12:33:49 -08:00
JaeeunCho
fa7d46af73 HTML5 - added session array for close private chat 2017-03-01 13:27:05 -08:00
JaeeunCho
07f45f695a HTML5 - close private chat 2017-02-28 14:40:16 -08:00
Oswaldo Acauan
19a81e1d90 Add visual indicator when someone is talking 2016-11-22 18:26:01 +00:00
JaeeunCho
909862e44c HTML5-clent messages on chat - changed icon for logged out users 2016-11-14 14:18:25 -08:00
JaeeunCho
aedf4561de HTML5-client messages for logged out user on chat 2016-10-31 15:17:06 -07:00
JaeeunCho
e541487596 Merge remote-tracking branch 'upstream/master' into messages_v1 2016-10-31 14:18:37 -07:00
JaeeunCho
8bb915e8cd HTML5-clent messages on chat 2016-10-25 10:22:55 -07:00
Oswaldo Acauan
8874c15e9f Rename meteor method on the client 2016-10-21 18:47:33 +00:00
Lajellu
8e7b1d6317 HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00
Oswaldo Acauan
306ef94237 Fix conflicts 2016-07-12 14:02:48 +00:00
Oswaldo Acauan
97389d7edf Fix React warnings for unknown props 2016-07-11 20:10:55 +00:00
Oswaldo Acauan
2d1b9ede84 Minor fixes 2016-07-11 19:42:54 +00:00
Oswaldo Acauan
0f77c8fa13 Change reduce/map order on chat service 2016-07-11 17:12:01 +00:00
Oswaldo Acauan
b70b724d99 Change reduce/map order on chat service 2016-07-11 17:07:35 +00:00
Oswaldo Acauan
9b53090c81 Change Auth service to be a singleton class 2016-07-11 13:45:24 +00:00
Oswaldo Acauan
1c0132ed5b Merge after git conflict/lost object 2016-07-11 12:34:58 +00:00
Gabriel Carvalho de Campes
0dd7f3811c Separates user status in avatar 2016-07-08 19:09:16 +00:00
Oswaldo Acauan
930f92932d Add chat notification for unread messages 2016-07-07 16:51:55 +00:00
Oswaldo Acauan
4e85501768 Fix unread notification 2016-07-05 16:47:40 +00:00