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

1003 Commits

Author SHA1 Message Date
Augusto Bennemann
31f2e1cac7 HTML5 ScreenShare Presenter 2017-09-12 17:47:06 -03:00
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer 
HTML5 ScreenShare Viewer
 2017-09-11 13:40:56 -03:00
Ghazi Triki
30f7b302a2 Increse users window height in default layout. 2017-08-28 10:04:22 +01:00
Pedro Beschorner Marin
b97375ec00 Shared notes deletion enabled at config.xml 2017-08-23 18:02:38 +00:00
Richard Alam
07f9bcd25e Merge pull request #4296 from ritzalam/minor-ui-tweaks 
Minor ui tweaks
 2017-08-22 16:59:57 -04:00
Richard Alam
478caab88f - change copyright text 2017-08-22 13:58:22 -07:00
Fred Dixon
d825aa44d5 Merge pull request #4295 from pedrobmarin/fullscreen-fix 
Flash client's chrome fullscreen fix
 2017-08-22 16:20:25 -04:00
Pedro Beschorner Marin
5a388961d7 Included allowfullscreeninteractive param when loading the swf file in chrome 2017-08-22 19:36:02 +00:00
Ghazi Triki
571899bbc8 Updated layout.xml with larger central area. 2017-08-22 11:54:09 +01:00
Ghazi Triki
1573e6a716 Typo and default values fixes to configuration options. 2017-08-22 11:39:03 +01:00
Richard Alam
22ac6e8fc1 - increase default font for shared notes 2017-08-21 13:30:43 -07:00
Richard Alam
557a9ea1ca Merge branch '2.0-shared-notes-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-shared-notes-fixes 2017-08-21 13:09:43 -07:00
Richard Alam
3219e978e0 Merge pull request #4282 from ritzalam/change-log-target 
- change target name in log element of config.xml so as not to confl…
 2017-08-21 15:10:55 -04:00
Richard Alam
c7a9fa6947 - change target name in log element of config.xml so as not to conflict with "target" on branding during 
post install
 2017-08-21 12:08:49 -07:00
Pedro Beschorner Marin
06d937958f Setting maximum size to shared notes and pastes 2017-08-21 18:23:33 +00:00
Fred Dixon
97148ac99b Added home.html to redirect to bigbluebutton.org when user clicks lower left text 2017-08-21 12:58:58 -05:00
Richard Alam
3aec506154 - add build version placeholder 2017-08-21 07:24:40 -07:00
Richard Alam
dbc95de135 - add back way to put build version in client 2017-08-18 14:54:47 -07:00
Chad Pilkey
d3f09252f8 bump chat default size from 12 to 14 2017-08-18 16:01:25 -04:00
Chad Pilkey
ac030e6254 fix meeting and client locking 2017-08-11 20:53:09 -04:00
Ghazi Triki
3df8e6fb3c Add missing enableGuestUI option to UsersModule configuration. 2017-08-10 15:46:38 +01:00
Oleksandr Zhurbenko
db1b8c3ecb Added a check for Windows 2017-08-04 16:01:43 -07:00
Oleksandr Zhurbenko
02a1855650 Added a check to detect a 32 bit version of Firefox only 2017-08-04 12:46:34 -07:00
Oleksandr Zhurbenko
dd671737f7 Fixes hanging Flash on tab switch in Firefox 55-56 2017-08-04 12:18:38 -07:00
Richard Alam
d39e823a85 Merge branch 'akka-transcode-new-messages' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-akka-transcode-new-messages 2017-07-27 07:53:27 -07:00
perroned
d12d90b650 Screenshare loading screen 2017-07-26 20:43:08 +00:00
prlanzarin
ade78eaff0 Changed kurento-screenshare session index to voiceBridge 2017-07-26 16:59:05 +00:00
Ghazi Triki
528acab82e Updated toolbar logo to make aligned with meeting name label. 2017-07-25 14:10:44 +01:00
Chad Pilkey
6be3863f33 hide some unrequired UI elements 2017-07-24 15:42:29 -04:00
Richard Alam
37c744b01b Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-07-20 10:25:36 -07:00
prlanzarin
5ebc45dabf Removed duplicated adapter.js import in BigBlueButton.html 2017-07-19 14:17:24 +00:00
Ghazi Triki
186417fb6f Merge branch 'master-v2' into 2x-client-theme 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatControlBar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2017-07-18 18:38:46 +01:00
Richard Alam
810a027907 Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge 2017-07-17 18:49:58 -07:00
prlanzarin
f64d393b6a Cleanup on kurento client extension 
Added fail cases to fallback to JWS
 2017-07-17 19:30:58 +00:00
Richard Alam
407fdaad3d Merge pull request #4090 from perroned/verto-stun-turn 
Enable stun/turn use within verto
 2017-07-15 09:18:41 -04:00
perroned
9315143a5e Sets showButton to true 2017-07-14 15:14:00 -04:00
perroned
ef50f8733f Enable stun/turn use 2017-07-14 11:15:58 -04:00
Richard Alam
8d1b36cd48 Merge pull request #4074 from perroned/update-verto-libs-add-ff 
Update verto libs add firefox screenshare support
 2017-07-12 14:28:13 -04:00
Ghazi Triki
1ca350c6c8 Updated data grid and icons for users item renderers. 2017-07-12 17:37:05 +01:00
perroned
f3f877057a Verto extension deskshare -> screenshare 2017-07-12 11:33:02 -04:00
Pedro Beschorner Marin
2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.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/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-07-11 20:41:38 +00:00
perroned
ecbc290436 Adds FF SS support 2017-07-11 12:24:50 -04:00
perroned
a1554c0176 Updates verto lib 2017-07-11 10:59:32 -04:00
prlanzarin
1395893397 Fixed ending methods for kurento-extension 2017-07-10 20:51:37 +00:00
perroned
020df250a6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
 2017-07-09 14:39:57 -04:00
perroned
1b92aba481 Hangup and reconnect safely 2017-07-07 17:27:28 -04:00
perroned
f92be502cc Moves constraints to initialization 2017-07-07 17:01:33 -04:00
prlanzarin
f26a275b05 Updated kurento lib in BigBlueButton.html 
Generic addresses for Kurento on the screenshare server
 2017-07-05 17:58:19 +00:00
Ghazi Triki
8bf90835ec Replace main png logo by a swf logo. 2017-07-05 15:56:53 +01:00
Ghazi Triki
fff2ad8f50 Updated layout.xml by adding gaps between windows. 2017-07-05 15:18:43 +01:00