Commit Graph

20847 Commits

Author SHA1 Message Date
James Jung
204921e043 Make code more readable, and make clicking the mouse right button not to draw annotation
Seperate the function 'contextMenuHandler' of drawing listeners into the service for reusability

Call the 'UndoAnnotation' method from Whiteboard-toolbar's service to use inside Whiteboard-overlay's draw listeners,
rather than initializing the same method inside Whiteboard-overlay's service to use

Make drawing annotations using the mouse right button inactive
2018-07-23 17:25:06 -04:00
James Jung
df17e36462 Change the functionality for discard current annottation via right-click, based on its purpose
The annotaion can be discarded using the mouse right button, only when it is being drawn
2018-07-20 16:17:41 -04:00
James Jung
cf96835280 Change the functionality for discard current annottation via right-click, based on its purpose
The annotaion can be discarded using the mouse right button, only when it is being drawn
2018-07-20 16:05:24 -04:00
James Jung
03cabb7c80 Change the 'contentMenuHandler' method of every whiteboard-draw-listener component to static
This is for preventing Lint shows the error which a class method is implemented without using 'this' inside
2018-07-20 12:05:06 -04:00
James Jung
4e1bba7ba5 Add functionality for discard current annotation via right-click 2018-07-16 17:03:24 -04:00
James Jung
c40136c3ca Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into discard-cur-annotation-via-right-click 2018-07-16 15:03:23 -04:00
James Jung
40d16ca520 Add functionality for discard current annotation via right-click 2018-07-16 14:45:19 -04:00
Richard Alam
9a998a8ba3
Merge pull request #5862 from riadvice/pen-muw
Pen tool only for multi-user whiteboard
2018-07-16 10:51:22 -04:00
Richard Alam
de22d6c343
Merge pull request #5859 from riadvice/v2.0-camera-lock
Fix camera lock when skipCamSettingsCheck is true
2018-07-16 10:50:29 -04:00
Ghazi Triki
3eddc7b585 Only pen for multi-user whiteboard. 2018-07-16 09:50:56 +01:00
Fred Dixon
6ee3453dae
Merge pull request #5861 from hakaz/v2.0.x-release
Crippled chromeExtensionLinkURL in bbb-conf
2018-07-15 11:12:46 -04:00
Harald Kastner
f982efa823
Update bbb-conf due to chromeExtensionLinkURL
chromeExtensionLinkURL gets crippled in config.xml thus Google Chrome server sharing extension fails to install through crippled link.
2018-07-15 16:15:50 +02:00
Anton Georgiev
f50cf96100
Merge pull request #5840 from Tainan404/issue-5833
Comply audio lock setting.
2018-07-12 14:38:19 -04:00
Anton Georgiev
97fb0e9b4f
Merge pull request #5827 from Tainan404/issue-5562
Allow html5 user to join in any breakout room
2018-07-12 12:21:14 -04:00
Tainan Felipe
54aa1cddc3 Add line break 2018-07-12 13:19:54 -03:00
Anton Georgiev
2e3c071419
Merge pull request #5812 from musickiper/tweak-usrMenu-for-all-text
Allow longer menu labels (think DE) to spread over several rows within the menu
2018-07-12 11:39:46 -04:00
Tainan Felipe
80681142e7 check lockSettigProps existence 2018-07-12 11:35:37 -03:00
Ghazi Triki
991f5144fe Fix camera lock when skipCamSettingsCheck is true. 2018-07-12 14:53:54 +01:00
Anton Georgiev
4325cd1a5e
Merge pull request #5857 from musickiper/chg-mute-user-icon
change mute/unmute icon
2018-07-11 15:34:03 -04:00
James Jung
9f0a7ea08a chg mute/unmute icon 2018-07-11 15:13:59 -04:00
James Jung
7344d2fc01 Add fuctionality for discard current annotation via right-click 2018-07-11 14:51:40 -04:00
Anton Georgiev
466bcf054a
Merge pull request #5854 from prlanzarin/video-attach-response-fixes
Trying to fix WebRTC video tag attachment
2018-07-11 13:41:09 -04:00
James Jung
26a5522203 Add fuctionality for discard current annotation via right-click 2018-07-11 13:11:54 -04:00
prlanzarin
5bf5a126b5 Cleaning ping/pong interval on SFU listen only exit 2018-07-11 16:32:52 +00:00
prlanzarin
7fb2f063dd Trying to fix video tag attachment race condition and correctly checking peer availability on server messages 2018-07-11 16:32:19 +00:00
Anton Georgiev
f6c02629fb
Merge pull request #5848 from prlanzarin/flash-sfu-stun-turn
[Flash] Added STUN/TURN config via API to Flash kurento-extension script and re-enabled window sharing
2018-07-11 10:26:04 -04:00
Anton Georgiev
80715cc133
Merge pull request #5851 from antobinary/guests
Disable HTML5 waiting screen for guest approve
2018-07-11 09:53:18 -04:00
Anton Georgiev
4dbe681a46 disable HTML5 waiting screen for guest approve 2018-07-11 12:46:44 +00:00
prlanzarin
ebd70eadfa Added STUN/TURN config via API to Flash kurento-extension script 2018-07-10 19:59:05 +00:00
Anton Georgiev
124ab63193
Merge pull request #5844 from prlanzarin/sfu-kms-conn-fix
SFU correctly throwing connection error on KMS misconfig
2018-07-10 15:13:24 -04:00
prlanzarin
94675e8569 Fixed voiceBridge in flash kurento-extension 2018-07-10 17:45:03 +00:00
prlanzarin
15270d07a1 Added missing MEDIA_SERVER_OFFLINE event and resolve 2018-07-10 17:21:26 +00:00
James Jung
7b286df2f5 Adjust the list view looks better 2018-07-10 13:01:17 -04:00
prlanzarin
9b0dfe8b98 Fixed SFU screenshare start method error handling 2018-07-10 16:28:17 +00:00
prlanzarin
06ceaef3fe SFU correctly throwing connection error on KMS misconfig 2018-07-10 16:16:03 +00:00
Anton Georgiev
5bcbc330af
Merge pull request #5842 from prlanzarin/audio-video-ss-stun-turn
[HTML5] STUN/TURN config support for SFU client-side apps and general improvements
2018-07-10 11:24:37 -04:00
prlanzarin
123ec6f3a3 Reverted wrong config changes 2018-07-09 21:33:32 +00:00
prlanzarin
d2bdb67ed3 Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components 2018-07-09 21:29:59 +00:00
Tainan Felipe
e424970018 Comply audio lock setting 2018-07-09 16:23:16 -03:00
Anton Georgiev
376ca1ea96
Merge pull request #5829 from musickiper/add-1px-thickness-option
Add 1px thickness option to whiteboard pencil
2018-07-09 09:13:09 -04:00
Tainan Felipe
f8b683a611 Tiny fixes 2018-07-09 09:13:11 -03:00
Fred Dixon
73db36bc9d Added blank pages for whiteboard 2018-07-07 17:30:19 -04:00
Fred Dixon
f79e0a3680 Bumped version to 2.0-RC2 2018-07-07 17:10:31 -04:00
Fred Dixon
cc15ea460e Updated default presentation. Fixes #5774 2018-07-07 17:08:28 -04:00
Fred Dixon
1d6c0419b2
Merge pull request #5832 from riadvice/2.0-ui-labels
Update multiuser whiteboard tooltips
2018-07-07 09:02:40 -04:00
Ghazi Triki
2a243f50c0 Update multiuser whiteboard tooltips. 2018-07-06 23:23:26 +01:00
James Jung
82229e1a8a Add 1px option for the pencil thickness 2018-07-06 14:47:50 -04:00
Tainan Felipe
3468447f81 add message in en.json 2018-07-06 14:47:06 -03:00
Tainan Felipe
b6aa7e5136 remove breakout URL of nav bar and remove code of service 2018-07-06 14:46:07 -03:00
Tainan Felipe
4e87260b59 add free join interface 2018-07-06 14:38:14 -03:00