BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,480 Commits 13 Branches 260 Tags 1.1 GiB
10b096e9b0
Commit Graph

22480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bobak Oftadeh
10b096e9b0 Merge branch 'user-manage' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-b 2018-10-16 08:52:14 -07:00
Bobak Oftadeh
e582978662 Adjusted dropdown position 2018-10-16 08:38:39 -07:00
Bobak Oftadeh
0a3568cc74 Added mute meeting settings to yml file 2018-10-15 15:24:56 -07:00
Bobak Oftadeh
65276a5423 Altered user manage button styles 2018-10-12 14:19:30 -07:00
Bobak Oftadeh
21b84a5303 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-12 09:17:19 -07:00
Bobak Oftadeh
52aa4fd3c1 Mute meeting functionality implemented 2018-10-11 14:27:56 -07:00
Anton Georgiev
a815433fb0
Merge pull request #6143 from gustavotrott/master 
Adds compatibility with Electron Chromium to choose one screen to share
 2018-10-11 13:11:52 -04:00
Maxim Khlobystov
97ebd02595
Merge pull request #6090 from jfsiebel/ini-configuration-file 
Remove settings and use yml file
 2018-10-11 13:03:48 -04:00
Richard Alam
1a9e6486c9
Merge pull request #6147 from ritzalam/add-metrics-to-get-recordings-api 
Return some data metrics on get recordings api
 2018-10-11 10:52:14 -04:00
gustavotrott
4f607d304a Move duplicated parameters to a constant in the beginning 2018-10-11 10:24:12 -03:00
Richard Alam
f780a43c44 - implement data metrics on metadata.xml 2018-10-10 11:38:31 -07:00
gustavotrott
265275018e Added compatibility with Electron Chromium 2018-10-09 10:43:22 -03:00
Bobak Oftadeh
e5ae59908c Altered lock viewers label 2018-10-04 15:16:09 -07:00
Anton Georgiev
01e001f3ab
Merge pull request #6126 from Tainan404/fix-setting-dropdown-intl 
change intl label for consistency with others options.
 2018-10-03 09:55:58 -04:00
Calvin Walton
c5810ae953
Merge pull request #6113 from jfederico/record-and-playback 
Added script for sending recording ready notifications
 2018-10-02 16:17:22 -04:00
Tainan Felipe
aa24a4b3b5 change intl label for have concistency with others options 2018-10-02 16:39:09 -03:00
jfederico
90e3c6e360 Added script for recording ready notification 2018-10-02 18:57:15 +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
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07: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
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
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
75a161adbf
Merge pull request #5207 from riadvice/mobile-no-force-debug 
Remove force debug in LoadingScreenMediator
 2018-09-21 11:36:21 -04: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
João Francisco Siebel
bb58a3fde6 let server handle parameters 2018-09-19 17:32:17 -03:00
Anton Georgiev
8c0394f52e
Merge pull request #6085 from oswaldoacauan/fix-missing-stuff-on-meeting-removal 
Fix not clearing pods and token when removing a meeting
 2018-09-19 14:45:02 -04:00
Anton Georgiev
7ca66965da
Merge pull request #6086 from oswaldoacauan/fix-6012 
Fix fuzzy chat font rendering.
 2018-09-19 14:40:32 -04:00
Anton Georgiev
8df901e0bf
Merge pull request #6087 from Tainan404/zoom-implementation 
Zoom call only for presenter
 2018-09-19 14:15:41 -04:00
Tainan Felipe
61c4c62e54 Zoom call only for presenter 2018-09-19 15:13:09 -03:00
Oswaldo Acauan
750f1bc35a Fix fuzzy chat font rendering. Closes #6012 2018-09-19 14:57:39 -03:00
Oswaldo Acauan
1c12b380a2 Fix not clearing pods and token when removing a meeting 2018-09-19 14:48:15 -03:00
Anton Georgiev
fd02b04a2d
Merge pull request #6025 from BobakOftadeh/chat-width-increased-window 
Extended the Width of the Chat Area
 2018-09-19 13:05:06 -04:00
Bobak Oftadeh
121e47982f Changed chat-width from pixel to precent. 2018-09-19 08:21:14 -07:00
Anton Georgiev
eb275cfc93
Merge pull request #6084 from Tainan404/zoom-implementation 
Add hand in setting prod
 2018-09-19 11:04:43 -04:00
Tainan Felipe
3bfce89396 change the setting prod 2018-09-19 12:00:49 -03:00
Anton Georgiev
8e81fc46af
Merge pull request #6010 from Tainan404/zoom-implementation 
Zoom implementation for HTML5
 2018-09-19 10:11:34 -04:00
João Francisco Siebel
09d0a62076 Remove settings files 2018-09-19 11:00:36 -03:00
Tainan Felipe
7d202ada62 Remove comment 2018-09-19 09:55:47 -03:00
Tainan Felipe
24e0fc55cd Remove unused code 2018-09-19 09:09:45 -03:00
João Francisco Siebel
6f8a3fd9cd read settings from ini file 2018-09-18 13:12:16 -03:00