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

4618 Commits

Author SHA1 Message Date
perroned
93ce166d46 WebRTC deskshare event map 2016-02-04 11:23:55 -08:00
perroned
50832abc5f Add WebRTC deskshare events 2016-02-04 11:23:28 -08:00
perroned
cb628d085b Added new WebRTC event map 2016-02-04 11:21:55 -08:00
perroned
0f35624b82 Remove WebRTC deskshare from build 2016-02-04 11:21:04 -08:00
Richard Alam
5d2ab077cb Merge pull request #2999 from ritzalam/make-desktop-sharing-stop-when-tunneling 
- desktop sharing doesn't stop when the applet is tunneling. Catch t…
 2016-02-04 14:20:38 -05:00
Richard Alam
328c948156 Merge pull request #2997 from capilkey/fix-2437-regression 
Put the fix for #2437 back in
 2016-02-04 14:19:24 -05:00
perroned
c13be65fe0 Update message receiver for WebRTC events 2016-02-04 11:18:16 -08:00
perroned
4c98822201 Add WebRTC option to config XML 2016-02-04 11:14:55 -08:00
Richard Alam
dbf02ba36e - desktop sharing doesn't stop when the applet is tunneling. Catch the exception and stop the applet. 2016-02-04 19:13:47 +00:00
perroned
b4649b41a2 Add explicit data type for messages 2016-02-04 11:10:03 -08:00
perroned
e3bc716ddf Move shared browser functions into BrowserCheck 2016-02-04 11:08:54 -08:00
perroned
5d39cd4cf4 Remove separate webrtc deskshare module 2016-02-04 10:53:03 -08:00
Chad Pilkey
1da5edfd35 changed the flash client canvas height to calculated value 2016-02-03 15:30:58 -08:00
Ghazi Triki
2fb347bc25 Refactored the way that conference transfer between the parent room and breakout room is requested. 2016-02-03 22:30:08 +01:00
Felipe Cecagno
438e90a2e1 fix duplicated publish video windows after reconnection #2808 
The problem was that we were handling the reconnecton succeeded event to start streaming again, but this event is dispatched for every connection, not only for the video connection, and it was causing restream to be called multiple times after the reconnection, eventually duplicating the publish windows; when it occurred, the user was publishing two separate video streams.
The solution was to use the ConnectedEvent used only by the video connection, which also carries the information if that connection is due to a reconnect.
It looks like the current solution to restream after a reconnect doesn't work if the user was publishing two cameras at the same time. In that case, I think only the second camera will be published again.
 2016-02-03 10:29:01 -02:00
Ghazi Triki
4d632830c9 Breakout rooms cannot be broken up. 2016-02-02 20:21:22 +01:00
Ghazi Triki
2758075d8b Only one beakout room listen button can be selected at a time. 2016-02-02 19:08:21 +01:00
Ghazi Triki
63aa16f627 Fixed users list in breakout room. 2016-02-02 17:14:46 +01:00
Fred Dixon
3dbfd83747 Load get_flash_player.gif from BigBlueButton server 2016-01-30 11:32:25 -05:00
Fred Dixon
ef79077e09 Fixed undefined error when loading BigBlueButton.html 2016-01-30 11:31:35 -05:00
Felipe Cecagno
7804e734e4 fix #2985 
close button on the publish window now closes both remote and local windows
 2016-01-29 17:29:39 -02:00
Ghazi Triki
f2ed01883b Change listen button to toggle button. 2016-01-28 22:05:51 +01:00
Ghazi Triki
edef66357c Fixed TransferUserToVoiceConfRequestMessage properties names. 2016-01-28 19:11:43 +01:00
Ghazi Triki
16bd601735 Use ListenInOnBreakout event from client instead of TransferUserToMeeting. 2016-01-27 22:25:15 +01:00
Chad Pilkey
58380dd6fd added more descriptive tooltips for the emoticon buttons 2016-01-27 12:36:54 -08:00
Ghazi Triki
4ec70d8d7a Deleted old breakout module Flex client classes. 2016-01-27 17:22:56 +01:00
Ghazi Triki
70bd8cecb6 Minor improvements for client breakout GUI. 2016-01-27 17:09:19 +01:00
Ghazi Triki
0385d05001 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	akka-bbb-apps/build.sbt
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
#	akka-bbb-fsesl/build.sbt
#	bbb-common-message/build.sbt
#	bigbluebutton-apps/build.gradle
#	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2016-01-27 14:16:05 +01:00
Ghazi Triki
9b66cf30f9 Added transfer user from the parent voice conference to a selected breakout voice conference. 2016-01-27 12:00:32 +01:00
Ghazi Triki
b8a97062d8 Fixed typo in bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as 2016-01-25 14:01:09 +01:00
Ghazi Triki
4f30127003 Ending a breakout room message goes to to bbb-web to be handled then send the response back to the client trgouh akka-apps and bbb-apps. 2016-01-23 18:44:50 +01:00
Chad Pilkey
416cbbf7bc Merge pull request #2973 from capilkey/1.0-minor-fixes 
Minor UI changes for the Flash client
 2016-01-22 19:25:19 -05:00
Chad Pilkey
d90643fc77 update the client copyright to 2016 2016-01-22 16:12:54 -08:00
Chad Pilkey
f7f6d81a37 shorten the copyright string in the client footer 2016-01-22 15:53:16 -08:00
Chad Pilkey
4062aa02db significantly reduce the volume of the chat audio cue 2016-01-22 15:02:12 -08:00
Chad Pilkey
a2203ad5e6 unbold the lock settings categories in the popup 2016-01-22 14:52:45 -08:00
Chad Pilkey
d34616d3d2 add separation between chat time and border 2016-01-22 14:50:10 -08:00
Ghazi Triki
c8df5a4ead Create breakout rooms item menu should not be displayed when the room is already broken out. 2016-01-22 16:52:34 +01:00
Ghazi Triki
85bb2fd47b Display breakout room users list. 2016-01-22 16:50:19 +01:00
Tiago Daniel Jacobs
fc728bf1be Fixes #2768 2016-01-21 22:56:48 -02:00
Ghazi Triki
1dd4ddd6cb Created breakout rooms are now displayed in breakout rooms list. 2016-01-21 20:09:32 +01:00
Chad Pilkey
58292b198d Merge pull request #2964 from ritzalam/do-not-reconnect-when-user-kicked 
Do not reconnect when user kicked
 2016-01-20 11:55:49 -05:00
Richard Alam
726e9e1fb0 - change wording on logout window when a user gets kicked out of the meeting. 2016-01-20 15:21:55 +00:00
Felipe Cecagno
a0aff7b3fc Merge pull request #2951 from LucasMFreire/fix-video-windows 
Fixed unclosed video windows bug
 2016-01-19 16:38:56 -02:00
perroned
6a14cdc05d flash update hangup deskshare 2016-01-19 10:37:42 -08:00
perroned
7d8610b68c hangup debug information 2016-01-19 10:33:05 -08:00
Felipe Cecagno
93620df0b8 implement the same protection we did for publish on view 2016-01-19 16:32:05 -02:00
Richard Alam
36cff83b6f - tell user that he has been ejected from the meeting. 2016-01-19 16:58:14 +00:00
perroned
e983919b88 configuring server credentials and fixed Flash gUM issues 2016-01-19 08:22:17 -08:00
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Fred Dixon
066749e4ca Updated text for logout message: 2016-01-19 08:57:34 -05:00
Fred Dixon
3e153efe5f Merge pull request #2961 from capilkey/chat-audio-cue-cont 
Changes to the chat audio cue control
 2016-01-18 18:07:54 -05:00
Chad Pilkey
c7f88fd180 made the chat audio cue usable by all users 2016-01-18 11:15:16 -08:00
perroned
77a6dd586d Support for html5 and Flash 2016-01-18 07:29:42 -08:00
perroned
0868322bb5 verto credentials 2016-01-18 07:29:03 -08:00
perroned
2216bf89a0 adding verto libraries 2016-01-18 07:24:13 -08:00
Ghazi Triki
11fefc5c83 isBreakout property in JoinService response should be handled as a boolean not as a string 2016-01-17 20:03:29 +01:00
Ghazi Triki
058a2170ee Added request breakout rooms list feature. 2016-01-15 22:13:53 +01:00
Chad Pilkey
f08f38f6d3 Merge pull request #2949 from capilkey/webrtc-reconnect 
Reduce WebRTC reconnect attempts
 2016-01-15 12:10:33 -05:00
Richard Alam
d79d763857 Merge branch 'reconnect-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-reconnect-fixes 2016-01-14 19:43:08 +00:00
LucasMFreire
9c099aeb67 Fixed unclosed video windows bug 2016-01-14 14:59:13 -02:00
Ghazi Triki
b24ae090b0 Returning isBreakout conference state in join and enter API calls. 2016-01-14 17:15:36 +01:00
Chad Pilkey
1bc100f4c7 reduced webrtc retry attempts from 5 to 3 2016-01-13 13:05:22 -08:00
Chad Pilkey
008d59c85d Merge pull request #2947 from mconf/webrtc-reconnect 
WebRTC reconnect
 2016-01-13 15:25:33 -05:00
perroned
279f40a4c2 Updated Flash clients deskshare libs 2016-01-13 12:03:52 -08:00
Ghazi Triki
b42772c2f4 Fixed remaining time display in the breakout rooms. 2016-01-13 20:18:34 +01:00
Ghazi Triki
3f049ec644 Added more scala worksheet to test breakout room feature. 2016-01-13 18:20:51 +01:00
Pedro Beschorner Marin
afb1cc44d6 Fixed SIP mic reconnection 2016-01-13 15:01:04 +00:00
Pedro Beschorner Marin
28bf1c9084 Fixed global audio reconnection 2016-01-13 13:50:38 +00:00
Ghazi Triki
772e5edb16 End all breakout rooms in client made visible. 2016-01-13 12:14:01 +01:00
Ghazi Triki
48844648ee Send RequestBreakoutJoinUrl from client to server. 2016-01-12 20:18:23 +01:00
Felipe Cecagno
0660f7ebf4 remove pt_BR translation 2016-01-12 15:55:22 -02:00
Felipe Cecagno
d98bee07cf Merge webrtc-reconnect into bigbluebutton/master 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2016-01-12 15:27:01 -02:00
Ghazi Triki
b8cb8eba66 Fixed disconnection issue generated by a null error the breakout rooms list. 2016-01-12 16:49:56 +01:00
Ghazi Triki
7b6583461b Fix locale names for breakout room join prompt. 2016-01-12 15:36:13 +01:00
Chad Pilkey
3422070be6 fix issue #2788 2016-01-08 15:20:29 -08:00
Chad Pilkey
8c0f2db056 fix issue #2789 2016-01-08 15:07:39 -08:00
Chad Pilkey
3e9d6348ff update the video module to conform for accessibility 2016-01-08 15:00:23 -08:00
Richard Alam
838d6e0ad7 - merge Chad's closed caption work into Ghazi's breakout rooms work 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
 2016-01-08 19:06:42 +00:00
Chad Pilkey
21d14aaa01 fixed the TabIndexer 2016-01-07 14:32:13 -08:00
Anton Georgiev
8ee6356b5a accommodate late joiners 2015-12-22 16:21:39 +00:00
Chad Pilkey
33cbce9600 add new ownership to caption client code 2015-12-21 11:17:46 -08:00
Anton Georgiev
09a870296d reuse hover string from other ds method; skip chat notific on ds start/end 2015-12-14 20:45:46 +00:00
Anton Georgiev
105fb2495d avoid issues oberved in verto 2015-12-11 16:45:36 +00:00
Chad Pilkey
71f8ff085f first try and adding caption ownership 2015-12-09 14:00:26 -08:00
Anton Georgiev
97bcb025b6 add webrtc deskshare module; comment out old deskshare module 2015-12-09 20:36:37 +00:00
LucasMFreire
730e1bc40f flex4 additions 2015-12-02 14:33:58 -02:00
LucasMFreire
e0e3a94f2f web-client video chat 2015-12-02 14:33:57 -02:00
Anton Georgiev
7bf1d4ce8c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3 
Conflicts:
	record-and-playback/core/scripts/bigbluebutton.yml
 2015-11-30 21:44:04 +00:00
Anton Georgiev
8ced2a3207 remove hardcoded defaults. Grab on the go 2015-11-30 21:20:56 +00:00
Chad Pilkey
3036a9740b caption module now tracks TextArea updates 2015-11-23 12:56:52 -08:00
Ghazi Triki
27dcead4d6 Fixed duplicate users and breakout rooms when creating breakout rooms. 2015-11-23 13:42:46 +01:00
Ghazi Triki
78c4045d41 Handled breakout join URL in the client. 2015-11-23 11:50:47 +01:00
Chad Pilkey
d1a939b797 Correct the presentation back button enabled check 2015-11-19 09:45:44 -05:00
Chad Pilkey
e8b30b626b Removed three unused polling shortcuts 2015-11-18 07:51:48 -05:00
Richard Alam
68f9cb8689 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 2015-11-18 03:14:01 -05:00
Ghazi Triki
c27a9baf5b Fixed the number of breakout rooms to create when sending the message from the client. 2015-11-19 16:54:32 -02:00
Richard Alam
0c2a2e6ce1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into breakout-rooms-porto-algre-2015 2015-11-17 23:25:54 -05:00
Ghazi Triki
99b852f69c Better .actionScriptProperties eclipse configuration. 2015-11-18 11:13:25 -02:00
Richard Alam
39d9c5dd15 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
 2015-11-17 02:19:48 -05:00
Ghazi Triki
4e8334d7c3 MessageSender sends json messages for the breakout actions. 2015-11-17 19:09:13 -02:00
Ghazi Triki
6dbd97b138 Breakout rooms datagrid events dispatched from actions column. 2015-11-17 17:30:10 -02:00
Ghazi Triki
b370c36dde Display the number of remaining minutes for the breakout rooms. 2015-11-17 11:33:14 -02:00
Richard Alam
bd8b38a22c - use spray json to decode messages 2015-11-17 02:11:14 -05:00
Ghazi Triki
165b3d6103 Fixed BreakoutRoomSettings style. 2015-11-16 17:32:16 -02:00
Ghazi Triki
402f337fd6 Handle CreateBreakoutRoomsRequest case in BigBlueButtonInGW.scala 2015-11-16 17:09:38 -02:00
Chad Pilkey
8d321b2493 Merge pull request #2849 from riadvice/client-fixes 
Minor Client fixes
 2015-11-16 07:35:39 -05:00
Chad Pilkey
98c88558f2 trying a different approach to respond to changes to the text box 2015-11-13 15:30:32 -08:00
Ghazi Triki
8b1f0d4bae Added EndAllBreakoutRoomsRequest broadcast from client to bigbluebutton-apps. 2015-11-12 22:24:10 +01:00
Ghazi Triki
2914e9105d Handle the incoming message for TimeRemainingUpdate. 2015-11-12 17:08:39 +01:00
Ghazi Triki
d29b8f3b77 - Implemented addBreakoutRoom and updateBreakoutRoomUsers in the Flex client. 
- Created a new BreakoutRoom class.
 2015-11-12 16:05:26 +01:00
Ghazi Triki
3b84120074 Create breakout rooms event parameters are correctly filled from user choices. 2015-11-11 22:18:49 +01:00
Ghazi Triki
423c0c0ecd String localised for the breakout room feature. 2015-11-11 20:25:30 +01:00
Ghazi Triki
f910e95a45 Added more implementations for Breakout Room messages: BreakoutRoomJoinURL, BreakoutRoomStarted, TimeRemainingUpdate and UpdateBreakoutUsers. 2015-11-11 16:47:49 +01:00
Chad Pilkey
8463325ce3 added a client side audio queue when you leave the voice conference 2015-11-09 11:38:30 -08:00
Richard Alam
8f83ada786 - update locales 2015-11-06 21:02:31 +00:00
Chad Pilkey
efd66d2906 blocked video mute/unmute when locked 2015-11-05 14:14:04 -08:00
Ghazi Triki
0bf3fc7677 Create breakout rooms request sent via UserService. 2015-11-05 18:35:11 +01:00
Chad Pilkey
42236569a5 update sip.js to include a ice candidate timeout 2015-11-04 16:44:55 -08:00
Chad Pilkey
03d2a376ad added in a 30s total timeout on iceGathering 2015-11-04 16:44:15 -08:00
Chad Pilkey
f2d997c0bf changed retrived annotation from DrawObject to Object 2015-11-04 13:25:28 -08:00
Chad Pilkey
2d9d28f638 added a new caption message to push current line 2015-11-03 15:44:26 -08:00
Ghazi Triki
3aa8bf3430 Merge remote-tracking branch 'ritzalam/try-using-event-bus' into breakout-rooms 2015-11-03 17:48:59 +01:00
Ghazi Triki
9d4c0ca0a5 Improved Breakout rooms UI. 2015-10-27 16:49:38 +01:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Anton Georgiev
e5d6bb2b0e remove shared object 2015-10-22 20:35:39 +00:00
Richard Alam
2b3e38c45b Merge branch 'breakout-rooms' of https://github.com/riadvice/bigbluebutton into breakout-rooms-wip 2015-10-22 19:54:44 +00:00
Anton Georgiev
8448296829 display presenter preview when the stream is available, not earlier 2015-10-21 19:48:08 +00:00
Anton Georgiev
44cb8a28c3 use event for ds stop, move out js calls 2015-10-21 19:31:27 +00:00
Anton Georgiev
082be725be end ds on <close> in preview 2015-10-21 18:12:38 +00:00
Richard Alam
c9b4f7e9a0 Merge branch 'support-multiple-logins' into add-http-to-akka-apps 
Conflicts:
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
 2015-10-21 17:44:44 +00:00
Anton Georgiev
8785fafb91 remove cursor code. now cursor comes embedded in video 2015-10-21 15:57:00 +00:00
Anton Georgiev
c7e0f0211d remove extra buttons on presenter preview 2015-10-21 15:34:51 +00:00
Ghazi Triki
083aeb42c8 Improved presentation backButton and forwardButton buttons styles. (reverted from commit eb5371d90c with custom update) 2015-10-20 22:31:48 +01:00
Anton Georgiev
08f9cf5b21 change name to startVideo 2015-10-20 19:08:56 +00:00
Anton Georgiev
8a2bc3a420 preview window for presenter displays the stream now 2015-10-20 17:53:10 +00:00
Ghazi Triki
516740bc88 Removed polling shorcuts from ShortcutHelpWindow. 2015-10-19 18:33:33 +01:00
Richard Alam
8beff5f717 Merge pull request #2843 from ritzalam/update-deskhare-jar 
- new jar signed with cert that expires on oct 30, 2017
 2015-10-16 15:48:10 -04:00
Richard Alam
5e190e9578 - new jar signed with cert that expires on oct 30, 2017 2015-10-16 19:47:01 +00:00
Chad Pilkey
9f277583c2 the client responds to the first two caption messages 2015-10-15 15:42:01 -07:00
Chad Pilkey
0fa6660ed9 removed a doubled debug line 2015-10-15 15:32:26 -07:00
Calvin Walton
b4e3561fa6 Update Firefox 41 hang workaround for 41.0.2 2015-10-15 14:05:12 -04:00
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Ghazi Triki
99f6ab2499 Minor CSS fixes. 2015-10-10 14:30:39 +01:00
Ghazi Triki
eb5371d90c Improved presentation backButton and forwardButton buttons styles. 2015-10-10 12:37:32 +01:00
Richard Alam
197669ebc4 - add a timeout when to expect response to validate token. If we don't get a response, 
log it. This might mean that we run into issue where the reply from server isn't
   getting propagated back into the client.
 2015-10-08 18:28:25 +00:00
Richard Alam
c995a7a587 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-08 14:34:02 +00:00
Richard Alam
d89a34209d - make presentation api use session 2015-10-07 21:44:01 +00:00
Richard Alam
c5b5b11725 - check if user has sessionToken 2015-10-07 20:34:37 +00:00
Richard Alam
c182f85403 - use sessionToekn on signOut API call 2015-10-07 16:09:31 +00:00
Anton Georgiev
a38f5b642a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-07 15:10:55 +00:00
Anton Georgiev
0f5c19e13b reset userAgent and callerIdName so we can switch between audio joining modes 2015-10-07 15:09:08 +00:00
Richard Alam
7968273501 - pass sessionToken to get configXML from bbb-web 2015-10-06 21:08:01 +00:00
Richard Alam
91fbc8c10c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-06 19:02:52 +00:00
Richard Alam
e53ed90859 Merge pull request #2823 from ritzalam/fix-demo11-api-example 
- convert all external ids in js api into internal user ids as using…
 2015-10-06 15:00:33 -04:00
Richard Alam
a2cf908425 - convert all extarnal ids in js api into internal user ids as using external user ids breaks when 
a user joins twice into the meeting
 2015-10-06 17:57:39 +00:00
Richard Alam
6cf23b5511 - try to figure out why we get into infinite loop when calculating dependencies 2015-10-06 14:45:58 +00:00
Richard Alam
e2533f1f0c - load config.xml first before doing anything else 2015-10-05 20:06:35 +00:00
Chad Pilkey
6f69330b77 Added scrolling dots to the reconnect popup 2015-10-05 12:26:44 -07:00
Richard Alam
83e2d3c146 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins 2015-10-05 16:01:59 +00:00
Richard Alam
c3aa194e00 - update to latest locales (oct 5, 2015) 2015-10-05 15:59:07 +00:00
Richard Alam
50a55481f5 Merge branch 'master' into support-multiple-logins 2015-10-05 15:33:33 +00:00
Richard Alam
f20b919ec2 Merge pull request #2818 from kepstin/ff-41-0-1-hang-workaround 
Workaround Firefox 41.0.1 hang on Windows
 2015-10-05 11:32:43 -04:00
Richard Alam
93ba04ce4c Merge pull request #2814 from capilkey/fix-2810 
Fix 2810
 2015-10-05 11:32:34 -04:00
Calvin Walton
dbd79cebb5 Workaround Firefox 41.0.1 hang on Windows 
On this particular browser, switch the Flash embed window mode to "opaque"
instead of "window". This causes buttons and right-click to be somewhat
unresponsive, but is still better than a complete browser hang.

The browser versions that the workaround is applied to is extremely limited,
because of the sideeffects.
 2015-10-05 11:26:31 -04:00
Richard Alam
3918dd3238 - try to figure out when configXml gets loaded 2015-10-05 15:22:39 +00:00
Chad Pilkey
81ced7193b Only show annotations for the current whiteboard 2015-10-02 15:03:40 -07:00
Chad Pilkey
04ce742fd7 Make sure whiteboard text is published to the correct whiteboardID 2015-10-02 15:02:13 -07:00
Anton Georgiev
76dfc1eb27 remove unrelated code 2015-10-01 19:54:19 +00:00
Anton Georgiev
dbc0a59c4f add a webrtcDeskShare module (init version) 2015-09-30 21:29:54 +00:00
Richard Alam
5dd139f2f4 - do not user external user id to find user 2015-09-30 20:07:05 +00:00
Anton Georgiev
d9a706c862 Revert webrtc code from old deskshare.A new module is coming 2015-09-30 19:28:59 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Ghazi Triki
123bf12798 Updated breakout rooms box style. 2015-09-30 09:27:13 +01:00
Ghazi Triki
6474117fd4 Show the number of users in breakout rooms instead of the room activity. 2015-09-30 09:23:52 +01:00
Chad Pilkey
65176f3cc1 initial captioning client commit 2015-09-29 13:16:45 -07:00
Ghazi Triki
7565c2277f Display breakout rooms in the users list. 2015-09-29 13:43:46 +01:00
Chad Pilkey
0627afa2e5 Add a default message length to avoid issues of missing property 2015-09-24 14:17:07 -07:00
Chad Pilkey
4c4d35a760 Merge pull request #2787 from riadvice/chat-message-limit 
The use is able to write a multi-line chat message.
 2015-09-24 17:15:43 -04:00
Anton Georgiev
4253faa426 remove extra condiction 2015-09-24 16:05:41 +00:00
Anton Georgiev
2bd601cc08 simplify html5 redirect #2801 2015-09-24 15:58:17 +00:00
Anton Georgiev
07dfd89dd7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2015-09-23 21:24:34 +00:00
Anton Georgiev
6cfc16cde5 offer redirect to HTML5 only if available 2015-09-23 21:24:19 +00:00
Richard Alam
ee7ef24397 - change fielname to be the same as on server 2015-09-23 20:04:39 +00:00
Ghazi Triki
03eda0f072 First implementation of the breakout rooms window. 2015-09-22 18:07:00 +01:00
Chad Pilkey
e9c0eb23cd rename bbb-client in .project file for better importing 2015-09-21 14:13:32 -07:00
Chad Pilkey
15a2ade0aa Merge remote-tracking branch 'ritzalam/fix-lock-settings' into investigate-locking-more 2015-09-21 13:50:44 -07:00
Chad Pilkey
d0366b2fba Make sure PhoneOptions are initialized before using 2015-09-21 13:46:16 -07:00
Chad Pilkey
6377f86ca1 make sure the user item renderers update when locking changes 2015-09-21 13:45:18 -07:00
Chad Pilkey
a736008046 fix locking being reversed 2015-09-21 13:44:23 -07:00
Richard Alam
11fbefb5ef - make lock settings behave like in 0.9 2015-09-21 20:42:04 +00:00
Richard Alam
5a986f5bc6 - change logging format 2015-09-21 13:55:23 +00:00
Ghazi Triki
57d94bd5e4 The use is able to write a multi-line chat message. 2015-09-17 10:37:56 +01:00
Ghazi Triki
920fc97532 Merge branch 'master' into client-logging-to-server 2015-09-16 21:11:33 +01:00
Richard Alam
c13e17a7d4 Merge pull request #2770 from riadvice/chat-message-limit 
Add a maximum allowed length to chat message
 2015-09-16 15:04:26 -04:00
Ghazi Triki
07d7f389c1 Logging format can be configured in flex client application. 2015-09-16 18:55:09 +01:00
Richard Alam
cc5c26b0bc Merge pull request #2785 from ritzalam/log-flash-capabilities 
Log flash capabilities
 2015-09-16 10:39:52 -04:00
Richard Alam
899b98f81b Merge pull request #2780 from riadvice/puffin-browser 
Enable video and audio sharing for Puffin browser 4.6 and above.
 2015-09-15 16:12:25 -04:00
Richard Alam
2bea0c778c - clean-up by removing some debug logs 2015-09-15 20:04:06 +00:00
Richard Alam
99569d7a2b - log flash player capabilities to aid us in debugging issues 2015-09-15 19:20:36 +00:00