Richard Alam
2bce70c065
Merge pull request #3968 from capilkey/multi-user-cursor
...
Fix shape drawing and set max text length for text annotations
2017-06-01 11:08:42 -04:00
Ghazi Triki
6b05222da5
Remove the callLater MDIManagerEvent.WINDOW_ADD listener to avoid the application hangup when loading.
2017-05-29 20:58:23 +01:00
Chad Pilkey
3fe1103ea2
set a max text length of 1024 for text annotations
2017-05-26 18:52:46 -04:00
Chad Pilkey
3683bac311
allow shapes to draw again in the whiteboard
2017-05-26 18:51:59 -04:00
Richard Alam
7a60aec83c
Merge pull request #3954 from riadvice/faster-options-reading
...
Improve client options reading
2017-05-26 09:45:39 -04:00
Chad Pilkey
302040b86d
fix whiteboard shapes to again send proper statuses
2017-05-25 23:46:52 -04:00
Chad Pilkey
b7fb0588bb
update WhiteboardTextToolbar to save colour and font between uses
2017-05-25 23:46:24 -04:00
Chad Pilkey
09ec1e6151
first pass at multi whiteboard cursors
2017-05-25 23:45:27 -04:00
Ghazi Triki
30a60b0e2b
More improvements to the configuration parsing.
2017-05-25 11:57:51 +01:00
Ghazi Triki
fd2535236a
Read configuration options for version 2 using the new Options class.
2017-05-24 12:19:25 +01:00
Ghazi Triki
ef306c748f
Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into faster-options-reading
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/LayoutOptions.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
# bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
# bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentOptions.as
# bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2017-05-23 22:59:09 +01:00
Richard Alam
b6176ac736
Merge pull request #3957 from capilkey/multi-user-2.0-take5
...
Whiteboard updates for 2.0
2017-05-23 14:55:18 -04:00
Richard Alam
4dda35a3e3
Merge pull request #3961 from riadvice/2x-ui-improve
...
Fix checking branding options
2017-05-23 13:56:11 -04:00
Ghazi Triki
93a21b88b7
Fix checking branding options.
2017-05-23 15:27:32 +01:00
Ghazi Triki
7d283cd154
Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x
...
# Conflicts:
# bigbluebutton-client/resources/config.xml.template
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
# record-and-playback/core/scripts/rap-process-worker.rb
2017-05-22 17:35:24 +01:00
Chad Pilkey
206822f141
fix race conditions in the presentation and whiteboard startup
2017-05-20 16:06:23 -04:00
Fred Dixon
237c6f8fbc
Update BigBlueButton.html
2017-05-20 12:33:42 -04:00
Ghazi Triki
a9de960d47
Make the use of non module options in config.xml transparent for the developers. There is no more need to add properties to Config class.
2017-05-19 23:24:52 +01:00
Chad Pilkey
381b8dae29
refactor of WhiteboardCanvas to be more isolated and easier to duplicate
2017-05-19 17:30:00 -04:00
Ghazi Triki
b59e64b21f
Additional improvements to the configuration parsing.
2017-05-19 10:39:12 +01:00
Ghazi Triki
a8102d1936
Config class cleanup and move classes to the right packages.
2017-05-19 00:32:32 +01:00
Ghazi Triki
96835619ab
Remove obsolete configuration options.
2017-05-19 00:20:25 +01:00
Ghazi Triki
97a9335921
Refactor the way options are read to make sure the XML data are read only once and a single instance is being used of each across all the application.
2017-05-18 22:54:14 +01:00
Chad Pilkey
7a46382e86
Merge pull request #3946 from riadvice/fix-presenter-share-only
...
Delete the option "presenterShareOnly" in favor of lock settings
2017-05-18 12:29:21 -04:00
Ghazi Triki
43d05ffa0b
Remove presenterShareOnly option and all its implementation.
2017-05-17 14:30:54 +01:00
Ghazi Triki
f0d2a5dec2
Map presenterShareOnly options to lock settings. (reverted from commit 450c5d28f3)
2017-05-17 10:16:44 +01:00
Ghazi Triki
450c5d28f3
Map presenterShareOnly options to lock settings.
2017-05-15 22:05:00 +01:00
perroned
a7c2542c0a
Overwrites popup function
2017-05-15 12:16:30 -04:00
Chad Pilkey
372b154e35
properly clip whiteboard annotations so they don't overflow
2017-05-12 15:17:46 -04:00
Chad Pilkey
2bcfc2217e
zoom value no longer required for drawing annotations
2017-05-11 22:22:07 -04:00
Chad Pilkey
9f9f5aea94
improve PollObject scaling again
2017-05-11 20:51:25 -04:00
Chad Pilkey
a7366d611a
normalize annotation thickness to preserve size
2017-05-11 20:32:51 -04:00
Chad Pilkey
ce81cbae86
fix TextObject fontsize scaling
2017-05-10 18:25:09 -04:00
Chad Pilkey
ce22063e42
remove outdated whiteboard ctrlkey code, try hard annotation edges
2017-05-10 18:24:42 -04:00
Ghazi Triki
a7f6d8483c
Use the correct Arabic locale for the flash client.
2017-05-10 11:04:33 +01:00
Chad Pilkey
4519c6752a
improve PollResult scaling
2017-05-08 19:17:16 -04:00
Chad Pilkey
76d21023e3
change DrawObject base class to Shape which is lighter than Sprite
2017-05-08 18:19:19 -04:00
Chad Pilkey
249f15c799
update PollResultObject to work with whiteboard 2.0
2017-05-08 18:18:55 -04:00
Stephen Dame
6fff8c0a8a
flash blue to white screen
2017-05-08 14:09:47 -07:00
Chad Pilkey
a52a7e94b8
add back in the accessbilityName for the TextButton
2017-05-08 14:57:51 -04:00
Chad Pilkey
6bfb18e6f2
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into multi-user-2.0-take3
2017-05-08 13:57:43 -04:00
Chad Pilkey
f2bc898750
new multiuser whiteboard icon and fixes for text object
2017-05-08 13:46:47 -04:00
Richard Alam
44e3fb8a07
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-05-08 08:51:31 -07:00
Chad Pilkey
155b5ec626
Merge pull request #3903 from riadvice/text-tool-fix
...
Prevent Flash client from crashing when text tool is used
2017-05-06 17:46:09 -04:00
Ghazi Triki
3541b0ec33
Check event target variable after extracting it from its event.
2017-05-06 21:04:42 +01:00
Richard Alam
acaaf62849
Merge pull request #18 from pedrobmarin/2.0-small-fixes
...
2.0 small fixes
2017-05-05 14:23:35 -04:00
Fred Dixon
26a62bd398
Merge pull request #3907 from kepstin/webrtc-stats
...
Update webrtc stats bridge for modern Chrome/Firefox APIs
2017-05-05 14:21:48 -04:00
Calvin Walton
75c680832c
Update webrtc stats bridge for modern Chrome/Firefox APIs
...
Switch to the promise-based getStats, and use the standardized
property names where available, with fallback to handle Chrome,
which hasn't fully switched yet.
The stats now only track the outgoing audio stream, as a way to
indicate quality, since the user can't hear themselves. This
might be revisited later; it would require tracking the stats
separately for incoming vs. outgoing and e.g. returning whichever
is worse.
2017-05-05 11:22:38 -04:00
Ghazi Triki
1628851ce4
Send the previously non detected as finished text object before keeping focus on the last created one.
2017-05-05 09:53:49 +01:00
Richard Alam
23e6dea35b
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf
2017-05-04 14:39:02 -07:00
