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
JaeeunCho
0526edb27e
HTML5 - added .woff file
2017-07-19 08:04:00 -07:00
JaeeunCho
9a3ba4b34f
HTML5 - added new icons
2017-07-19 08:01:58 -07: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
Matthew Marangoni
1feb7629d6
detailed errors and error codes are displayed in the audio notifications when an audio failed case is received
2017-07-18 17:04:12 -07: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
JaeeunCho
0442de148e
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into new_icon
2017-07-18 12:34:54 -07: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
JaeeunCho
59e4cc2ff7
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into changed_stunturn_api
2017-07-18 07:38:34 -07: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
507bb61fb2
Change user-list width
2017-07-18 10:55:19 -03: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
Oswaldo Acauan
dbb6b5cd12
New user-list colors
2017-07-18 10:12:26 -03:00
Oswaldo Acauan
d04c392064
Fix body background color
2017-07-18 08:51:29 -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
prlanzarin
758bb0142b
Added 2x Deskshare RTMP Broadcast messages to kurento-screenshare server
...
Old 1.1 messages are still available there
2017-07-17 19:36:49 +00:00
prlanzarin
f64d393b6a
Cleanup on kurento client extension
...
Added fail cases to fallback to JWS
2017-07-17 19:30:58 +00:00
Anton Georgiev
bc9083c0cf
Merge pull request #4109 from Klauswk/fix-sass-path
...
[HTML5 - 2.0] Change relative path of the sass imports to absolute
2017-07-17 14:58:02 -04:00
Klaus
6b0edb353e
Change all from single quotes to double quotes
2017-07-17 15:56:05 -03:00
Klaus
5767583a86
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages
2017-07-17 15:37:06 -03:00
Klaus
87943cb3f8
Change relative path of the sass to absolute
2017-07-17 15:21:45 -03:00
Ghazi Triki
f6844d83ba
Replace image assets with new theme icons.
2017-07-17 18:43:16 +01:00
Anton Georgiev
773171741c
Merge pull request #4108 from Klauswk/merge-master-mconf
...
[HTML5 2.0] Merge master branch into mconf
2017-07-17 13:42:05 -04:00
Klaus
2343ef3f1f
Add missing merge file
2017-07-17 13:38:18 -03:00
Klaus
3af281d648
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
2017-07-17 13:33:45 -03:00
Richard Alam
1f50ec2da7
- send destroy meeting to BBBActor when meeting ends
2017-07-17 09:13:07 -07:00
JaeeunCho
584618fc0e
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into changed_stunturn_api
2017-07-17 08:11:21 -07:00
Ghazi Triki
3e78731b11
Replace all icons and update all styles for V2Theme.css
2017-07-17 15:29:47 +01:00
Klaus
d4ffcc0221
Add assign presenter to html5
2017-07-17 09:49:11 -03:00
