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

495 Commits

Author SHA1 Message Date
Richard Alam
cc9e0c9151 Merge pull request #3618 from riadvice/detect-https-in-bbb_webrtc_bridge_sip.js 
Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws
 2017-02-07 14:45:04 -05:00
Anton Georgiev
ad35758cb9 initialize html5StunTurn properly - complication from PR 3628 2017-02-03 13:57:29 -05:00
Anton Georgiev
22bb2a8200 fix bug preventing stun/turn call 2017-02-03 11:25:04 -05:00
Ghazi Triki
0d6acd27b4 Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws 2017-01-31 19:31:27 +01:00
Anton Georgiev
e55705b043 recover redirect to html5 client on android device 2017-01-24 15:34:52 -05:00
Chad Pilkey
e7348d884e hack for Chrome 56+ to try and work around transparent Flash blocking 2016-12-15 18:28:33 -05:00
Matthew Marangoni
7fb492894e Added exiting audio 2016-10-25 14:16:40 -07:00
Matthew Marangoni
d21545c847 added html5 stun request and reply 2016-10-25 07:59:14 -07:00
Chad Pilkey
fef5acace6 remove old deskshare module and out-dated Java checks 2016-10-12 18:13:02 -04:00
perroned
53f0512589 Removes iframe reference to outside domain 2016-09-20 13:43:06 +00:00
Fred Dixon
0aac39cff3 Added more explanation for Mac FireFox in screenshare-help.html 2016-08-30 17:01:30 -04:00
Fred Dixon
738fc00ddf Updated help text for launching screen sharing 2016-08-29 11:02:30 -04:00
Fred Dixon
dcc0af953d Updates to help file for new screen sharing 2016-08-21 16:17:32 -04:00
perroned
0e3096d00d Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-05 18:45:59 +00:00
perroned
fc8438f61a move some data into verto JS 2016-08-05 18:42:02 +00:00
Richard Alam
2148812e14 Merge pull request #3259 from capilkey/cc-combined-messages 
Make the CC updates smarter
 2016-08-05 10:01:23 -04:00
Gabriel Carvalho de Campes
44c8ae4f59 Fixes login in html when flash is not supported 2016-08-05 10:34:07 -03:00
perroned
c057111367 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
 2016-08-04 18:23:45 +00:00
Chad Pilkey
1c6efa1945 add cc window to other layouts so it doesn't show up when not wanted 2016-08-04 10:30:17 -07:00
Richard Alam
366c6673f6 Screenshare help page 
Help page with link to videos.
 2016-08-03 21:20:05 +00:00
Richard Alam
f1e2040062 Screenshare help page 
Add placeholder for screenshare help page.
 2016-08-03 20:33:56 +00:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
perroned
9111a445ad Removes function, removes console error 2016-07-25 21:00:41 +00:00
perroned
2a23778ea9 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-07-22 19:20:00 +00: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
027d803770 move caption window to its own layout 2016-07-18 14:17:44 -07: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
Chad Pilkey
5dd6d86b36 upgrade sip.js to 0.7.5 2016-07-07 21:06:11 +00:00
perroned
b505f460dc Begins adding webrtc deskshare to screenshare 2016-06-28 17:15:36 +00:00
perroned
8877c30aa0 Clean up 2016-06-20 19:39:20 +00:00
perroned
0ab36e8ec3 Cleaning up 2016-06-20 15:59:48 +00:00
perroned
570b41ab81 Use one verto handle 2016-06-20 15:05:39 +00:00
perroned
13ffa169c2 Cleaning up 2016-06-17 20:36:45 +00:00
perroned
6a48605773 Verto manager screen share 2016-06-17 17:50:04 +00:00
perroned
86035fce39 Adds verto manager window functions 2016-06-17 17:47:24 +00:00
perroned
7ae2da4e9d Grabs screen params from chrome/ff 2016-06-17 15:43:03 +00:00
perroned
a95ed82293 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-06-15 20:07:42 +00:00
perroned
1f6e40596f Working on screenshare for chrome/ff 2016-06-14 16:13:49 +00:00
perroned
e9fd499851 Readding verto sharing 2016-06-14 16:11:04 +00:00
perroned
88cc944609 Rewrites verto extension 2016-06-08 20:07:43 +00:00
perroned
a3e2a3a54a Upgrade verto libs 2016-06-08 20:07:07 +00:00
perroned
844210faea Fixes audio permission, render tag 2016-06-01 15:56:12 +00:00
perroned
4977950081 Fixes crash when starting video view 2016-05-30 17:21:30 +00: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
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
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
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04:00