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

6135 Commits

Author SHA1 Message Date
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
Richard Alam
d57193ba1a Merge branch 'ss-loading' of https://github.com/perroned/bigbluebutton into perroned-ss-loading 2017-07-26 14:46:20 -07:00
perroned
d12d90b650 Screenshare loading screen 2017-07-26 20:43:08 +00:00
Richard Alam
6fb08c1396 - convert over lock setting into 2x messages 2017-07-26 13:19:19 -07:00
prlanzarin
ade78eaff0 Changed kurento-screenshare session index to voiceBridge 2017-07-26 16:59:05 +00:00
Richard Alam
67808fcb66 - display time remaining when meeting duration is not zero 2017-07-26 08:49:28 -07:00
Richard Alam
f9d49b65e1 - handle meeting muted and inactive messages 2017-07-26 08:37:19 -07:00
Richard Alam
fe7bd03297 Merge branch 'bbb-2x-mconf' into fix-breakout-room-messaging 2017-07-26 07:58:02 -07:00
Richard Alam
0274656058 - display timer only when there is meeting duration 2017-07-26 07:51:10 -07:00
Ghazi Triki
63b48d9db8 Restrict using emoji from version 1.1 only 2017-07-26 15:41:41 +01:00
Richard Alam
0f04b69897 Merge branch 'fix-breakout-room-messaging' of github.com:ritzalam/bigbluebutton into fix-breakout-room-messaging 2017-07-25 17:44:17 -07:00
Richard Alam
4a3a746949 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-25 17:07:48 -07:00
Ghazi Triki
a31452c17f Update glow effect colour. 2017-07-25 23:11:12 +01:00
Richard Alam
3921eaf36f - display timer 
- make sure talking indicator is off when user is muted
 2017-07-25 13:43:35 -07:00
Richard Alam
971cd7fe92 - display metting timer 2017-07-25 13:42:53 -07:00
Richard Alam
59e149a6e1 - display meeting time remaining 2017-07-25 11:54:13 -07:00
Ghazi Triki
2939ed3a53 Update TilteWindow close button skin. 2017-07-25 15:29:14 +01:00
Ghazi Triki
f086fb1abe Fix FileUploadWindow and make it close when clicking on the close button. 2017-07-25 15:28:52 +01:00
Ghazi Triki
528acab82e Updated toolbar logo to make aligned with meeting name label. 2017-07-25 14:10:44 +01:00
Ghazi Triki
dc014b1a11 Fix PopUpButtonSkin border colors. 2017-07-25 11:58:54 +01:00
Ghazi Triki
d4d737dfd2 Implement new design for quick links buttons. 2017-07-25 11:35:54 +01:00
Ghazi Triki
e8fa7b0d49 Updated main toolbar help icon style. 2017-07-25 10:54:18 +01:00
Richard Alam
ad37b52835 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-24 18:21:59 -07:00
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
Richard Alam
8415300b3f - fix breakout time remaining 2017-07-24 14:44:15 -07:00
Richard Alam
ab5cad41e7 - handle some of breakout messages 
- timer still not working
 - listen not working
 - breakout users list not working
 2017-07-24 12:56:09 -07:00
Chad Pilkey
6be3863f33 hide some unrequired UI elements 2017-07-24 15:42:29 -04:00
Richard Alam
c38d675ae9 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-24 11:02:07 -07: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
Richard Alam
555302f11e - try to fix messaging of breakout rooms 2017-07-24 10:39:29 -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
e89c20f245 - need to fix client to handle breakout messages properly 2017-07-23 18:39:00 -07:00
Richard Alam
8305782294 - create breakout room 
- send join url to client
 2017-07-23 18:14:26 -07:00
Richard Alam
7d3faf9305 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-22 07:01:04 -07:00
Richard Alam
544943b16b - receive recording status messages from server 2017-07-22 06:56:37 -07:00
Richard Alam
2abedb7276 - try to fix breakout rooms 2017-07-21 19:00:00 -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