Commit Graph

554 Commits

Author SHA1 Message Date
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
Anton Georgiev
9bdaf3960b
Merge pull request #10195 from KDSBrowne/dev2.3-fix-poll-chat-grouping
Improve poll results in public chat
2020-08-11 09:53:53 -04:00
Anton Georgiev
6676f455c1
Merge pull request #10196 from KDSBrowne/issue-10170
Update filenames for saved public chat / users list
2020-08-07 13:28:44 -04:00
KDSBrowne
e399fe92ba update filenames for saved public chat / users list 2020-08-04 13:27:32 +00:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
KDSBrowne
1ad09b7046 fix poll chat message grouping / unread counter not updating for polls 2020-07-28 12:55:21 +00:00
Vitor Mateus De Almeida
ed8b3adb0b Merge remote-tracking branch 'upstream/develop' into layout-manager-2 2020-07-23 16:54:50 -03:00
KDSBrowne
b861664fa8 fix map of undefined error 2020-07-21 16:59:43 +00:00
Vitor Mateus De Almeida
4d61aefa78 Fix exception when screenshare is running 2020-07-20 16:23:02 -03:00
Vitor Mateus De Almeida
34108014f9 Fix exceptions and layout size when panels change 2020-07-20 16:22:41 -03:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
Vitor Mateus De Almeida
fdcfd39f04 Merge remote-tracking branch 'upstream/master' into layout 2020-07-06 12:44:47 -03:00
Vitor Mateus De Almeida
ad6ee4fdb0 Fix exception when screenshare is running 2020-06-20 23:24:36 -03:00
Vitor Mateus De Almeida
2454440a8d Fix exceptions and layout size when panels change 2020-06-20 02:46:10 -03:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Anton Georgiev
247ba9af40
Merge pull request #8964 from KDSBrowne/issue-7898
Fix chat dropdown not filling screen (mobile)
2020-05-28 15:55:01 -04:00
KDSBrowne
aff51f603f prevent chat input shifting with error & typing messages 2020-05-25 20:56:26 +00:00
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
201fa2902e Only provide modOnlyMessage to moderators. Promoted mod requires refresh to see it 2020-05-20 15:56:44 -04:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Anton Georgiev
722ffa5d07 disable private chat initiation in breakouts 2020-04-30 17:50:34 -04:00
Anton Georgiev
06f6331433
Merge pull request #8725 from capilkey/fix-typing-indicator-spacing
Fix the spacing in the typing indicator
2020-04-29 12:48:08 -04:00
KDSBrowne
7dcdfb1913 fix private chat lock not applying to already opened chats 2020-04-28 13:24:44 +00:00
KDSBrowne
e46a2c7ccc fix chat dropdown not filling screen (mobile) 2020-04-02 15:23:45 +00:00
Anton Georgiev
af34cb336c
Merge pull request #8698 from KDSBrowne/issue-8567
Fix chat names with emoji's being clipped
2020-03-09 11:23:49 -04:00
Richard Alam
7d0b350b7d
Merge pull request #8739 from antobinary/merging
Merging 2.2.2 into 'develop'
2020-03-09 11:04:36 -04:00
Chad Pilkey
c44b8d452b fix the spacing in the typing indicator 2020-03-06 14:49:14 -08:00
Chad Pilkey
ace85ae6aa remove the minMessageLength warning from chat 2020-03-06 09:12:35 -08:00
Chad Pilkey
cc07bfff20 fixed inconsitencies and usage of the idChatOpen Session variable 2020-03-05 15:14:22 -08:00
Anton Georgiev
d36c545706 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:41:18 +00:00
KDSBrowne
783caaa008 increase line height to handle larger icons 2020-03-04 20:12:50 +00:00
Anton Georgiev
7dbaf61ea6
Merge pull request #8629 from KDSBrowne/issue-8602
Fix RTL in chat using react-virtualized
2020-03-04 13:28:49 -05:00
KDSBrowne
aca541fb2e fix chat names with emoji's being clipped 2020-02-24 15:57:18 +00:00
Mohamed Amine Ben Salah
9fad024c85 adds chatBox data-test for private or public chat & adds checks for private and public messages reception 2020-02-19 15:49:28 -03:00
Tainan Felipe
31fcdbf764 Fix bottom clip in first chat message 2020-02-14 14:45:26 -03:00
KDSBrowne
dee84c1af9 fix RTL in chat using react-virtualized 2020-02-12 14:57:59 +00:00
Anton Georgiev
33e32978c7
Merge pull request #8592 from KDSBrowne/chat-published-poll
Prevent text pasted in chat displaying as poll result
2020-02-03 13:43:59 -05:00
KDSBrowne
4ab2d7ba4b prevent text pasted in chat displaying as poll result 2020-02-03 18:07:42 +00:00
Anton Georgiev
b00cfc62e2
Merge pull request #8589 from Tainan404/issue-8419
Add throttle to user typing call
2020-02-03 10:27:54 -05:00
Tainan Felipe
60ebf043b2 Add throttle to user typing call 2020-02-03 11:10:02 -03:00
KDSBrowne
d93fc375c3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
into chat-published-poll

Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-published-poll
2020-01-29 14:07:09 +00:00
KDSBrowne
818994afdd add margin to poll result wrapper 2020-01-29 14:04:29 +00:00
Maxim Khlobystov
7518b4cd99 Make the Puppeteer tests work with master branch 2020-01-28 14:25:27 -05:00
KDSBrowne
1e460d62a2 add latest design updates to poll in public chat 2020-01-25 00:33:24 +00:00
KDSBrowne
07ae123a65 update chat poll message styling 2020-01-24 17:16:05 +00:00
KDSBrowne
a233509587 fix long poll not wrapping 2020-01-23 16:40:02 +00:00
KDSBrowne
a5e7d638b0 move message separation to container 2020-01-22 22:35:15 +00:00