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

4767 Commits

Author SHA1 Message Date
perroned
eb5eb45669 Moves deskshare browser checks into central location 2016-04-02 19:59:58 -05:00
perroned
5ab6e5b960 Checks for Edge browser on deskshare publish window 2016-04-02 19:45:27 -05:00
perroned
088d3eb4cd Linker checks for Edge browser 2016-04-02 19:32:29 -05:00
perroned
6bce9350cb Adds Edge browser warning to en_US locale 2016-04-02 19:31:34 -05:00
perroned
388ff0705c Moves verto credentials to config.xml 2016-04-01 14:47:40 -05:00
perroned
98e9857466 Remove toolbar code from WebRTC manager 2016-04-01 14:01:29 -05:00
perroned
4273c2592f Shows Java errors and prevents multiple windows 2016-04-01 12:37:54 -05:00
perroned
f3d62424b9 Turns off deskshare share button when sharing stops 2016-04-01 10:41:45 -05:00
Ghaz Triki
bb6d62e071 Implemented video chat for web and mobile clients. 2016-04-01 15:34:54 +01:00
perroned
669ddb7b79 Merge remote-tracking branch 'anton/mod-verto-1' into mod-verto-1 2016-03-31 15:55:19 -05:00
perroned
12fd493018 Close viewer window when stream stops 2016-03-31 15:44:27 -05:00
Richard Alam
76619f8064 Merge latest bbb-1.1-dev branch 
Merging changes to flex4 build using gradlefx
 2016-03-31 15:21:36 +00:00
Anton Georgiev
095680cd46 resolve import issues 2016-03-30 17:34:34 -04:00
Anton Georgiev
6537e8a091 make webrtc view event distinct and use it 2016-03-30 17:33:27 -04:00
perroned
caa9778049 Close view/publish window when no longer viewing 2016-03-28 14:15:17 -05:00
Richard Alam
7d5c9d63e4 Upgrade to Java 8 
Upgrade to Java 8 and merge screenshare feature.

Conflicts:
	bigbluebutton-client/.actionScriptProperties
 2016-03-21 20:19:48 +00:00
Richard Alam
7a8efcc23f Merge PR 3054 from master 
Merging PR 3054 (https://github.com/bigbluebutton/bigbluebutton/pull/3054)
 from the master branch.
 2016-03-21 18:53:18 +00:00
Richard Alam
a684aa4dfc Merge into bbb-1.1.dev 
Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch.

Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2016-03-21 18:12:30 +00:00
Richard Alam
7fe44355d4 Merging breakout rooms with the master branch 
Merge breakout rooms feature with master branch. This
 also includes closed captioning feature.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-web/.classpath
	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-03-21 17:52:23 +00:00
Ghaz Triki
83a39bdc1c Make NameItemRenderer use the displayName property instead of name for the label. 2016-03-17 21:27:33 +01:00
Ghaz Triki
e129e4483a Refresh users ArrayCollection when updating breakout rooms users. 2016-03-17 21:09:27 +01:00
Ghaz Triki
5077b31415 Updates iteration through users for setting and usnetting breakout room number. 2016-03-17 17:47:21 +01:00
Ghaz Triki
fdde9f285a Show breakout room number before the user name. 2016-03-17 17:20:09 +01:00
Ghaz Triki
07d3028d10 Fetch all breakout rooms users and decorate BreakoutRoom class to display their the number of a breakout room users. 2016-03-16 19:12:10 +01:00
Ghaz Triki
6a559b05ec Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2016-03-16 14:27:41 +01:00
Ghaz Triki
618c01a442 Merge branch 'master' into close-popups-at-logout 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
 2016-03-16 08:15:59 +01:00
Richard Alam
3fca40ba36 Merge pull request #3053 from riadvice/fix-shortcuts-locale-switch 
Refresh the shortcuts ArrayCollection.
 2016-03-15 13:31:00 -04:00
Richard Alam
ab8055d11a Merge pull request #3052 from riadvice/client-improve 
Minor client improvements
 2016-03-15 13:29:55 -04:00
Ghaz Triki
bf97322f67 Updated breakout room meeting name. 2016-03-15 18:12:03 +01:00
Ghaz Triki
d5bc96c668 Reverted back navigate to logout URL. 2016-03-11 23:04:05 +01:00
Ghaz Triki
e0273aac7d Containers created with PopUpManager and toolbars are removed from the display list when the user is logged out from the application. 2016-03-11 23:02:10 +01:00
Ghaz Triki
5608889fd0 - Extracted locales strings from views. (reverted from commit 0b32f39041) 
- Removed no more used ChromeChangeMicImage and FirefoxChangeMicImage.
 2016-03-11 22:00:14 +01:00
Ghaz Triki
d435f7dd55 Refresh the shortcuts ArrayCollection. 2016-03-11 17:48:25 +01:00
Ghaz Triki
0b32f39041 Extracted locales strings from views. 2016-03-11 17:33:30 +01:00
Ghaz Triki
41e198f7b1 By accepting to join breakout room the user leaves the conference audio. 2016-03-11 15:51:16 +01:00
Ghaz Triki
9e33fd3024 No mute all expect the me is triggered when creating a breakout room. 2016-03-11 15:51:10 +01:00
Ghaz Triki
97b9fc70e2 Breakout rooms action column is not visible for viewers. 2016-03-11 15:47:23 +01:00
kristinfjola
b7119288f3 Correct images for emojis 2016-03-11 09:48:27 +01:00
kristinfjola
61f8c685e8 Emojis added for applause, thumbsUp and thumbsDown 2016-03-10 17:07:49 +01:00
Ghaz Triki
bf88560dca Center AudioSelectionWindow images and buttons. 2016-03-10 15:47:48 +01:00
Ghaz Triki
a9150c0b24 Fix the Flash debug error when client logging out. 2016-03-10 15:31:12 +01:00
Tiago Daniel Jacobs
e7c8f98e34 Stop applying initial layout to moderators. bigbluebutton/bigbluebutton#2710 2016-03-05 14:43:41 -03:00
Anton Georgiev
a0aebf3cdc Merge branch 'screenshare-with-cursor-capture' of github.com:ritzalam/bigbluebutton 2016-03-05 16:50:13 +00:00
Ghaz Triki
871843d4ec Fix session token redirection merge. 2016-03-02 12:39:57 +01:00
perroned
a605d1c0aa prevent WebRTC view window when Java publishing 2016-02-29 12:59:49 -08:00
perroned
6611d9414c prevent Java view window when WebRTC publishing 2016-02-29 12:58:03 -08:00
Ghaz Triki
990e786340 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-web/.classpath
#	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-02-28 21:34:33 +01:00
Richard Alam
f7995e8461 - disable region share button for Mac OS as avfoundation only captures full screen 2016-02-26 16:06:11 +00:00
Fred Dixon
de9ba3e0a9 Fix missing get_flash_player.gif error message in nginx logs 2016-02-26 07:20:25 -05:00
perroned
1aefd7ccae enable fallback to Java 2016-02-24 11:56:18 -08:00
perroned
a819652916 updating callbacks 2016-02-24 11:49:48 -08:00
perroned
f4e5cf0c8e update success and logging callbacks 2016-02-23 15:19:17 -08:00
perroned
5652417e02 normalize all callbacks passed when starting ds 2016-02-23 15:18:10 -08:00
perroned
65650d3484 normalizing callbacks 2016-02-23 15:16:39 -08:00
perroned
4be5b80a86 update callback passed from AS 2016-02-23 14:08:42 -08:00
perroned
57ab378961 library comments 2016-02-23 14:06:45 -08:00
perroned
f486b24041 Firefox error handling 2016-02-23 14:06:24 -08:00
perroned
a42c9765f7 Firefox error handler when DS fails 2016-02-23 14:01:49 -08:00
Ghaz Triki
7e759d35c5 Revert back the breakout rooms label once all rooms have been closed. 2016-02-23 18:58:49 +01:00
Ghaz Triki
93140364f9 Display breakout room timer in the parent room. 2016-02-23 17:47:25 +01:00
perroned
56a8bc78d5 fixed message typo 2016-02-22 07:42:10 -08:00
perroned
0f6a7cc7a2 remove extension identifier from webrtc manager 2016-02-22 07:41:53 -08:00
perroned
581e7b0e02 Add extension key entry to config xml 2016-02-22 07:34:17 -08:00
perroned
ad6a0402d1 adding history of addition to library 2016-02-22 06:34:19 -08:00
Tiago Daniel Jacobs
ac1990f426 Fix bigbluebutton/bigbluebutton#2710 (attempt 2) 2016-02-18 01:49:17 -02:00
perroned
ed7fbcf0e3 divide up code paths between chrome/ff and html5/flash 2016-02-17 12:33:49 -08:00
perroned
05488dda5d Firefox deskshare presenter 2016-02-17 12:30:24 -08:00
perroned
eb15680b4a documentation for modification to FSRTC lib with call types 2016-02-17 12:27:27 -08:00
perroned
1894d7e1e2 documentation for modification to FSRTC lib 2016-02-17 12:26:46 -08:00
Richard Alam
86323e2c1d - add new mac osx jar 2016-02-17 16:59:55 +00:00
perroned
a91eab1e05 temp fix for deskshare on Firefox 2016-02-17 08:17:10 -08:00
Tiago Daniel Jacobs
f8c050aa25 Fix bigbluebutton/bigbluebutton#2710 2016-02-16 23:17:32 -02:00
perroned
8b0fcccd1f Fixed typo 2016-02-16 09:39:06 -08:00
perroned
b8317aceec Update WebRTC event to share 2016-02-16 09:02:00 -08:00
perroned
944cb057bf Add browser queries 2016-02-16 08:59:52 -08:00
perroned
7aa0f7b02a More config options 2016-02-16 08:59:18 -08:00
perroned
26f70f26be Add fallback to Java from WebRTC 2016-02-16 08:53:55 -08:00
perroned
266af159ed share the same button event 2016-02-16 08:34:48 -08:00
perroned
dedd00727a extra check for extension 2016-02-16 08:33:27 -08:00
perroned
d5057dbb74 Callback for html5/flash fix 2016-02-16 08:32:30 -08:00
Ghaz Triki
87a45faa6e When a breakout room is created, all participants are muted except the one who have triggered the breakout rooms creation. 2016-02-15 19:57:08 +01:00
Ghaz Triki
7d15545604 The moderator who is creating breakout rooms autoatically goes to the unassigned users list. 2016-02-15 19:27:34 +01:00
Richard Alam
dd37445b7d - screenshare client 2016-02-10 19:43:38 +00:00
Ghazi Triki
ed7a0e6bdb Updated client locales. 2016-02-10 17:30:43 +01:00
Ghazi Triki
bbd08ed960 Added TimerUtil.as class. 2016-02-10 17:23:43 +01:00
Ghazi Triki
6844ce396e Display breakout room timer in the chat box. 2016-02-10 15:23:52 +01:00
Chad Pilkey
7687d9dd00 show chat options tab when private chat disabled 2016-02-09 11:15:17 -08:00
Chad Pilkey
9e0c169c5d removed undefined emoji tooltip strings 2016-02-08 15:09:05 -08:00
Richard Alam
6eb7c446e1 Merge pull request #3007 from capilkey/1.0-access-bugfix1 
Four minor accessibility fixes
 2016-02-08 17:22:36 -05:00
Chad Pilkey
9264f50ae5 adjusted the ShortcutWindow sizing 2016-02-08 13:07:47 -08:00
Chad Pilkey
d5db28ac3c removed unused functions from JS 2016-02-08 13:07:08 -08:00
Chad Pilkey
c40087ffac fixed some html labelling in the client 2016-02-08 13:06:34 -08:00
Chad Pilkey
addfe4e502 increase contrast on some font colours 2016-02-08 13:02:00 -08:00
Ghazi Triki
da81a1bd72 Only display the number of users in breakout rooms list. 2016-02-08 21:03:35 +01:00
Ghazi Triki
c10beecd48 Updated transfer audio icon and tooltip. 2016-02-08 19:18:27 +01:00
Fred Dixon
f1d322f3e2 Added Low Latency (h.263) profile 2016-02-08 12:11:48 -05:00
perroned
e1650d7abd early WebRTC deskshare views 2016-02-04 11:41:41 -08:00
perroned
8ba3a21680 WebRTC deskshare managers 2016-02-04 11:39:20 -08:00
perroned
9f2cfa8f35 WebRTC deskshare services 2016-02-04 11:36:14 -08:00
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