BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,293 Commits 13 Branches 260 Tags 1.1 GiB
ccb5b8b5cc
Commit Graph

6144 Commits

Author SHA1 Message Date
Richard Alam
d0343b40d2 - delay processing of pre-uploaded presentation to make sure that meeting has been created before 
presentation conversion has completed.
 2017-06-19 13:04:07 -07:00
Richard Alam
bb8944570b - fix validate auth token race condition where the validate auto token is sent to the meeting before 
the meeting has been created
 2017-06-19 12:34:53 -07:00
Richard Alam
cb7219ee38 Merge branch 'breakout-rooms-2x-messages' of https://github.com/riadvice/bigbluebutton into riadvice-breakout-rooms-2x-messages 2017-06-19 11:41:54 -07:00
Richard Alam
2f9109d0a7 - fix some client initialization issues 2017-06-19 11:41:03 -07:00
Richard Alam
4f2fd83851 - client project properties 2017-06-19 11:25:27 -07:00
Ghazi Triki
5fc84b50f0 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-06-19 17:46:46 +01:00
Richard Alam
4f4c11b10a - fix some client initialization issues 2017-06-19 07:40:40 -07:00
Richard Alam
b22b5ce73e - minor changes to client 2017-06-18 17:39:24 -07:00
Richard Alam
e7ffcbfbe7 - merging latest bbb-2x-mconf 2017-06-16 18:12:29 -07:00
Richard Alam
dc1c1e8b9e Merge branch 'move-whiteboard-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-whiteboard-messages-2x 2017-06-16 17:18:50 -07:00
Chad Pilkey
f3ab70f060 convert whiteboard messages to the 2.0 method and remove old 2017-06-16 18:09:25 -04:00
Richard Alam
003af41870 - remove authToken from BBBUser as it is not used 2017-06-16 14:29:33 -07:00
Richard Alam
97c3b18a81 - put shared notes info into live meeting 2017-06-16 13:41:56 -07:00
Richard Alam
6c67d4dbc5 - dispatch event when breakout rooms values in the data model changes 2017-06-16 12:18:31 -07:00
Richard Alam
d8bc6fc2db - put lock setting out of Conference 2017-06-16 10:08:31 -07:00
Richard Alam
9199474c79 - formatting changes 2017-06-15 19:17:48 -07:00
Richard Alam
5c84354715 - try to consolidate meeting state in one place 2017-06-15 19:09:32 -07:00
Richard Alam
4339a48aae - handle validate token 2017-06-14 14:40:34 -07:00
Richard Alam
f430c7dce3 - create classes for guest policy 2017-06-14 14:17:54 -07:00
Ghazi Triki
6eae6ce66a Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 2017-06-14 08:55:24 +01:00
Richard Alam
326ba5e481 - put message into it's own hdlr 2017-06-13 19:26:04 -07:00
Richard Alam
91c14fae53 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into refactor-akka-fsesl-for-new-messages 2017-06-13 18:10:25 -07:00
Richard Alam
23cf2266e4 - create classes for models in client 2017-06-13 17:51:04 -07:00
Richard Alam
2c4fe3f3b8 - create users state classes 2017-06-13 14:54:11 -07:00
prlanzarin
251cd67df4 Added first prototype of Kurento WebRTC screenshare client module 2017-06-13 20:18:21 +00:00
Pedro Beschorner Marin
15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode 
tagging v1.1.0 release

 Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-06-13 17:44:12 +00:00
Ghazi Triki
ed939d74a7 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
 2017-06-13 17:58:46 +01:00
Ghazi Triki
6df7ecf943 Keep swf cache for incremental build. 2017-06-13 12:57:16 +01:00
Ghazi Triki
b59903e714 Suppress css compile-time warnings. 2017-06-13 12:34:51 +01:00
Ghazi Triki
0478a3f658 First pass moving breakout rooms messages to v2 format. 2017-06-12 20:32:10 +01:00
Richard Alam
ea39c516f8 - create new users class in client 2017-06-12 12:25:58 -07:00
Chad Pilkey
28101e5623 moved setting the whiteboard id to display out of preswindow 2017-06-09 15:30:20 -04:00
Chad Pilkey
b4429fbf2d remove mconf branding that shouldn't be there 2017-06-08 18:39:45 -04:00
Chad Pilkey
894b5bcab6 remove unneeded redraw of the annotation history 2017-06-08 18:39:22 -04:00
Chad Pilkey
e1a50bed32 stop sending redundant slide pos updates 2017-06-08 18:38:43 -04:00
Chad Pilkey
e7a2e3d70b send page changes to the whiteboard canvas again 2017-06-08 18:37:36 -04:00
Chad Pilkey
f559a54a95 fix presentation startup race condition 2017-06-08 18:34:38 -04:00
Pedro Beschorner Marin
719ef1377a Merge remote-tracking branch 'mconf' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/VideoRotator.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-config/bin/bbb-conf
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/core/scripts/rap-worker.rb
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2017-06-07 19:31:15 +00:00
Richard Alam
9d88c8252b Merge pull request #4002 from ritzalam/migrate-messages 
handle start/stop broadcast cam on the client
 2017-06-07 15:15:04 -04:00
Richard Alam
7db33c594b - handle start/stop brocast cam on the client 2017-06-07 12:12:30 -07:00
Richard Alam
51bd8f5f07 Merge pull request #4001 from ritzalam/migrate-messages 
user start/stop broadcast cam message
 2017-06-07 14:15:32 -04:00
Richard Alam
7e14c133b3 - send start/stop broadcasting webcam from client to server 
- send webcam broadcast started/stopped event from server to client
 2017-06-07 11:08:46 -07:00
Richard Alam
d48d06c69f - send validate token using new message 2017-06-07 08:04:33 -07:00
Richard Alam
8fa960e46d Merge pull request #3989 from riadvice/add-show-webrtc-mos-feature 
Add showWebRTCMOS option to PhoneModule
 2017-06-07 10:44:38 -04:00
Richard Alam
8998737a5f Merge pull request #4000 from ritzalam/migrate-messages 
- change how we deserialize message so we can log errors
 2017-06-07 10:35:58 -04:00
Richard Alam
15f4a61e52 Merge pull request #3969 from riadvice/flex4-mx 
Move the application to Flex 4 MX
 2017-06-07 10:33:12 -04:00
Ghazi Triki
08cb77c604 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into flex4-mx 
# Conflicts:
#	bigbluebutton-client/build.xml
 2017-06-07 10:16:35 +01:00
Richard Alam
2989e1a694 - create classes for messages in flash client 2017-06-06 15:14:34 -07:00
Chad Pilkey
ef8ff6f1b4 add a name next to the whiteboard cursor for clarity 2017-06-05 18:56:10 -04:00
Chad Pilkey
16da46d717 avoid divide by zero case in cursor listener 2017-06-05 18:55:17 -04:00
Chad Pilkey
0913d18661 reset cursor in whiteboard canvas when the canvas is disabled 2017-06-05 18:54:05 -04:00
Chad Pilkey
5f34a359c5 Enable IME for text tool's basic TextField - fixes #2678 2017-06-05 18:22:40 -04:00
Ghazi Triki
cd8f09170f Add showWebRTCMOS option. 2017-06-05 13:28:24 +01:00
Richard Alam
2bbeba686d Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-06-01 10:03:27 -07:00
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
Richard Alam
31958979ef - change localize ant target to locale 2017-05-31 08:13:19 -07:00
Ghazi Triki
184b2a3c9a Uncomment showAllChildren and hideAllChildren methods after reverting back updates to flexlib.swc 2017-05-30 22:57:52 +01:00
Richard Alam
47b0ada045 - track meeting status 2017-05-29 14:41:37 -07: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
Ghazi Triki
aaf9b336f3 Transform the client to a Flex 4 mx application. 2017-05-29 13:58:18 +01:00
Ghazi Triki
6af4753e42 Updated flexlib.swc library with more fixes. 2017-05-29 13:53:26 +01:00
Ghazi Triki
f61308af64 Remove flex 3 compatibility mode from client build. 2017-05-29 13:53:07 +01:00
Richard Alam
240176ca32 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-27 18:30:50 -07:00
Richard Alam
272df3c23d - send message to client 2017-05-26 20:00:33 -07: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
73ec6bb25d - implement validate auth token 2017-05-26 10:04:38 -07: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
Chad Pilkey
89918858b5 force Flash on Edge 15+, fixes #3812 2017-05-24 23:03:20 -03:00
Stephen Dame
d386223da3 flash blue to white screen 2017-05-24 22:52:50 -03:00
Felipe Cecagno
13e045320f fix logic to avoid warnings regarding Java on updated Firefox 2017-05-24 14:56:32 -03:00
Ghazi Triki
fd2535236a Read configuration options for version 2 using the new Options class. 2017-05-24 12:19:25 +01:00
Richard Alam
4aedea9f5a - try new messages 2017-05-23 17:02:40 -07: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
Richard Alam
d30b5c4aac - start up the client 2017-05-19 20:00:20 -07: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
Richard Alam
a1071ce7ba - try to wire spring for bbb-apps 2017-05-15 12:23:54 -07: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
Pedro Beschorner Marin
09d7de7875 Included Java applet warnings for Firefox 52 2017-05-09 19:20:38 +00: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
Richard Alam
511fe8882a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-05-08 12:45:05 -07:00
Richard Alam
ddf5eb9caa - upgrade dependencies versions 2017-05-08 12:43:19 -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
Ghazi Triki
740a1abe0b Fix client crash when text zones are quickly added to the whiteboard. 2017-05-04 18:46:36 +01:00
Chad Pilkey
721495d460 removed old images that are now unused 2017-05-04 13:14:54 -04:00
Pedro Beschorner Marin
65aac2d500 Reverting screenshare view back to canvas 2017-05-04 16:01:48 +00:00
Chad Pilkey
62a7ad1a7e whiteboard client cleanup 2017-05-04 11:49:10 -04:00
Richard Alam
b1740ebec5 Merge pull request #17 from capilkey/multi-user-2.0-take3 
Updates to make the text tool work
 2017-05-04 10:21:39 -04:00
Ghazi Triki
db77dc239f Close color picker when the text toolbar is to be hidden. 2017-05-04 11:23:20 +01:00
Chad Pilkey
7933d05707 Fix the text cursor for whiteboard 2017-05-03 18:42:29 -04:00
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
perroned
66061fa33d Handle lib update/fix errors 2017-05-03 14:13:53 +00:00
perroned
1d7ba676da Update verto libs 2017-05-03 14:12:42 +00:00
perroned
43636d26ad Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into update-verto-libs 2017-05-02 22:15:36 +00:00
Calvin Walton
e29e1bbb02 Fix origin on pencil cursor 2017-05-02 16:45:16 -04:00
Calvin Walton
fcd1e4f70e New cursors for flash client 2017-05-02 16:19:41 -04:00
perroned
4b6c95f1c9 Adds chrome tabs to extension 2017-05-02 15:01:05 +00: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
Oleksandr Zhurbenko
bb5e31209a Corrected the cursor icon for the rectangle tool 2017-04-28 13:29:00 -07:00
Richard Alam
c733f4eafc Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-04-27 14:52:47 -07:00
Richard Alam
94e587b52f - update locales 2017-04-27 14:55:57 +00:00
Chad Pilkey
3970f17455 force Flash on Edge 15+, fixes #3812 2017-04-26 17:13:52 -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
Chad Pilkey
fdf210977c Merge pull request #3837 from pedrobmarin/fix-3803 
Fixing stack overflow when opening screenshare window
 2017-04-19 17:05:39 -04: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
5f6f4d1cd1 - remove ru locale and add to .gitignore 
- download only tanslated locale strings (tx pull -a --mode=onlytranslated)
 2017-04-18 20:49:20 +00:00
Chad Pilkey
13e3fd3eeb fix focus chat message list key and label 2017-04-17 17:31:13 -04: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
Pedro Beschorner Marin
e55c352815 Merge remote-tracking branch 'mconf/mconf' into pedrobmarin/mconf-fullscreen-video 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2017-04-12 13:04:21 +00: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
Pedro Beschorner Marin
86841167e1 Merge remote-tracking branch 'pedrobmarin/reconnection-timeout' into mconf/mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConference.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-04-07 21:00:30 +00:00
Pedro Beschorner Marin
53097e73ba Merge remote-tracking branch 'pedrobmarin-mconftec/webcam-fullscreen' into mconf/mconf 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2017-04-06 19:35:58 +00: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
Pedro Beschorner Marin
5a73d4a500 Fixed NPE thrown when presenter leaves room and whiteboard toolbar has focus 2017-04-06 12:57:12 +00:00
Chad Pilkey
1a78091d01 multi-user whiteboard little bit of polish 2017-04-05 19:54:40 -04:00
Felipe Cecagno
6b8c72ae52 Merge branch 'mconf' of github.com:mconf/bigbluebutton into mconf 2017-04-05 16:00:36 -03: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
Felipe Cecagno
91b119bb37 Merge branch 'issue-381' of github.com:pedrobmarin/bigbluebutton into mconf 2017-04-01 19:43:37 -03:00
Pedro Beschorner Marin
cb0e66d9cd Added minimum width to name grid in user's window 2017-03-31 20:29:43 +00:00
Chad Pilkey
1f5aff74b9 multi-user whiteboard undo works 2017-03-30 19:26:08 -04:00
Pedro Beschorner Marin
61a27c1335 Avoid sending zoom events while typing in slide's textbox 2017-03-30 14:37:32 +00: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
8445c49f92 - add dimension of screen share 2017-03-29 15:58:43 +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
Pedro Beschorner Marin
0531838277 Added inactivity messages that went missing after the merge 2017-03-28 16:53:46 +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
Richard Alam
2eb332b618 Merge pull request #3757 from ritzalam/update-locales-mar-24-2017 
update locales
 2017-03-24 16:02:20 -04:00
Richard Alam
cda3668f90 - update locales 2017-03-24 19:59:22 +00:00
Pedro Beschorner Marin
01f8dbc522 Merge pull request #375 from alexandrekreis/mconf 
Handling presentation tab change through keyboard shortcuts
 2017-03-24 16:58:50 -03:00
Ubuntu
e6796bf3ea Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:25:47 +00: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
7de860d3da Remove video view border in dark mode. 2017-03-23 18:38:37 +01:00
Ghazi Triki
596f752ff1 Update MainApplicationShell and its footer style when video chat layout is selected. 2017-03-23 18:28:21 +01:00
Ghazi Triki
313de26ddb Fix "videoDockStyleNoFocusChatLayout" style class border color. 2017-03-23 14:40:03 +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
perroned
cb124961a2 Connect to /verto endpoint 2017-03-22 22:20:15 +00:00
Ubuntu
a096e25a72 Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-22 20:37:41 +00: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
perroned
47c6e3fe69 Puts back resolution values into screen constraints 2017-03-21 17:14:36 +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
perroned
dd6f869059 Fixes exceptions and jnlp download issue 2017-03-13 21:20:13 +00:00
Felipe Cecagno
21170265e2 implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file 2017-03-12 21:45:08 -03:00
Ghazi Triki
c882ddf9e6 Enable viewers to get an invitation link to their last breakout room. 2017-03-12 11:10:00 +01:00
Ghazi Triki
5fbfca8e70 Disable kicking user out in breakout rooms. 2017-03-10 09:56:54 +01:00
Chad Pilkey
0235dd5adb fix plus and minus shortcut modifier in key table 2017-03-08 19:26:02 -05:00
Chad Pilkey
65b89074e6 more accessibity fixes for 1.1 2017-03-08 16:15:40 -05:00
alexandre
297021ec84 Disabling presentation keyboard shortcuts and context menu items when sharing desktop 
Also, a little refactoring
 2017-03-08 15:09:41 -03:00
Fred Dixon
55525672f2 Update bbbResources.properties 2017-03-06 15:30:00 -05:00
Fred Dixon
c28c78a405 Minor updates for release -- bumped the API version 2017-03-06 13:57:54 -06:00
perroned
dab5adb5be Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/ui/components/media/container.jsx
	bigbluebutton-html5/server/main.js
 2017-03-06 19:21:40 +00:00
Fred Dixon
c0c58b5507 Update BigBlueButton.html 
Modified "You need Flash Installed" message.
 2017-03-04 10:02:39 -05:00
Chad Pilkey
9721d03274 add a warning to screenshare publish when tunneling 2017-03-03 19:17:03 -05:00
Chad Pilkey
ae2b891d8f Merge pull request #3638 from riadvice/client-language-auto-detect-improve 
Improve ResourceUtil.as class
 2017-03-03 12:18:08 -05:00
Ghazi Triki
35dab193e1 Update camera list after the popup is displayed and not after the creation complete. 2017-03-02 10:56:15 +01:00
Ghazi Triki
3b2b8a692e Merge branch 'master' into accessibility-improve 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
 2017-03-01 20:53:48 +01:00
Richard Alam
8904d3ace8 Merge pull request #3697 from antobinary/reconnect-webcams 
Handle multiple webcams per user so they survive reconnection. Fixes #3585
 2017-03-01 14:51:34 -05:00
Richard Alam
b0c992cca4 Merge pull request #3680 from riadvice/popup-imporve 
Improve PopUp windows open behaviour
 2017-03-01 14:49:36 -05:00
Fred Dixon
0aec7e3422 Merge pull request #3696 from capilkey/1.1-accessiblity-fixes 
Change chat message selection indicator
 2017-03-01 14:40:22 -05:00
Anton Georgiev
ad59c80853 adjust ExternalApiCalls for multiple recovered cams 2017-03-01 13:56:10 -05:00
Chad Pilkey
443e131bde chat selection indicator is now a bg highlight instead of box 2017-03-01 12:06:13 -05:00
Ghazi Triki
290f1620e1 Merge branch 'master' into accessibility-improve 
# Conflicts:
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2017-03-01 16:56:35 +01:00
Anton Georgiev
4c4ad35ba5 cleanup 2017-03-01 10:54:01 -05:00
Ghazi Triki
ce79fa5b8e Merge branch 'master' into popup-imporve 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2017-03-01 16:48:04 +01:00
Richard Alam
f73787448e Merge pull request #3693 from capilkey/1.1-accessiblity-fixes 
1.1 accessiblity fixes
 2017-03-01 10:31:39 -05:00
Richard Alam
250b29e8ac Merge pull request #3689 from ritzalam/webcam-recording 
Do not record webcam if meeting is not recorded
 2017-03-01 10:30:40 -05:00
Richard Alam
96a5b84f5d Merge pull request #3676 from riadvice/fix-shortcut-keys-hide 
Make sure that "showButton" property of config shortcutKeys is read by MainToolbar
 2017-03-01 10:27:03 -05:00
Ghazi Triki
75a3155f03 Updated deskshare button tooltip. 2017-03-01 08:38:34 +01:00
Chad Pilkey
5b72d93669 removed old chat message list custom accessibility functionality 2017-02-28 17:55:56 -05:00
Anton Georgiev
38c3c73b63 simplify; fix issue with incorrect removing procedure 2017-02-28 17:24:21 -05:00
Anton Georgiev
82ea9c6116 remove camera when unpublishing 2017-02-28 11:12:47 -05:00
Anton Georgiev
e30f019026 control the elements of _myCamSettings 2017-02-27 17:25:17 -05:00
perroned
d269ac7377 Fixes resize if video is not ready 2017-02-27 20:09:50 +00:00
perroned
59435c6020 Cleaning 2017-02-27 19:59:54 +00:00
Richard Alam
ca539f9098 Do not record webcam if meeting is not recorded 
Currently, we record webcams even if the meeting is not being recorded. We add
 an indicator in the webcam stream name ("-recorded") to trigger bbb-video in
 red5 to record the webcam stream.
 2017-02-27 19:54:21 +00:00
Anton Georgiev
ed8b4376e7 store both cameras so we can resume sharing upon reconnect 2017-02-24 16:55:25 -05:00
perroned
92c3cdb746 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2017-02-23 19:20:37 +00:00
Ghazi Triki
2469a2f07e Change focus to breakout rooms list hotkey to CTRL+R instead of CTRL+T 2017-02-23 16:50:27 +01:00
alexandre
03b365961c Handling presentation tab change through keyboard shortcuts 
There were 2 issues:
- Flash was letting invisible tabs be accessed through keyboard shortcuts. We have to disable the invisible tabs as well.
- TabNavigator does not update the selectedIndex when the tab change is made through a keyboard shortcut. We have to get the correct index using TabBar and mouse event informations.
 2017-02-23 11:43:30 -03:00
Ghazi Triki
b263058e68 Re-activate kick user hotkey. 2017-02-23 13:44:48 +01:00