Chad Pilkey
043c55e0bf
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps
2017-07-21 13:55:06 -04: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
d1cc692791
Merge branch 'ritzalam-work-on-meeting-lifcycle-2' into bbb-2x-mconf
2017-07-20 18:19:16 -07: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
80c903f009
Merge branch 'antobinary-late-joiner-webrtc-screenshare' into bbb-2x-mconf
2017-07-20 17:53:08 -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
905f1a8e71
- clean up
2017-07-20 17:33:49 -07:00
Chad Pilkey
c5e9f4401e
change Polls.scala to use better ArrayBuffer to Array conversion
2017-07-20 18:58:50 -04:00
Chad Pilkey
3a824e13db
cleaned up pre-2.0 user messages
2017-07-20 18:57:55 -04: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
15b847e8b5
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
2017-07-20 10:25:03 -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
Chad Pilkey
8faf1192cc
Merge pull request #4118 from prlanzarin/2x-transcode-screenshare-messages
...
Move kurento screenshare messages to 2.0 and removed duplicated adapter import
2017-07-19 16:12:34 -04:00
Richard Alam
56ae9ca9a8
- move handlers to a different package
2017-07-19 11:40:30 -07:00
Klaus
b2556695c4
Fix show public messages
2017-07-19 14:57:07 -03:00
Klaus
2bf0fc65db
Fix statment
2017-07-19 14:20:19 -03:00
prlanzarin
5ebc45dabf
Removed duplicated adapter.js import in BigBlueButton.html
2017-07-19 14:17:24 +00:00
prlanzarin
8c69de35cd
Changed kurento screenshare app RTMP broadcast messages to new format
2017-07-19 14:17:01 +00:00
Klaus
a4db665a47
Update container.jsx
2017-07-19 09:59:03 -03:00
Klaus
b70702dabe
Dynamic fetching the stun/turn servers
2017-07-19 09:44:47 -03:00
Richard Alam
a61030a95f
- track meeting inactivity and expiry in akka-apps
2017-07-18 14:47:42 -07: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
Klaus
a7ca723fe6
Audio only working on html5
2017-07-18 11:59:05 -03:00
Anton Georgiev
2d4db1c9de
Merge pull request #4113 from oswaldoacauan/fix-meeting-add
...
[HTML5 2.0] Fix meeting add
2017-07-18 10:02:08 -04:00
Oswaldo Acauan
a0de0545b4
Fix welcomeMessage from meeting object
2017-07-18 10:31:00 -03:00
Oswaldo Acauan
c6f517b3cb
Fix selector and get welcomeMessage from meeting object
2017-07-18 10:25:11 -03:00
Oswaldo Acauan
04b6b753fe
Fix missing prop on meeting object
2017-07-18 10:23:16 -03:00
Richard Alam
03ea339e21
Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle
2017-07-17 19:37:38 -07:00
Richard Alam
e11d69624f
Merge branch 'prlanzarin-2x-transcode-screenshare-merge' into bbb-2x-mconf
...
- I think there is still some work on messages between akka-apps and the video-transcoder.
Merging so that we can do builds while Paulo works on the messages.
2017-07-17 19:22:03 -07: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
Richard Alam
e62efc3820
- try to figure out why meeting doesn't end when user leaves
2017-07-17 14:59:31 -07:00
Anton Georgiev
d8dc01d333
display current webrtc screenshare to late joiners (if broadcasting)
2017-07-17 17:48:44 -04:00
Richard Alam
61147dbb67
- try passing state around to track meeting expiry
2017-07-17 14:30:08 -07:00
Anton Georgiev
182f2181c2
Merge pull request #4043 from Klauswk/html5-2x-polls-messages
...
[HTML5 2.0] Move poll messages to 2.0
2017-07-17 15:54:54 -04:00
Klauswk
7173c0e20c
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-17 16:54:37 -03:00
Anton Georgiev
3d75d9cac3
Merge pull request #4091 from JaeeunCho/changed_stunturn_api
...
bbb_web - modified stun/turn api
2017-07-17 15:54:10 -04:00
Anton Georgiev
ed5460cba6
Merge pull request #4040 from Klauswk/html5-2x-captions-messages
...
[HTML5 2.0] Move captions messages to 2.0
2017-07-17 15:52:15 -04:00
