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

4678 Commits

Author SHA1 Message Date
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
Chad Pilkey
5dd6d86b36 upgrade sip.js to 0.7.5 2016-07-07 21:06:11 +00:00
Pedro Beschorner Marin
487b39c00e Avoid closing client's videoconf module window when reconnecting 2016-06-30 18:19:46 +00:00
Ghazi Triki
3d21b291cb Added new option "enableBreakoutRooms" to users module. 2016-06-02 21:05:18 +01:00
Fred Dixon
cd1779afbe Remove XML block for older deskshare module 2016-05-29 21:58:00 -04:00
Fred Dixon
098cb8e560 Commented out Deskshare in config.xml.template 2016-05-28 16:03:37 -04:00
Richard Alam
6233105f69 Merge pull request #3150 from perroned/join-components-with-skeleton 
Adds deskshare video to html5 client
 2016-05-27 21:45:53 -04:00
perroned
2145cc0d1e Stops fucntion that broke video viewing on html5 2016-05-26 20:25:27 +00: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
0861e192b9 disable webrtc deskshare for now 2016-05-19 17:59:58 +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
Richard Alam
c4b044e8a1 Merge branch 'v1.0.x-release' into master 2016-05-19 13:50:23 +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
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04: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
b2a4a150c4 - add Occitan locale 2016-05-12 15:19:13 +00:00
Richard Alam
5719ab2973 - fix offending locale that breaks build 2016-05-11 17:55:01 +00:00
Richard Alam
1e203d2617 Merge branch 'v1.0.x-release' of github.com:bigbluebutton/bigbluebutton into v1.0.x-release 2016-05-11 17:35:45 +00:00
Richard Alam
a3838ec143 Update locales 
Update locales as of May 11, 2016.
 2016-05-11 17:35: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
Ghaz Triki
13a65a2a1e Center Alert title and message. 2016-05-04 09:58:45 +01:00
Chad Pilkey
dc5bacc578 fix issue #3106 2016-05-03 10:09:30 -07:00
Chad Pilkey
24c6d48dc2 removing files that should not have been committed 2016-05-02 12:45:25 -07:00
Chad Pilkey
bf7d3332b9 add two branding images back to the client 2016-04-27 11:26:12 -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
5e45bcf2d7 Merge fix to missing images for brnading. 2016-04-26 20:16:31 -04: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
Richard Alam
b6fdb27bf7 Build cllient locale 
Change command how to build specific locale. To build a locale
   ant locale  (builds en_US by default)

   ant locale -DLOCALE=en_US  (builds the passed locale)
 2016-04-26 14:38:01 -04: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
Ghaz Triki
11d86f6aa8 Merge 'branch air-ui' into 'mobile-client' 2016-04-26 09:19:17 +01:00
Ghaz Triki
01335b6e8a Merge branch 'master' into mobile-client 2016-04-25 19:58:13 +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
Richard Alam
b0d6cf51ef Updating locales 
Update locales as of Apr 6, 2016
 2016-04-06 18:59:41 +00: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
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