Matthew Marangoni
|
4b8704ad08
|
Merge remote-tracking branch 'upstream/master' into call-manager
|
2017-07-25 08:44:45 -07:00 |
|
Matthew Marangoni
|
ff7f679c52
|
Merge branch 'Klauswk-call-manager-2x' into call-manager
|
2017-07-24 12:44:56 -07:00 |
|
Matthew Marangoni
|
2f48cca53e
|
Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x
|
2017-07-24 12:14:18 -07:00 |
|
Matthew Marangoni
|
8902742573
|
wrapped BBB instantiation into init function and added to startup
|
2017-07-24 11:36:56 -07:00 |
|
Klaus
|
d72df301c6
|
Move to 2.0
|
2017-07-24 11:15:46 -03:00 |
|
Klaus
|
5c2369b992
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
|
2017-07-24 11:00:30 -03: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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|