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

6104 Commits

Author SHA1 Message Date
Richard Alam
df99ac9689 Merge branch 'hide-unneeded-components' of https://github.com/capilkey/bigbluebutton into capilkey-hide-unneeded-components 2017-07-24 18:06:30 -07:00
Chad Pilkey
6be3863f33 hide some unrequired UI elements 2017-07-24 15:42:29 -04:00
Richard Alam
636ceea82c Merge branch 'late-joiner-webrtc-screenshare-updates' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare-updates 2017-07-24 10:50:25 -07:00
Richard Alam
73ca0da708 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-07-24 10:41:36 -07:00
Ghazi Triki
a6d8cbdd92 Minor updates to icons. 2017-07-24 18:34:20 +01:00
Anton Georgiev
76f42d420a Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into late-joiner-webrtc-screenshare-updates 2017-07-24 13:26:56 -04:00
Anton Georgiev
0c8941185c drop unnecessary class WebRTCConnection 2017-07-24 13:25:47 -04:00
Ghazi Triki
cd478ecb49 Fix borderThickness property name. 2017-07-24 14:10:14 +01:00
Ghazi Triki
fed90fdf90 Update top toolbar buttons with new colour styles with the correct states. 2017-07-24 12:58:28 +01:00
Richard Alam
544943b16b - receive recording status messages from server 2017-07-22 06:56:37 -07:00
Ghazi Triki
b82e04fb7d Updated style with new colours and fixed some icons. 2017-07-21 15:03:24 +01:00
Ghazi Triki
ef4da9e29d Fix glow filter for MuteMeButton. 2017-07-21 15:01:18 +01:00
Richard Alam
ba2e99ed0e Merge branch 'work-on-meeting-lifcycle-2' of https://github.com/ritzalam/bigbluebutton into ritzalam-work-on-meeting-lifcycle-2 2017-07-20 18:19:00 -07:00
Richard Alam
f1b4f87752 Merge branch 'late-joiner-webrtc-screenshare' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare 2017-07-20 17:41:55 -07:00
Richard Alam
ad9b122f4c - try to get webcams working 2017-07-20 14:32:44 -07:00
Richard Alam
3afc92618b Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle-2 2017-07-20 13:34:15 -07: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
Richard Alam
6be6e9191a - try to fix webcam list 2017-07-20 10:09:01 -07:00
Ghazi Triki
41ea10d1d7 Restore DEFAULT_TOOLBAR_HEIGHT in MainApplicationShell.mxml 2017-07-20 17:27:33 +01:00
Ghazi Triki
cfdce6e531 Fix application not loading at startup. 2017-07-20 17:14:51 +01:00
Richard Alam
5431f29a07 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into work-on-meeting-lifcycle-2 2017-07-20 07:17:02 -07:00
Richard Alam
d7e1a23022 - continue implement guest policy 2017-07-19 19:24:43 -07:00
Richard Alam
d488ff745d - implement guest policy 2017-07-19 14:59:36 -07:00
prlanzarin
5ebc45dabf Removed duplicated adapter.js import in BigBlueButton.html 2017-07-19 14:17:24 +00:00
Anton Georgiev
2995e10ce3 request screenshare status on screenshare module init 2017-07-18 15:57:27 -04: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
Chad Pilkey
20fe7c2f24 Merge pull request #4115 from capilkey/cleanup-old-1.1-apps 
Presenter and slide size fix for 2.0
 2017-07-18 13:03:55 -04:00
Chad Pilkey
39659dc4d1 fix the dispatching of MadePresenterEvents 2017-07-18 12:59:59 -04:00
Chad Pilkey
dcfee91fd3 correct the slide max height calculation 2017-07-18 12:59:03 -04: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
Ghazi Triki
f52352f88f Deleted legacy client themes. 2017-07-18 00:14:53 +01:00
Anton Georgiev
d8dc01d333 display current webrtc screenshare to late joiners (if broadcasting) 2017-07-17 17:48:44 -04:00
prlanzarin
f64d393b6a Cleanup on kurento client extension 
Added fail cases to fallback to JWS
 2017-07-17 19:30:58 +00:00
Ghazi Triki
f6844d83ba Replace image assets with new theme icons. 2017-07-17 18:43:16 +01:00
Ghazi Triki
3e78731b11 Replace all icons and update all styles for V2Theme.css 2017-07-17 15:29:47 +01:00
Richard Alam
7ff3b9f516 - display users list for provate chat 2017-07-16 16:47:48 -07:00
Richard Alam
43edb0ea4c - convert get users query to 2x 2017-07-16 14:06:05 -07:00
Chad Pilkey
c9ec18d10a Merge pull request #4099 from capilkey/cleanup-old-1.1-apps 
Cleanup of whiteboard, caption, and poll
 2017-07-15 17:33:34 -04:00
Chad Pilkey
cc1e47ecef fixed the poll annotation drawing 2017-07-15 15:34:30 -04:00
perroned
0a6bb57580 Comma to plus 2017-07-15 10:59:45 -04:00
Richard Alam
335c547b82 Merge pull request #4077 from perroned/WebRTC-Screenshare-logging 
Adds some WebRTC Screenshare logging
 2017-07-15 09:19:45 -04: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
Ghazi Triki
3ef64e465e Updated whiteboard icons and cursors. 2017-07-14 18:13:43 +01:00
perroned
ef50f8733f Enable stun/turn use 2017-07-14 11:15:58 -04:00
Anton Georgiev
1fba3f0009 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-13 12:30:51 -04:00
Anton Georgiev
3d420cf459 force disconnect for all users on meeting end 2017-07-13 11:58:16 -04:00
Richard Alam
a7efe5364c - webrtc map shouldn't handle jws events 2017-07-13 08:25:49 -07:00
perroned
dc658b244f Adds logs to LOGGER 2017-07-13 11:18:38 -04:00
Ghazi Triki
62630b00c9 Use new icons and style for whiteboard tool bar. 2017-07-13 13:53:30 +01:00