Commit Graph

4656 Commits

Author SHA1 Message Date
Chad Pilkey
2b0fc6ed6b update whiteboard cursors to new images 2017-05-03 18:38:55 -04:00
Chad Pilkey
85d525172b rewrote the text tool to be like other annotations and removed redundant processing 2017-05-03 18:06:26 -04:00
Chad Pilkey
2c237ecec8 multi whiteboard fixes 2017-05-01 15:43:22 -04:00
Chad Pilkey
6006dbd985 fix annotation saving in the client 2017-04-28 16:40:16 -04:00
Richard Alam
2fd18e7c09 Merge branch 'multi-user-2.0' of https://github.com/capilkey/bigbluebutton into bbb-2.x-dev-mconf 2017-04-25 11:21:34 -07:00
Richard Alam
e61220e933 Merge branch 'bbb-2.x-dev' of github.com:ritzalam/bigbluebutton into bbb-2.x-dev-mconf 2017-04-25 11:06:31 -07:00
Chad Pilkey
d1b1ffe675 fix whiteboard toolbar show hide animation so it interrupts 2017-04-24 17:57:37 -04:00
Chad Pilkey
c97aed4057 line smoothing, shape location zoom drift fix, shape drawing efficiency 2017-04-21 17:29:31 -04:00
Richard Alam
69ba485fcc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-04-21 08:12:56 -07:00
Pedro Beschorner Marin
7fa3b51845 Changed screenshare's publish and view windows to use CustomMdiWindow 2017-04-19 20:54:28 +00:00
Pedro Beschorner Marin
71db31cf42 Fixing bug that was causing a stack overflow when checking permissions of ignored windows 2017-04-19 20:50:42 +00:00
Richard Alam
b8de0c9231 - add authorized role to registered user 2017-04-17 21:23:17 +00:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Chad Pilkey
c25a1f1c34 fix anotation line thickness when zoomed for viewers 2017-04-12 17:16:43 -04:00
Chad Pilkey
183ac7b411 Merge pull request #3795 from riadvice/webrtc-quality
Display WebRTC stats inside the Flex client
2017-04-11 15:50:16 -04:00
Ghazi Triki
01b4a5f6e4 Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint. 2017-04-11 08:29:00 +01:00
Ghazi Triki
a40deced61 Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used. 2017-04-10 20:22:30 +01:00
Ghazi Triki
92554f8b3e Squashed commits for displaying WebRTC stats inside the Flex client. 2017-04-10 11:16:46 +01:00
Richard Alam
6537e99981 Merge branch 'multiuser-whiteboard' of https://github.com/capilkey/bigbluebutton into merge-multi-user-whiteboard 2017-04-06 19:12:42 +00:00
Richard Alam
c73739636a Merge branch 'merging-into-bbb-1.1' of https://github.com/mconf/bigbluebutton into merge-mconf 2017-04-06 17:01:58 +00:00
Chad Pilkey
1a78091d01 multi-user whiteboard little bit of polish 2017-04-05 19:54:40 -04:00
Pedro Beschorner Marin
8539ed3e20 Fixed NPE thrown when presenter leaves room and whiteboard toolbar has focus 2017-04-05 18:57:42 +00:00
Chad Pilkey
f7b9782ef3 multi-user whiteboard clear works 2017-04-04 16:43:15 -04:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Ghazi Triki
97179a1cbe In whiteboard text tool, a single click while editing a text sends it without creating a new text zone. 2017-04-04 15:18:17 +01:00
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Chad Pilkey
1f5aff74b9 multi-user whiteboard undo works 2017-03-30 19:26:08 -04:00
Chad Pilkey
cc2c461df3 first pass as multiuser whiteboard, can mutli draw 2017-03-29 20:12:15 -04:00
Richard Alam
87f8c3257a - fix window size
- run dos2unix to remove ^M but it formatted the whole file :(
2017-03-29 16:00:00 +00:00
Ubuntu
aed4596a05 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-29 15:06:59 +00:00
Chad Pilkey
b3ce82330d Merge pull request #3760 from riadvice/whiteboard-text-tool-update
Whiteboard text tool update
2017-03-28 11:51:31 -04:00
Ghazi Triki
79c3e78910 Make single click text box tool bigger. 2017-03-28 08:16:12 +01:00
Ghazi Triki
cf8285c36f Create text field in the whiteboard with a single click. 2017-03-27 11:01:17 +01:00
Chad Pilkey
de7dfe66da fix issue where client transcripts could get into a bad state 2017-03-24 18:42:29 -04:00
Ubuntu
5e0a5f019c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:14:21 +00:00
Richard Alam
c13bd7255d Merge pull request #3747 from capilkey/1.1-accessibility-fixes-3
More accessibility fixes for 1.1
2017-03-24 14:51:14 -04:00
Pedro Beschorner Marin
a16490c2c8 Adapted screenshare pause/restart to the new tab view 2017-03-24 18:06:00 +00:00
Pedro Beschorner Marin
5100b82856 Adapted screenshare cancel button to fit the new screenshare's publish tab view workflow 2017-03-23 20:17:18 +00:00
Ghazi Triki
596f752ff1 Update MainApplicationShell and its footer style when video chat layout is selected. 2017-03-23 18:28:21 +01:00
Chad Pilkey
4515c08654 changes to shortcut keys so they all work in IE 2017-03-22 19:53:12 -04:00
Chad Pilkey
5fd7384b4f fix Flash client focus issues when windows are hidden 2017-03-22 19:51:44 -04:00
Chad Pilkey
e9258c77bf Merge pull request #3743 from riadvice/black-video-chat-layout
Make "Video Chat" layout background dark
2017-03-22 15:57:38 -04:00
Richard Alam
bbe6a9c41d Merge pull request #3726 from riadvice/breakout-rooms-improve-for-viewer
Breakout rooms improve for viewer role
2017-03-22 15:05:45 -04:00
Ghazi Triki
a416f8cb8c "Video Chat" Layout has a dark background, controls are and title are removed in this layout. 2017-03-22 17:34:11 +01:00
Ghazi Triki
4ecc88ed08 Delete unused layout event class and videconf view. 2017-03-22 14:55:54 +01:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
Ubuntu
529bec5eac Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-21 15:21:44 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
perroned
ffea5cf785 Cleans up 2017-03-20 19:02:59 +00:00
Ubuntu
4da7d6d03f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-17 15:55:23 +00:00