BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,107 Commits 13 Branches 260 Tags 1.1 GiB
83c117ddde
Commit Graph

17107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswaldo Acauan
83c117ddde Match user-list with the new styles 2017-07-28 10:43:39 -03:00
Oswaldo Acauan
507bb61fb2 Change user-list width 2017-07-18 10:55:19 -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
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
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
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
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
Chad Pilkey
e41b991716 Merge pull request #4100 from capilkey/cleanup-old-1.1-apps 
Clean up pre-2.0 voice message code
 2017-07-15 18:57:40 -04:00
Chad Pilkey
c9ec18d10a Merge pull request #4099 from capilkey/cleanup-old-1.1-apps 
Cleanup of whiteboard, caption, and poll
 2017-07-15 17:33:34 -04:00
Chad Pilkey
1bb72e6391 clean up pre-2.0 voice message code 2017-07-15 17:33:25 -04:00
Chad Pilkey
cc1e47ecef fixed the poll annotation drawing 2017-07-15 15:34:30 -04:00
Chad Pilkey
2dfd202a0b reorganized akka-apps whiteboard, cleaned up caption and poll 2017-07-15 15:31:49 -04:00
Richard Alam
a0467f319c Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle 2017-07-15 09:30:02 -07:00
Richard Alam
ab9741df2f Merge pull request #4097 from perroned/fix-log-error 
Comma to plus
 2017-07-15 11:16:24 -04:00
perroned
0a6bb57580 Comma to plus 2017-07-15 10:59:45 -04:00
Richard Alam
335c547b82 Merge pull request #4077 from perroned/WebRTC-Screenshare-logging 
Adds some WebRTC Screenshare logging
 2017-07-15 09:19:45 -04:00
Richard Alam
407fdaad3d Merge pull request #4090 from perroned/verto-stun-turn 
Enable stun/turn use within verto
 2017-07-15 09:18:41 -04:00
Richard Alam
ae614b8908 Merge pull request #4094 from perroned/screenshare-show-button 
Sets showButton to true
 2017-07-15 09:18:03 -04:00
Richard Alam
a23d8e293e Merge branch 'capilkey-cleanup-old-1.1-apps' into bbb-2x-mconf 2017-07-15 06:16:42 -07:00
Richard Alam
259825272a Merge branch 'cleanup-old-1.1-apps' of https://github.com/capilkey/bigbluebutton into capilkey-cleanup-old-1.1-apps 2017-07-15 06:10:52 -07:00
Richard Alam
80213da06e - try writing test 
- start implementing meeting inactivity
 - updated scalariform to format scala code
 2017-07-14 14:50:34 -07:00
Chad Pilkey
3c60131a5c remove pre-2.0 layout message code 2017-07-14 16:57:20 -04:00
Chad Pilkey
f210df7724 Merge pull request #4095 from capilkey/cleanup-old-1.1-apps 
Remove pre-2.0 poll message code
 2017-07-14 16:55:58 -04:00
Chad Pilkey
e24e356432 Merge pull request #4093 from capilkey/cleanup-old-1.1-apps 
Remove pre-2.0 presentation message code
 2017-07-14 16:18:59 -04:00