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

3838 Commits

Author SHA1 Message Date
Chad Pilkey
7b75de156a update pencil tracking 2016-07-19 10:26:10 -07:00
Ghazi Triki
a2fa88cd20 Fix breakout room display in users list when the user leaves the breakout room. 2016-07-19 10:10:12 +01:00
Richard Alam
7dd38b94be Merge pull request #3225 from ritzalam/fix-client-loggin 
Fix client logging
 2016-07-18 17:44:48 -04:00
Fred Dixon
f9080afe95 Merge pull request #3226 from capilkey/closed-captioning-fixes 
Closed captioning upgrades
 2016-07-18 15:26:25 -06:00
Chad Pilkey
8b1b3b6fee add caption tabindex and localized strings 2016-07-18 14:17:44 -07:00
Chad Pilkey
d7a3e7f40b update the caption UI to new tabbed design 2016-07-18 14:17:44 -07:00
Chad Pilkey
c8301fe571 add copyright message to caption module files 2016-07-18 14:17:43 -07:00
Richard Alam
18442c37bd - change screenshare logging. 2016-07-18 20:34:51 +00:00
Richard Alam
f67f8c848c - initialize client logging. 2016-07-18 20:34:16 +00:00
Ghazi Triki
dfb23f3f6c Minor UI teaks for the breakout rooms. 2016-07-18 15:44:45 +01:00
Fred Dixon
2ec5c4a3eb Merge pull request #3220 from riadvice/breakout-rooms-ui-update 
Minor layout update for breakout rooms
 2016-07-16 12:44:45 -04:00
Ghazi Triki
3b4a403725 Minor layout update for the BreakoutRoomSettings window and BreakoutRooms list in UsersWindow. 2016-07-15 22:21:03 +01:00
Richard Alam
e0b756cce9 Fix issue 3204 
- Need to pass sessionToken to get stuns for webrtc call.
 2016-07-15 18:05:08 +00:00
Richard Alam
c5984219c3 Add help on how to use new screenshare 
Provide a way for users to learn how to use the new screen share as
 the steps to launch it differs depending on OS and browser.
 2016-07-14 19:20:25 +00:00
perroned
c585b313b9 Adds module handlers 2016-07-07 14:56:18 +00:00
Pedro Beschorner Marin
487b39c00e Avoid closing client's videoconf module window when reconnecting 2016-06-30 18:19:46 +00:00
perroned
b505f460dc Begins adding webrtc deskshare to screenshare 2016-06-28 17:15:36 +00:00
perroned
13ffa169c2 Cleaning up 2016-06-17 20:36:45 +00:00
Ghazi Triki
3d21b291cb Added new option "enableBreakoutRooms" to users module. 2016-06-02 21:05:18 +01:00
Richard Alam
aafc420d53 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-24 20:17:47 +00:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.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/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
Richard Alam
433f09f72d Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB 
Conflicts:
	bbb-common-message/build.sbt
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 15:40:50 +00:00
Richard Alam
b0646794ff Merge branch 'merge-v1.0.0-to-master' of https://github.com/ritzalam/bigbluebutton into ritzalam-merge-v1.0.0-to-master 2016-05-20 15:15:39 +00:00
Richard Alam
babedcc6a7 Merge branch 'add-emojis' of https://github.com/delftswa2016/bigbluebutton into delftswa2016-add-emojis 2016-05-20 15:06:42 +00:00
Anton Georgiev
4981344062 Merge branch 'mod-verto-1' of github.com:perroned/bigbluebutton into merge-webrtc-ds 
Conflicts:
	bigbluebutton-html5/app/client/globals_audio.coffee
	bigbluebutton-html5/app/client/verto.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/server.coffee
 2016-05-19 15:48:40 +00:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	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/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
Ghazi Triki
ca63a9e991 Updated RoomActionsRenderer with new icons. 2016-05-09 13:53:10 +01:00
Ghazi Triki
655fa6f707 When changing the selection of beakout rooms number, the "assignUsers" method is called. 2016-05-09 12:15:22 +01:00
Chad Pilkey
ce1adcffc8 fix shortcut key inconsistencies 2016-05-05 16:15:09 -07:00
Chad Pilkey
c9486b6c5e fix issue #3088 2016-05-05 16:14:01 -07:00
Ghaz Triki
4a53c7fcab Updated audio transfer button icons. 2016-05-04 10:26:26 +01:00
Ghaz Triki
9aebb92204 Update layout for breakout rooms settings popup. 2016-05-04 09:59:20 +01:00
Chad Pilkey
dc5bacc578 fix issue #3106 2016-05-03 10:09:30 -07:00
Ghaz Triki
a2f1e12a2d Fixed breakout rooms default users assignation to rooms. 2016-04-27 16:55:24 +01:00
Ghaz Triki
1d8dda4cf8 Only moderator can see breakout room actions column. 2016-04-27 16:41:24 +01:00
Ghaz Triki
5858df5d84 Select firt item by default for the breakout rooms number comobo box. 2016-04-27 15:42:06 +01:00
Ghaz Triki
dca3fd6552 Align in center the darg and drop text hint in BreakoutRoomSettings 2016-04-27 15:36:32 +01:00
Ghaz Triki
ae338736b9 Center the box containing time limit in BreakoutRoomSettings.mxml 2016-04-27 15:34:24 +01:00
Ghaz Triki
1586e4dc8c Better layout for BreakoutRoomSettings.mxml 2016-04-27 15:28:17 +01:00
Ghaz Triki
d64f32dbaf Added custom label function for breakout room datagrid name column. 2016-04-27 14:34:44 +01:00
Ghaz Triki
64068cc30e Updated BreakoutRoomSettings layout and style. 2016-04-27 14:25:32 +01:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00
Ghaz Triki
5f727f36d2 Make the main application as the parent of Alert to be centered. 2016-04-26 20:40:29 +01:00
Ghaz Triki
53ec4e3ae1 Better join breakout room popup centring with custom window size caluclation. 2016-04-26 19:40:36 +01:00
Ghaz Triki
d114c96142 Center breakout room join request popup. 2016-04-26 17:48:09 +01:00
Ghaz Triki
e024a68d42 Only the moderator can see the breakout rooms list. 2016-04-26 17:35:37 +01:00
David Feng
67c14f9056 This enable avatar to be display in other participants video window 2016-04-20 14:08:13 +08:00
Chad Pilkey
fe53999164 Third round of 1.0 accessibility bug fixes 2016-04-19 09:17:14 -07:00
Richard Alam
b9cb2298b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-1.1-dev-java8 2016-04-14 20:05:22 +00:00
perroned
cf5bbdf157 Prevents Java errors when trying WebRTC 2016-04-07 13:48:42 -05:00
Fred Dixon
b9b23dc87b Merge pull request #3078 from capilkey/1.0-access-bugfix3 
Correction to #3074
 2016-04-05 18:54:11 -04:00
Chad Pilkey
8a5294b6b5 added callback getters to VideoWithWarnings 2016-04-05 14:36:24 -07:00
Richard Alam
6b6f1622dc Merge pull request #3073 from perroned/edge-as-chrome 
Fixes #3068 - Detecting Microsoft Edge as Google Chrome
 2016-04-05 14:04:37 -04:00
Richard Alam
d1c0a22a4a Merge pull request #3074 from capilkey/1.0-access-bugfix2 
Fixed some accessibility bugs in 1.0
 2016-04-05 14:03:37 -04:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
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
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
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
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
4be5b80a86 update callback passed from AS 2016-02-23 14:08:42 -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
Tiago Daniel Jacobs
ac1990f426 Fix bigbluebutton/bigbluebutton#2710 (attempt 2) 2016-02-18 01:49:17 -02:00
Richard Alam
86323e2c1d - add new mac osx jar 2016-02-17 16:59:55 +00: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
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
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
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
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
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
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
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
4062aa02db significantly reduce the volume of the chat audio cue 2016-01-22 15:02:12 -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
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
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
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
0868322bb5 verto credentials 2016-01-18 07:29:03 -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
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
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
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
Chad Pilkey
71f8ff085f first try and adding caption ownership 2015-12-09 14:00:26 -08:00