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
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
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
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
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
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
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
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
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
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
Ghazi Triki
3e78731b11
Replace all icons and update all styles for V2Theme.css
2017-07-17 15:29:47 +01:00
Richard Alam
6f2e3936b1
Merge pull request #4106 from ritzalam/restructure-handlers
...
- restructure handlers to make it easier to test
2017-07-16 21:37:04 -04:00
Richard Alam
eb9a96348a
- restructure handlers to make it easier to test
2017-07-16 18:34:44 -07:00
Richard Alam
da9ca0c0ca
Merge pull request #4105 from ritzalam/fix-users-chat-list
...
- display users list for private chat
2017-07-16 19:49:07 -04:00
Richard Alam
7ff3b9f516
- display users list for provate chat
2017-07-16 16:47:48 -07:00
Richard Alam
103d8a1438
Merge pull request #4104 from ritzalam/get-users-msg-2x
...
convert get users query to 2x
2017-07-16 17:07:52 -04:00
Richard Alam
43edb0ea4c
- convert get users query to 2x
2017-07-16 14:06:05 -07:00
Richard Alam
ea035de2ed
Merge pull request #4103 from ritzalam/implement-meeting-expiry
...
Implement meeting expiry
2017-07-16 11:28:27 -04:00
Richard Alam
bf1031374a
- pass timeout expire when last user leaves from bbb-web to akka-apps
2017-07-16 08:11:48 -07:00
Richard Alam
8994c7f644
Merge branch 'bbb-2x-mconf' into implement-meeting-expiry
2017-07-16 07:49:45 -07:00
Richard Alam
9772de2d59
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-07-16 07:25:28 -07:00
Richard Alam
d80a6d42a9
Merge branch 'capilkey-cleanup-old-1.1-apps' into bbb-2x-mconf
2017-07-16 07:24:48 -07:00
Richard Alam
7dd2191b63
Merge branch 'cleanup-old-1.1-apps' of https://github.com/capilkey/bigbluebutton into capilkey-cleanup-old-1.1-apps
2017-07-16 07:16:50 -07:00
Richard Alam
0f39d99ce5
- implement meeting expiry
2017-07-15 19:10:04 -07:00
Chad Pilkey
f4a5286005
remove pre-2.0 breakout room code
2017-07-15 19:00:18 -04:00
