BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,075 Commits 13 Branches 260 Tags 1.1 GiB
f16366c305
Commit Graph

23075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KDSBrowne
b9736e9c08 fix poll results not displaying correctly for presenter 2018-09-28 14:40:53 +00:00
zhu
39adce2321
Fix compatibility in some old browser 
Trailing comma in function arguments does not allowed until ECMAScript 2017
 2018-09-28 18:30:50 +08:00
zhu
6eba10da3a
Merge branch 'v2.0.x-release' into v2.0.x-release 2018-09-28 18:19:56 +08:00
zhu
7e42bb7f02 Fix create meeting with multi presentations will set all of them to current 2018-09-28 18:04:37 +08:00
KDSBrowne
e1440de236 fix private chat not working 2018-09-27 16:27:05 +00:00
Bobak Oftadeh
f4a6947313 Moved isModerator check to the user-options container 2018-09-26 09:04:53 -07:00
Anton Georgiev
c59e789ac4
Merge pull request #6114 from Tainan404/change-overlay-color 
Change modal overlay color for client consistency.
 2018-09-25 16:48:11 -04:00
Tainan Felipe
33655682f0 change modal overlay color for client consistency 2018-09-25 17:29:54 -03:00
Richard Alam
6c7fb11304
Merge pull request #6095 from jfederico/v2.2-dev 
Fix meeting tag in recordings migrated from BBB 1.0 and before (fixed #6089)
 2018-09-25 16:20:45 -04:00
Jesus Federico
35b2806b33
Merge pull request #5473 from mesutaydemir/patch-2 
suggested solution timestamp issue for student role lti integration w…
 2018-09-25 16:17:45 -04:00
jfederico
494f9b345a Added jwt and java_properties gems 2018-09-25 20:11:45 +00:00
Anton Georgiev
e9e21288f3
Merge pull request #6112 from antobinary/fix-6107 
Maintain array of user roles so they are unique
 2018-09-25 15:58:31 -04:00
Anton Georgiev
faac6a0d5d maintain array of user roles so they are unique 2018-09-25 19:24:43 +00:00
Tainan Felipe
adbf0f0098 Add breakout room button 2018-09-25 14:03:09 -03:00
KDSBrowne
491f841401 prevent user access to poll panel after presenter is lost 2018-09-25 16:54:07 +00:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07:00
Tainan Felipe
9e496a0c93 Add fit to width feature 2018-09-25 09:47:49 -03:00
KDSBrowne
cf23293e10 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-09-25 12:44:38 +00:00
João Francisco Siebel
531f739f12 Merge remote-tracking branch 'upstream/master' into ini-configuration-file 2018-09-25 09:42:24 -03:00
João Francisco Siebel
68aa29de68 rename file and add users-settings subscription 2018-09-25 09:37:45 -03:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings 
Custom user settings
 2018-09-25 08:29:48 -04:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
João Francisco Siebel
81e6e815d9 remove .ini file 2018-09-24 14:51:07 -03:00
João Francisco Siebel
296ef8fb88 Merge remote-tracking branch 'upstream/master' into HEAD 2018-09-24 14:46:17 -03:00
Richard Alam
9c8165bfa8
Merge pull request #6103 from riadvice/api-pre-uploade-filename 
Add `filename` attribute for file pre-upload using an URL
 2018-09-24 13:30:34 -04:00
Ghazi Triki
1493470b13 Add filename attribute for file pre-upload using an URL 2018-09-24 16:41:35 +01:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56 clean up code / add formatted messages / fix bugs 2018-09-23 22:57:03 +00:00
João Francisco Siebel
a445e0d2e5 make whiteboard tools list configurable 2018-09-21 16:42:39 -03:00
Richard Alam
9eae47dc82
Merge pull request #6099 from kepstin/bbb-20-rec-fixes 
Recording fixes for BBB 2.0
 2018-09-21 14:38:57 -04:00
Richard Alam
a30f1842ae
Merge pull request #6100 from kepstin/bbb-20-rec-fixes 
Recording fixes for BBB 2.2
 2018-09-21 14:38:40 -04:00
Calvin Walton
7a64756bba RaP: When generating poll image, grab the presentation name correctly. 
It was previously trying to get the presentation name from the wrong variable,
which resulted in a nil value (which was treated as a blank string in
filenames). This caused the poll images to not be inside the presentation
subdirectories, and the poll image references in the svg contained a `//`
path, which would break the recording if it was uploaded to e.g. AWS S3.
 2018-09-21 14:28:24 -04:00
Richard Alam
909b8672c7
Merge pull request #6096 from riadvice/api-started-screen-sharing 
Improve client logging for screensharing
 2018-09-21 13:21:03 -04:00
João Francisco Siebel
3c3a5ae59a implement multiUserPenOnly configuration 2018-09-21 13:42:00 -03:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
Richard Alam
75a161adbf
Merge pull request #5207 from riadvice/mobile-no-force-debug 
Remove force debug in LoadingScreenMediator
 2018-09-21 11:36:21 -04:00
Ghazi Triki
d6b22822e9 Improve java and webrtc screensharing logs. 2018-09-21 14:10:41 +01:00
Calvin Walton
e8008a0ef9
Merge pull request #6098 from capilkey/upgrade-adapter-js 
Reduce adapter.js version in Flash client
 2018-09-20 17:22:34 -04:00
Chad Pilkey
15f80dd8ea reduce adapter.js version in Flash client because newer breaks Chrome webrtc ss 2018-09-20 14:14:41 -07:00
Richard Alam
063a81b91f - nginx file to server presentation slides. 
Deploy to /etc/bigbluebutton/nginx
 2018-09-20 14:02:02 -07:00
Richard Alam
74cb07f839 - log error when tomcat still serves slides files 2018-09-20 14:01:19 -07:00
Richard Alam
15a42b631c Merge branch 'v2.0.x-release' into improve-log-on-presentation-conversion 2018-09-20 13:37:57 -07:00
Ghazi Triki
f33f4bc33f Revert "Update API to display if the user is sharing his screen and what screen-sharing type he is using." 
This reverts commit 72d7e17fdb.
 2018-09-20 20:48:38 +01:00
Richard Alam
8e3a11d780
Merge pull request #6097 from capilkey/upgrade-adapter-js 
Update adapter.js in the Flash client and make sure it loads in correct order
 2018-09-20 15:40:30 -04:00
Chad Pilkey
9f8c0465d8 update adapter.js in the Flash client and make sure it loads in correct order 2018-09-20 12:29:35 -07:00
Ghazi Triki
22ff78f5e7 Fixed typo in get-meeting-info.ftlx 2018-09-20 18:57:26 +01:00
Ghazi Triki
72d7e17fdb Update API to display if the user is sharing his screen and what screen-sharing type he is using. 2018-09-20 18:16:29 +01:00
jfederico
b9f52a2438 Script for fixing meeting tag in recordings migrated from BBB 1.0 and before 2018-09-20 14:23:29 +00:00
João Francisco Siebel
b832921be2 fix settings list 2018-09-19 17:34:23 -03:00