Commit Graph

17370 Commits

Author SHA1 Message Date
Richard Alam
8305782294 - create breakout room
- send join url to client
2017-07-23 18:14:26 -07:00
Fred Dixon
70af1e2895 Merge pull request #4129 from SrikarKashyap/master
grammatical error (metting -> meeting)
2017-07-23 10:46:34 -04:00
Srikar Kashyap Pulipaka
09b16f2e61 grammatical error 2017-07-23 11:41:49 +05:30
Richard Alam
8c2eeac294 - modify how we set meeting state
- cleanup
2017-07-22 08:42:02 -07:00
Richard Alam
7d3faf9305 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-22 07:01:04 -07:00
Richard Alam
e35f2fd1d3 Merge pull request #4128 from ritzalam/recording-status-change
- receive recording status messages from server
2017-07-22 09:58:00 -04:00
Richard Alam
544943b16b - receive recording status messages from server 2017-07-22 06:56:37 -07:00
Anton Georgiev
de272d316c Merge pull request #4120 from Klauswk/html5-2x-fix-public-messages
[HTML5 2.0] Fix Welcome Messages
2017-07-22 06:28:23 -04:00
Richard Alam
1269347289 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-21 20:55:40 -07:00
Richard Alam
9861b9b229 Merge pull request #4127 from ritzalam/record-messages-2x
record message
2017-07-21 23:28:45 -04:00
Richard Alam
10c4846b92 - provide a way to filter messages we want to record 2017-07-21 20:25:41 -07:00
Richard Alam
2abedb7276 - try to fix breakout rooms 2017-07-21 19:00:00 -07:00
Richard Alam
47f012f08f - start fixing breakout rooms 2017-07-21 14:15:51 -07:00
Chad Pilkey
3eeb8e2444 Merge pull request #4125 from capilkey/cleanup-old-1.1-apps
Cleanup old 1.1 user messages
2017-07-21 16:06:08 -04:00
Chad Pilkey
d68229f182 fix the resize and move data storage 2017-07-21 15:53:43 -04:00
Klaus
73068ff8d2 Handling meeting end 2017-07-21 16:34:28 -03:00
Chad Pilkey
c8f38ebae1 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps 2017-07-21 14:30:51 -04:00
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
Matthew Marangoni
4e66ecf0e2 moved BBB import to startup 2017-07-20 08:57:12 -07:00
Matthew Marangoni
01f98fb4be renamed htmlBBB to simply BBB 2017-07-20 07:57:15 -07: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
JaeeunCho
4e382a819e changed @font-face and class 2017-07-19 14:16:35 -07:00
JaeeunCho
829f8d1246 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into new_icon 2017-07-19 14:15:32 -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
Matthew Marangoni
f521ef0402 Merge remote-tracking branch 'upstream/master' into call-manager 2017-07-19 11:55:45 -07:00
Matthew Marangoni
8139fa03ab fixed issue with status being improperly used in custom events 2017-07-19 11:54:48 -07: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
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