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 |
|
Richard Alam
|
db8487dc0c
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-07-25 17:06:20 -07:00 |
|
Richard Alam
|
a1ff444760
|
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
|
2017-07-25 16:57:26 -07:00 |
|
Ghazi Triki
|
a31452c17f
|
Update glow effect colour.
|
2017-07-25 23:11:12 +01:00 |
|
Richard Alam
|
36e8f02667
|
- fix meeting expiry
|
2017-07-25 15:02:07 -07:00 |
|
Anton Georgiev
|
4e34a7f551
|
screenshare displays except at refresh
|
2017-07-25 16:56:40 -04:00 |
|
Richard Alam
|
b1ad1668dd
|
- fix test compile errors
|
2017-07-25 13:44:18 -07: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
|
d0b7e9c121
|
- assign presenter when presenter leaves
|
2017-07-25 13:41:56 -07:00 |
|
prlanzarin
|
54faf33001
|
Modified transcode responses to 2x format in kurento-screenshare
|
2017-07-25 20:13:41 +00:00 |
|
Anton Georgiev
|
69824f5be2
|
Merge pull request #4107 from Klauswk/fix-presenter-rule
[HTML5 2.0] Fix presenter assigning
|
2017-07-25 15:02:14 -04:00 |
|
Richard Alam
|
59e149a6e1
|
- display meeting time remaining
|
2017-07-25 11:54:13 -07:00 |
|
Klaus
|
9cd3ac3f87
|
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
|
2017-07-25 13:43:26 -03:00 |
|
Klaus
|
22d80b605f
|
Fix presenter assign
|
2017-07-25 13:21:07 -03:00 |
|
Pedro Beschorner Marin
|
cd34d2c139
|
Merge remote-tracking branch 'bbb-2x-mconf' into transcode-new-messages
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
|
2017-07-25 14:47:21 +00:00 |
|
Anton Georgiev
|
1bdeb248c1
|
Merge pull request #4117 from Klauswk/html5-2x-fix-audio
[HTML5 2.0] Fix join audio on the HTML5 client 2.0
|
2017-07-25 10:30:43 -04: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 |
|
Fred Dixon
|
b13390f44c
|
Merge pull request #4138 from bigbluebutton/bump-version
Update index.html
|
2017-07-25 07:23:45 -06:00 |
|
Fred Dixon
|
ff365120cc
|
Update index.html
Bump version to 2.0-dev
|
2017-07-25 07:23:26 -06:00 |
|
Pedro Beschorner Marin
|
d50f65fce1
|
Moved akka-transcode messages to 2.0 format
|
2017-07-25 13:23:20 +00: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
|
c71c018e1f
|
Merge branch 'capilkey-hide-unneeded-components' into bbb-2x-mconf
|
2017-07-24 18:16:37 -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
|
14218464b9
|
Merge pull request #4136 from ritzalam/put-back-old-messages
Fix compile issue with bbb-video and video-broadcast app
|
2017-07-24 21:05:31 -04:00 |
|
Richard Alam
|
5afcbe539b
|
- put back old messages as they are still used by video-broadcast and bbb-video. We
can remove them once we've worked on those 2 apps.
|
2017-07-24 18:02:45 -07:00 |
|
Richard Alam
|
8415300b3f
|
- fix breakout time remaining
|
2017-07-24 14:44:15 -07:00 |
|
Anton Georgiev
|
75c39f9340
|
Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio
|
2017-07-24 16:06:52 -04: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 |
|
Anton Georgiev
|
350dd16fb7
|
Merge branch 'html5-2x-fix-audio' of github.com:Klauswk/bigbluebutton into html5-2x-fix-audio
|
2017-07-24 15:34:18 -04:00 |
|
Anton Georgiev
|
b7d6427e63
|
rename deskshare to screenshare and adjust condition for viewing
|
2017-07-24 15:29:34 -04:00 |
|
Anton Georgiev
|
cacac6c9c6
|
Merge branch 'html5-2x-screenshare' of github.com:Klauswk/bigbluebutton into html5-2x-screenshare
|
2017-07-24 14:17:04 -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
|
76a497ba3a
|
Merge branch 'antobinary-late-joiner-webrtc-screenshare-updates' into bbb-2x-mconf
|
2017-07-24 10:59:59 -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
|
29a8539b12
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-07-24 10:48:55 -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 |
|