Commit Graph

138 Commits

Author SHA1 Message Date
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
b3865ef90d Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis 2017-06-20 14:11:19 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oleksandr Zhurbenko
1ba4018629 Cleanup 2017-06-05 20:15:37 -07:00
Oleksandr Zhurbenko
52fae1b8c8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks 2017-06-05 19:51:20 -07:00
Oleksandr Zhurbenko
9f497d8991 Fixed scrollArea usage 2017-06-05 19:10:06 -07:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oleksandr Zhurbenko
a0224dcffc Replaced String refs with callback refs
String refs will be deprecated in the next React releases, since they have some performance issues
2017-06-03 16:58:27 -07: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
159a47694e add suggested changes 2017-05-18 16:16:17 -07:00
KDSBrowne
16e507fbb2 fix merge conflicts 2017-05-17 08:54:48 -07:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
KDSBrowne
2f79f3ff20 change locale stringformat 2017-05-16 17:02:27 -07: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
Klauswk
30b7c3c1e4 Merge branch 'master' into AddServerCallback 2017-04-28 17:28:45 -03:00
Oswaldo Acauan
4dd5e3c6ac Re-add messages concatenation 2017-04-28 15:01:50 +00:00
Oswaldo Acauan
3d0c0d38e1 Fix merge conflicts 2017-04-28 14:59:09 +00:00
Oswaldo Acauan
9467731f47 Improve chat performance 2017-04-28 14:52:54 +00:00
Klaus Klein
e56546137b Change callServer function name 2017-04-26 10:47:44 -03:00
KDSBrowne
97402b4628 add aria-label to chat log 2017-04-20 06:53:03 -07:00
KDSBrowne
cb4f6005d6 add aria label 2017-04-17 09:23:24 -07:00
KDSBrowne
2b8c9812ee fix merge conflict 2017-04-17 06:34:11 -07:00
KDSBrowne
4a480f77eb fix aria labels for hide and close chat btns 2017-04-14 16:18:40 -07:00
Anton Georgiev
07d2cf9b14 Merge pull request #3810 from Klauswk/FixPrivateOfflineChatProblem
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-12 16:32:01 -04:00
Klaus Klein
3ad7f9b5a0 Fix a few lint problems 2017-04-12 17:19:39 -03:00
Anton Georgiev
573db8dcc3 updated icons to v11, adjusted few icons 2017-04-12 12:12:47 -04:00
Klaus Klein
3ac33c79d6 Fix merge algoritm problem 2017-04-12 09:03:14 -03:00
Klauswk
9649f7523d Merge branch 'master' into FixPrivateOfflineChatProblem 2017-04-12 08:33:07 -03:00
Anton Georgiev
026274f47f set chat input color to gray (text-color) 2017-04-11 17:05:10 -04:00
Klaus Klein
419902cc8b Fixed user leave problem on private chat, close #3799 HTML5 2017-04-11 16:46:51 -03:00
Anton Georgiev
d8faea566f Merge pull request #3798 from antobinary/private-chat-3786
[HTML5] Fix client freeze on private chat partner leaving. Fix for #3786
2017-04-11 15:02:22 -04:00
KDSBrowne
24f3eb721d switch aria-atomic to false 2017-04-10 14:07:14 -07:00
KDSBrowne
a5f1857c67 add descriptions to defined messages 2017-04-10 08:50:03 -07:00
Anton Georgiev
28165f2584 improved logic for updating message-list 2017-04-10 11:02:58 -04:00
Oswaldo Acauan
3f1f8fb693 Prevent rendering when the chat message is out of the viewport 2017-04-07 19:58:23 +00:00
Anton Georgiev
d9592aba04 fix issue with new chat session opened 2017-04-07 11:00:44 -04:00
Anton Georgiev
e3f66da499 update chat unless user just left 2017-04-06 17:08:20 -04:00
KDSBrowne
3ff1096cf4 fix merge conflict 2017-04-06 07:11:57 -07:00
Anton Georgiev
fe998aacd3 Merge pull request #3769 from Gcampes/settings-refactor
[HTML5] Adds settings service
2017-04-06 08:31:59 -04:00
Anton Georgiev
ed7d09b8a2 Merge pull request #3783 from Klauswk/AddSendButton
HTML5 close #3765, Added send button aside chat textbox
2017-04-06 08:20:02 -04:00