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 |
|
prlanzarin
|
c3ba4eaac4
|
Fixed kurento-screenshare session ending
|
2017-07-27 13:17:55 +00:00 |
|
Richard Alam
|
ea00a8b019
|
Merge branch 'perroned-ss-loading' into bbb-2x-mconf
|
2017-07-26 15:03:01 -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
|
f0a8f03f36
|
Merge pull request #4148 from ritzalam/convert-over-lock-settings
- convert over lock setting into 2x messages
|
2017-07-26 16:37:18 -04: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
|
bc584f79e8
|
Merge pull request #4145 from ritzalam/display-time-remaining
Display time remaining
|
2017-07-26 11:53:37 -04: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 |
|
Anton Georgiev
|
f3d8a17748
|
Merge pull request #4141 from antobinary/fix-html5-demo-jsp
Use mod and attendee passwords in createMeeting call in demoHTML5.jsp
|
2017-07-26 11:07:56 -04:00 |
|
Richard Alam
|
5406a9d4cc
|
Merge pull request #4143 from ritzalam/fix-breakout-room-messaging
breakout room and other bugs
|
2017-07-26 11:06:00 -04:00 |
|
Richard Alam
|
fe7bd03297
|
Merge branch 'bbb-2x-mconf' into fix-breakout-room-messaging
|
2017-07-26 07:58:02 -07:00 |
|
Richard Alam
|
1254b37265
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-07-26 07:57:27 -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 |
|
Anton Georgiev
|
108716e878
|
use mod and attendee passwords in createMeeting call
|
2017-07-26 09:36:14 -04: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 |
|
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 |
|
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 |
|