BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,923 Commits 13 Branches 260 Tags 1.1 GiB
2148812e14
Commit Graph

12923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
7857161198 Merge pull request #3219 from Lajellu/cursorTrack 
Displays cursor to HTML5
 2016-07-18 14:27:25 -04:00
Richard Alam
3926c71850 Merge pull request #3224 from ritzalam/record-breakout-rooms 
Record breakout rooms
 2016-07-18 13:15:31 -04:00
Richard Alam
7882735076 Record breakout rooms 
If the parent meeting is recorded, record also the breakout rooms.
 2016-07-18 17:07:31 +00:00
Lajellu
f1d79376ee Fixes Cursor propTypes 2016-07-18 08:30:04 -07:00
Lajellu
3009bed119 Merge remote-tracking branch 'upstream/master' into cursorTrack 2016-07-18 08:23:39 -07:00
Richard Alam
b43ec78479 Merge pull request #3222 from riadvice/breakout-rooms-ui-update 
Minor UI tweaks for the breakout rooms.
 2016-07-18 10:47:14 -04:00
Ghazi Triki
dfb23f3f6c Minor UI teaks for the breakout rooms. 2016-07-18 15:44:45 +01:00
Fred Dixon
2ec5c4a3eb Merge pull request #3220 from riadvice/breakout-rooms-ui-update 
Minor layout update for breakout rooms
 2016-07-16 12:44:45 -04:00
Ghazi Triki
3b4a403725 Minor layout update for the BreakoutRoomSettings window and BreakoutRooms list in UsersWindow. 2016-07-15 22:21:03 +01:00
Lajellu
1acdc0a13b Adds cursor xy tracking 2016-07-15 13:50:03 -07:00
Richard Alam
bb9d778689 Merge pull request #3218 from ritzalam/fix-issue-3196 
Fixes #3196
 2016-07-15 16:09:37 -04:00
Richard Alam
991ad6c2b1 Merge pull request #3217 from ritzalam/fix-issue-3204 
Fix issue 3204
 2016-07-15 16:08:43 -04:00
Richard Alam
f66571e899 Fixes issue 3196 
End the breakout rooms when the parent meeting is ended from the API.
 2016-07-15 20:03:24 +00:00
Richard Alam
e0b756cce9 Fix issue 3204 
- Need to pass sessionToken to get stuns for webrtc call.
 2016-07-15 18:05:08 +00:00
Richard Alam
e679288d8a Merge pull request #3213 from jfederico/bbb-web_add-updateRecordings 
bbb-web: added updateRecordings to the API
 2016-07-15 11:19:07 -04:00
Richard Alam
7dc63b9c3a Merge pull request #3216 from ritzalam/add-https-support-for-jws 
Add help on how to use new screenshare
 2016-07-14 15:27:31 -04:00
Richard Alam
c5984219c3 Add help on how to use new screenshare 
Provide a way for users to learn how to use the new screen share as
 the steps to launch it differs depending on OS and browser.
 2016-07-14 19:20:25 +00:00
Richard Alam
830d62218b Merge pull request #3214 from ritzalam/add-https-support-for-jws 
Add HTTPS support to screenshare webstart app
 2016-07-14 13:34:23 -04:00
Richard Alam
1d5073cfd2 - check if the need to use https to connect to java webstart servlet. 2016-07-14 17:31:44 +00:00
Richard Alam
d2916b449a Merge pull request #3193 from jfederico/bbb-web_fix-maxParticipants-by-tracking-joins-II 
Bbb web fix max participants by tracking joins
 2016-07-14 11:20:05 -04:00
Richard Alam
b00a91cbca Merge pull request #3200 from iMDT/netbeans-config 
Remove unused scala code
 2016-07-14 11:13:39 -04:00
Anton Georgiev
02c977c725 Merge pull request #3212 from oswaldoacauan/feature-chat 
HTML5 - Improvements to Chat. Closes #3207
 2016-07-12 15:10:11 -04:00
Oswaldo Acauan
a32617cf65 Remove unused import/prop 2016-07-12 14:04:39 +00:00
Oswaldo Acauan
d804f0d217 Add .meteor/dev_bundle to gitignore 2016-07-12 14:03:13 +00:00
Oswaldo Acauan
306ef94237 Fix conflicts 2016-07-12 14:02:48 +00:00
Anton Georgiev
51ccf1ddfc Merge pull request #3211 from OZhurbenko/issue-3206 
Minor fixes
 2016-07-12 09:52:38 -04:00
Anton Georgiev
bbaff47d2b Merge pull request #3210 from Gcampes/user-avatar-changes 
Update on user avatar and user item
 2016-07-12 09:52:12 -04:00
jfederico
ac60cad84a bbb-web: Added parameter to updateRecording "force=[true|false]" 
when force=false or not included
if meta_parameter exists and passed meta_parameter='' update to blank
if meta_parameter does not exists and passed meta_parameter!='' do nothing

when force=true
if meta_parameter exists and passed meta_parameter='' delete
if meta_parameter does not exists and passed meta_parameter!='' add it
 2016-07-11 17:57:27 -04:00
Oswaldo Acauan
584a772983 Remove Meteor dev_bundle 2016-07-11 20:20:07 +00:00
Oswaldo Acauan
8fcc5d87a7 Merge branch 'master' into feature-chat 
* master:
  Hide webcam component
 2016-07-11 20:18:32 +00:00
Oswaldo Acauan
97389d7edf Fix React warnings for unknown props 2016-07-11 20:10:55 +00:00
jfederico
34ad74646a bbb-web: Added code for updating recording metadata 2016-07-11 15:57:11 -04:00
Oswaldo Acauan
2d1b9ede84 Minor fixes 2016-07-11 19:42:54 +00:00
Oleksandr Zhurbenko
8c37e10ee0 Set a viewport 2016-07-11 12:10:30 -07:00
Oswaldo Acauan
6760723565 Prevent useless rerenders on MessageList 2016-07-11 18:22:06 +00:00
Gabriel Carvalho de Campes
94c10c9ed0 Fix muted status dash sizing 2016-07-11 18:20:24 +00:00
Gabriel Carvalho de Campes
2622126482 change the size of the avatar status indicators 2016-07-11 17:25:16 +00:00
Oswaldo Acauan
0f77c8fa13 Change reduce/map order on chat service 2016-07-11 17:12:01 +00:00
Oswaldo Acauan
b70b724d99 Change reduce/map order on chat service 2016-07-11 17:07:35 +00:00
Oswaldo Acauan
ee2ca176b3 Refactor services to classes 2016-07-11 16:28:55 +00:00
Oleksandr Zhurbenko
8947f732b3 Restructuring 2016-07-11 08:49:26 -07:00
Ubuntu
51ee64df44 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-web_fix-maxParticipants-by-tracking-joins-II 2016-07-11 14:28:40 +00:00
Ubuntu
6cc9f0d92e Merge branch 'master' of github.com:jfederico/bigbluebutton into bbb-web_fix-maxParticipants-by-tracking-joins-II 2016-07-11 14:28:25 +00:00
Oswaldo Acauan
9b53090c81 Change Auth service to be a singleton class 2016-07-11 13:45:24 +00:00
Anton Georgiev
52f0c7e174 Merge pull request #3209 from oswaldoacauan/patch-1 
Hide webcam component
 2016-07-11 09:14:46 -04:00
Oswaldo Acauan
0b8bca049c Hide webcam component 2016-07-11 10:13:55 -03:00
Oswaldo Acauan
850c649a99 Merge branch 'master' into feature-chat 
* master:
  Remove unused imports
  upgrade sip.js to 0.7.5
  Moved polling files back to components folder
  Adds link to meteor issue on comment, remove unused import
  Remove logs, and add some removed code back
  Changes Router in order for the livereloading to work again
  Fixed a small issue with reduce() in the poll annotation
  Made polling buttons accessible
  try to fix the reload issue
  Updated packages and fixed some of the warnings introduced by React 15.2.0
  Centering polling buttons
  Title and calculated styling for the polling UI
  Replaced polling under the whiteboard
 2016-07-11 12:36:57 +00:00
Oswaldo Acauan
aa154e5b63 Merge after git conflict/lost object 2016-07-11 12:35:08 +00:00
Oswaldo Acauan
1c0132ed5b Merge after git conflict/lost object 2016-07-11 12:34:58 +00:00
Oleksandr Zhurbenko
87c4ee98ea Added a white background for the slide 
Since it is transparent for some SVG files
 2016-07-09 14:42:33 -07:00