BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,246 Commits 13 Branches 260 Tags 1.1 GiB
517e252901
Commit Graph

946 Commits

Author SHA1 Message Date
KDSBrowne
88785d9f00 prevent upload dropzone displaying red for valid file types 2019-04-05 03:35:55 +00:00
Tainan Felipe
51660895ba Add remember checkbox for remember guest policy choice 2019-04-03 17:11:47 -03:00
Anton Georgiev
d1403281ef pulled html5 locales Apr 3, 2019; added Arabic 2019-04-03 15:50:01 +00:00
Joao Siebel
6bbaeea0a0 Merge remote-tracking branch 'upstream/master' into network-indicator 2019-04-03 09:01:32 -03:00
Chad Pilkey
b75e579acf
Merge pull request #7062 from riadvice/html5-files-cdn 
Support loading the HTML5 main JS file and its assets from a CDN
 2019-03-29 16:38:01 -04:00
bobakoftadeh
4664f2fee9 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into update-webcam-label 2019-03-29 14:50:02 +00:00
bobakoftadeh
f8cca12db8 Update webcam locked label 2019-03-29 14:31:56 +00:00
Diego Benetti
1d6762f400 Will improve a if statement and message's text 2019-03-29 10:45:53 -03:00
Chad Pilkey
d12707b14d add modal warnings for edge users 2019-03-28 15:18:22 -07:00
KDSBrowne
a6d16c41a1 Pull locales from Transiex - 2019/03/27 2019-03-27 21:03:35 +00:00
Joao Siebel
e405720fc3 add error boundary for presentation 2019-03-26 14:36:26 -03:00
Tainan Felipe
76233e80e9 Improve error messages information 2019-03-25 13:34:12 -03:00
Joao Siebel
701911734b Merge remote-tracking branch 'upstream/master' into network-indicator 2019-03-25 09:52:33 -03:00
Vitor Mateus
90290c6b67 Merge remote-tracking branch 'upstream/master' into issue-6724 2019-03-22 17:54:23 -03:00
bobakoftadeh
0af54b03fd Add resume title to recording modal 2019-03-20 17:20:28 +00:00
Diego Benetti
0cda5bf5ad Messages of the locks improved 2019-03-19 14:48:33 -03:00
Diego Benetti
f3b9fe26de Rule to show notification to viewers of webcam, microphone and chatting locks implemented 2019-03-19 11:15:44 -03:00
Anton Georgiev
bb5bff6c45
Omit "BigBlueButton" in language file 
(keeping it only in the optional Feedback which is disabled by default)
 2019-03-18 11:17:16 -04:00
Ghazi Triki
106058e1dd Support loading the HTML5 main JS file and its assets from a CDN. 2019-03-18 09:57:43 +01:00
KDSBrowne
04c11ad26d fix for issue #7033 2019-03-15 13:04:19 +00:00
Anton Georgiev
474bc1e172
Update en.json 
Closes #7028
 2019-03-14 15:21:53 -04:00
Anton Georgiev
3623b85258
Merge pull request #7015 from jfsiebel/user-inactivity-update 
Update inactivity modal
 2019-03-14 14:02:56 -04:00
Anton Georgiev
af4edb7cbc
Merge pull request #6884 from eduardohfnascimento/fix-upload-types 
Change as mime types are coded
 2019-03-14 12:57:31 -04:00
Anton Georgiev
0e894203b3 pulled html5 locales March 14, 2019 2019-03-14 16:42:53 +00:00
Anton Georgiev
2d785ad10c
Merge pull request #6999 from BobakOftadeh/youtube-input-text-improvement 
Improved YouTube URL input field
 2019-03-14 11:52:58 -04:00
Joao Siebel
3b0ca0609f Rename logout messages and add the missing ones 2019-03-14 11:15:30 -03:00
Joao Siebel
1eb99862f9 Add message for permission eject 2019-03-14 10:25:07 -03:00
Joao Siebel
3cfc64ac89 Merge remote-tracking branch 'upstream/master' into user-inactivity-update 2019-03-14 09:29:52 -03:00
Anton Georgiev
e871d0a800
Merge pull request #6984 from vitormateusalmeida/issue-6944 
Fix tooltips and fullscreen
 2019-03-13 14:09:22 -04:00
Anton Georgiev
8a636ff0b1
Update en.json 2019-03-13 08:59:47 -04:00
Joao Siebel
cb3763ca31 Adjust messages when removed or by inactivity. close #6911 close #6928 2019-03-12 15:02:52 -03:00
bobakoftadeh
29472385cc Improved YouTube URL input field 2019-03-12 17:11:36 +00:00
Vitor Mateus
e5afdacb50 Merge remote-tracking branch 'upstream/master' into issue-6944 2019-03-12 14:05:32 -03:00
Anton Georgiev
bdd9182872
Merge pull request #6981 from KDSBrowne/2.2-toggle-ftw-label 
Fix fitToWidth label toggle / button alignment
 2019-03-12 10:14:56 -04:00
gustavotrott
e5c26c60ef Implement slow connection indicator 2019-03-11 21:34:34 -03:00
Vitor Mateus
7c76ec4e3a Fix tooltips and fullscreen 2019-03-11 13:21:12 -03:00
KDSBrowne
2381ebc5c3 fix label toggle for fit to width / page button 2019-03-10 17:21:48 +00:00
Chad Pilkey
9940846ff9 clean up issues introduced in #6869 2019-03-08 18:02:46 -08:00
Anton Georgiev
e174a2a197
Merge pull request #6869 from Tainan404/issue-6717 
Add pending/guest users waiting to approval panel
 2019-03-08 17:12:28 -05:00
Anton Georgiev
cdae49db36
Merge pull request #6961 from antobinary/minor-fixes-2 
Remove all Verto code
 2019-03-08 17:10:22 -05:00
Tainan Felipe
e91859b816 Fix poll exception when no presentation selected 2019-03-08 17:46:25 -03:00
Anton Georgiev
8380875e70 remove Verto code 2019-03-08 19:41:19 +00:00
Anton Georgiev
48163aaac2 set enableScreensharing to true by default 2019-03-08 17:40:46 +00:00
eduardohfnascimento
4e25463d8f fix Drop and upload files 2019-03-07 16:53:01 -03:00
Anton Georgiev
25a2d0a707
Merge pull request #6902 from MaximKhlobystov/fix-client-log-feedback 
Since Chad Pilkey (@capilkey ) approved, we should merge...
 2019-03-06 11:28:07 -05:00
Anton Georgiev
37322fab26
Merge pull request #6870 from jfsiebel/implement-user-inactivity-check 
Implement user inactivity check
 2019-03-05 16:53:10 -05:00
Anton Georgiev
24e0808ac2 pulled latest html5 locales; added Hebrew 2019-03-05 19:31:28 +00:00
Joao Siebel
c93e21f2d8 Merge remote-tracking branch 'upstream/master' into implement-user-inactivity-check 2019-03-05 15:06:54 -03:00
Maxim Khlobystov
2f8e9801da Sending the feedback log before going to logout URL 2019-03-04 17:41:04 -05:00
Vitor Mateus
db7b66f7f7 Removed settings modifications 2019-03-04 17:31:58 -03:00
Fred Dixon
82ac198478
Merge pull request #6893 from ffdixon/prep-2.2 
Prep 2.2
 2019-03-04 09:58:56 -05:00
Fred Dixon
44330fea49 Make Kurento enableListenOnly true and update help URL 2019-03-04 08:57:51 -06:00
Anton Georgiev
aac229b833
Merge pull request #6838 from gustavotrott/quick-poll-implement 
Quick poll implement
 2019-03-04 08:53:18 -05:00
Anton Georgiev
998d2d1e33
Merge pull request #6834 from KDSBrowne/2.2-imprv-notes-accessibility 
Improve shared notes accessibility
 2019-03-04 08:52:52 -05:00
Paulo Lanzarin
fdb8d889c7
[HTML5] Change default resolution for webcams to 320x240 
- This was done to mitigate packet loss and flickering and better abide to our default configured bitrate (300kbps).
This goes alongside updates to bbb-webrtc-sfu and kurento-media-server to increase reliablity and diminish stream artifacts.
I'll probably revisit this resolution change once I can correctly identify the source of corrupted frames, but I really think we should
maintain this as 320x240 for the time being. 640x480 would only be feasible if we increased our default bitrate config to 500kbps.
 2019-03-01 16:20:08 -03:00
Vitor Mateus
e1616c0a3b Make sigle webcam draggable #6724 2019-02-28 18:39:57 -03:00
eduardohfnascimento
5b1b24a366 Change as mime types are coded 2019-02-28 17:47:34 -03:00
Joao Siebel
b5929dc4b5 Add activity check modal 2019-02-26 14:40:01 -03:00
Tainan Felipe
3648afcf3f Add pending/guest users waiting to approval panel 2019-02-26 14:08:15 -03:00
Gustavo Trott
c6b725a36b Resolve conflicts 2019-02-25 09:24:00 -03:00
KDSBrowne
6dbb56fabb provide message on how to escape Etherpad edit field 2019-02-23 22:38:58 +00:00
Anton Georgiev
736dabba78
Merge pull request #6835 from KDSBrowne/2.2-configurable-help-link 
Make the help link configurable
 2019-02-22 11:09:33 -05:00
Anton Georgiev
3003ccf7ab
Merge pull request #6779 from gustavotrott/slide-text-for-accessibility 
Add texts extracted from slides for accessibility
 2019-02-22 11:00:34 -05:00
Anton Georgiev
f9f73fa6a8
Merge pull request #6845 from antobinary/locales-1 
Pulled the latest html5 client locales; added cs_CZ
 2019-02-22 10:08:12 -05:00
Anton Georgiev
144747ddc4 pulled latest html5 locales; added cs_CZ 2019-02-22 15:06:19 +00:00
Anton Georgiev
d4dcc11675 add missing checkbox locale (presentation upload) 2019-02-22 14:56:13 +00:00
Anton Georgiev
d18923974d
Merge pull request #6822 from antobinary/presentation-download 
Presentation download
 2019-02-22 09:03:44 -05:00
Anton Georgiev
a1fc31101c adjusted icons, state for download presentation 2019-02-21 21:10:32 +00:00
Gustavo Trott
3f21c82330 implement quick poll feature 2019-02-21 18:01:39 -03:00
Anton Georgiev
d709387c85
Merge pull request #6821 from capilkey/improved-html5-audio-errors 
Useful HTML5 sip.js bridge errors
 2019-02-21 15:30:36 -05:00
Anton Georgiev
a329732e40 WIP localizing presentation-upload 2019-02-20 22:44:44 +00:00
Chad Pilkey
89b8189087 html5 sipjs bridge has useful errors now 2019-02-20 13:58:37 -08:00
Anton Georgiev
9438b45a46 use real link to presentation to download 2019-02-20 17:17:17 +00:00
Gustavo Trott
ff05c4f971 Update slides content 2019-02-20 13:38:52 -03:00
KDSBrowne
80e29254c3 move help link to settings.yml 2019-02-20 16:01:40 +00:00
Joao Siebel
cc7dccb4ba update labels 2019-02-15 15:36:28 -02:00
Joao Siebel
78f03f1b32 Update action label when a video is already been shared. close #6604 2019-02-15 15:32:03 -02:00
Gustavo Trott
1695e5e967 Add texts extracted from slides for accessibility 2019-02-14 16:42:13 -02:00
Anton Georgiev
5776e9b432
Merge pull request #6716 from KDSBrowne/2.2-SR-cust-poll-options 
Make SR announce poll inputs individually
 2019-02-13 09:55:23 -05:00
Vitor Mateus
bee218adfb Merge remote-tracking branch 'upstream/master' into issue-6521 2019-02-08 15:23:53 -02:00
Anton Georgiev
48a951d253
Merge pull request #6660 from KDSBrowne/2.2-accessibility-minor-update 
Fix minor accessibility issues
 2019-02-07 15:23:39 -05:00
Anton Georgiev
e5df6d9727
Merge pull request #6730 from KDSBrowne/2.2-fullscreen-element-label 
Improve the label used by FullscreenButtonComponent
 2019-02-07 14:05:50 -05:00
Anton Georgiev
7e94f096db
Merge pull request #6618 from Tainan404/issue-6450 
Add meeting time remaining notification bar status
 2019-02-07 10:20:34 -05:00
KDSBrowne
e172220287 make fullscreen btn label include element name 2019-02-06 21:12:59 +00:00
Anton Georgiev
b126c2b08b
Merge pull request #6637 from BobakOftadeh/add-webcam-flag 
Added flag to hide dropdown menu in webcam
 2019-02-06 13:41:55 -05:00
KDSBrowne
eb3bf6010e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update 2019-02-06 17:09:47 +00:00
Anton Georgiev
6b1db968d2
Merge pull request #6686 from KDSBrowne/2.2-accessibility-update-02 
Improve create breakoutroom modal accessibility
 2019-02-06 11:52:43 -05:00
Vitor Mateus
8a8c5a997b Add locale for reset zoom button 2019-02-06 14:42:12 -02:00
KDSBrowne
38a05de498 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update 2019-02-06 14:49:44 +00:00
Tainan Felipe
4e43c99384 Add alert when is under a minute to end 2019-02-05 17:18:20 -02:00
Fred Dixon
79e94c2390
Enable external video (YouTube) by default 2019-02-05 12:37:59 -05:00
Tainan Felipe
742040c57b Merge remote-tracking branch 'upstream/master' into issue-6450 2019-02-05 13:01:20 -02:00
Anton Georgiev
42ce30416b
Merge pull request #6634 from vitormateusalmeida/issue-5846 
Implement enable/disable Animations
 2019-02-05 09:49:36 -05:00
Anton Georgiev
b27a0a7047
Update en.json 
Related to #6334
 2019-02-04 15:29:43 -05:00
Anton Georgiev
9c677319a7
Rename label for publishing polling results 
Closes #6334
 2019-02-04 15:28:17 -05:00
bobakoftadeh
ea078b07a4 Improved implementation of flag for hide webcam dropdown 2019-02-04 16:44:28 +00:00
KDSBrowne
7aa16a2d4b prevent SR announcing poll inputs as one element 2019-02-02 03:56:15 +00:00
Anton Georgiev
31dba59957 pull HTML5 locales Feb1, 2019 2019-02-01 18:47:53 +00:00
KDSBrowne
c6dd0cb387 improve label / use camel case 2019-02-01 15:48:54 +00:00
Vitor Mateus
17a299688e Merge remote-tracking branch 'upstream/master' into issue-5846 2019-02-01 10:59:52 -02:00
Anton Georgiev
db2ca3ce79
Fix typo in en.json 2019-01-31 11:41:44 -05:00
Vitor Mateus
7e90c011bd Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-31 13:27:43 -02:00
Anton Georgiev
66a6189bb5
Update en.json 2019-01-30 17:34:34 -05:00
Anton Georgiev
c667c08f65
Merge pull request #6683 from ffdixon/update-locales 
Update/make consistent language strings
 2019-01-30 17:33:00 -05:00
bobakoftadeh
72dc981680 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-webcam-flag 2019-01-30 22:15:07 +00:00
Vitor Mateus
64210cc610 Fixes 2019-01-30 15:43:11 -02:00
KDSBrowne
afe66d560f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update 2019-01-30 14:40:55 +00:00
Vitor Mateus
e0ddffbf66 Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-30 10:01:29 -02:00
KDSBrowne
f602611e44 improve create breakoutroom modal accessibility / fix pre-existing lint errors 2019-01-30 02:15:01 +00:00
Fred Dixon
2c044b9e69 Update/make consistent language strings 2019-01-29 18:09:51 -06:00
Anton Georgiev
d6d91c9722
Merge pull request #6681 from antobinary/locales 
Pulled the latest HTML5 client locales from Transifex Jan 29, 2019
 2019-01-29 16:57:40 -05:00
Anton Georgiev
76bf828a02 pulled latest HTML5 client locales from Transifex 2019-01-29 21:15:10 +00:00
Joao Siebel
ba198e82c6 add unlock/lock individual attendee when the meeting is locked. close #6661 2019-01-29 13:17:09 -02:00
bobakoftadeh
5009854835 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-webcam-flag 2019-01-28 21:48:27 +00:00
Anton Georgiev
ff43b848e8
Merge pull request #6644 from antobinary/issue-6625 
Localize "No locale selected; fix locales fetch
 2019-01-28 16:33:34 -05:00
Anton Georgiev
38afdcf22b
Merge pull request #6640 from pedrobmarin/master-presentation-ui 
New UI for presentation/video swap and fullscreen buttons
 2019-01-28 12:33:47 -05:00
KDSBrowne
749a609565 fix minor accessibility issues 2019-01-28 13:33:50 +00:00
Pedro Beschorner Marin
5b760b46ef Fixed share video button for locked users 2019-01-28 11:24:03 -02:00
Vitor Mateus
c140acbd6b Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-28 10:14:46 -02:00
Anton Georgiev
6ef4f39903 Localize "No locale selected; fix locales fetch 2019-01-25 18:19:54 +00:00
Pedro Beschorner Marin
d8fd9910bb Removed pt_BR translations made out transifex 2019-01-25 11:03:51 -02:00
bobakoftadeh
f7074e5548 Renamed flag for hiding webcam menu 2019-01-24 22:08:47 +00:00
bobakoftadeh
a3f20aa281 Added flag to hide dropdown menu in webcam 2019-01-24 21:15:43 +00:00
Vitor Mateus
b6d5b15e3e Implement enable/disable Animations issue-5846 2019-01-24 14:16:23 -02:00
Anton Georgiev
812c1fb125 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-logs 2019-01-23 22:06:30 +00:00
Anton Georgiev
975102fb0f fixed json parsion issues in Transifex locale strings 2019-01-23 21:44:51 +00:00
Anton Georgiev
d7dadec51d add 2.2 html5 localized strings 2019-01-23 21:16:33 +00:00
Tainan Felipe
cfee36f8d7 Add time remaining notification bar status 2019-01-23 14:13:03 -02:00
Anton Georgiev
59e16a0bec
Merge pull request #6614 from antobinary/remove-logs 
Recovered matching 2.0 German strings manually
 2019-01-22 16:57:53 -05:00
Anton Georgiev
850e9bc718 Recovered matching 2.0 German strings manually 2019-01-22 21:56:30 +00:00
Anton Georgiev
acaeafdea0
Merge pull request #6598 from bigbluebutton/antobinary-video-enable 
Enable kurento webcams [video] by default
 2019-01-21 12:35:10 -05:00
Anton Georgiev
fa7014c133
Merge pull request #6597 from antobinary/remove-logs 
Removed REDIS pubsub html5 logs; Disabled debug by default
 2019-01-21 12:24:40 -05:00
Anton Georgiev
3fe058db31
Enable kurento webcams [video] by default 2019-01-21 12:08:04 -05:00
Anton Georgiev
c1ad2f30a6
Remove km.json missed in #6589 2019-01-21 12:06:59 -05:00
Anton Georgiev
51f7645607 remove REDIS pubsub html5 logs; turned off debug 2019-01-21 17:00:24 +00:00
Lucas Zawacki
57fc7a81f0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into youtube-2.2 2019-01-21 02:50:56 -03:00
Anton Georgiev
831bb77d33
Merge pull request #6589 from antobinary/logout-endmeeting-menu 
HTML5 client locales on 2.2
 2019-01-18 16:43:52 -05:00
Anton Georgiev
94ab770c94 html5 locales on 2.2; updated script and files 2019-01-18 16:42:37 +00:00
Anton Georgiev
3365cabc72
Update year in html5 settings.yml 2019-01-17 15:15:10 -05:00
Anton Georgiev
0190ef4528 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logout-endmeeting-menu 2019-01-17 18:53:32 +00:00
Anton Georgiev
ff3898224b
Merge branch 'master' into master-presentation-ui 2019-01-16 17:33:29 -05:00
Anton Georgiev
9fa096436d
Merge pull request #6511 from Tainan404/issue-6485 
Re style error component and implements error description.
 2019-01-16 14:55:23 -05:00
Anton Georgiev
49f8a99766
Merge pull request #6476 from Tainan404/issue-6392 
Add breakout room invitation feature
 2019-01-16 13:30:11 -05:00
Lucas Zawacki
bf99fff416 Fix a few more linter errors and remove old translation 2019-01-16 14:01:22 -03:00
Lucas Zawacki
9b2bc7c219 Correctly unmount youtube player area 2019-01-16 10:40:49 -03:00
Anton Georgiev
0d1a351842
Update audio overlay to omit BigBlueButton word 
Closes #6562
 2019-01-15 17:35:47 -05:00
Lucas Zawacki
e883d3a2b0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into master-presentation-ui 2019-01-15 10:31:12 -03:00
Anton Georgiev
b4bd4d1725 recording indicator checks if iAmModerator; end meeting menu 2019-01-14 21:39:03 +00:00
Lucas Zawacki
550bbcd492 Share synchronized youtube video in presentation area 2019-01-14 14:40:27 -03:00
Tainan Felipe
0918cc4084 Merge remote-tracking branch 'upstream/master' into issue-6392 2019-01-14 09:30:59 -02:00
Anton Georgiev
afb812b531 WIP end meeting menu 2019-01-12 00:20:04 +00:00
KDSBrowne
6205059070 edit formatted string / use ternary operator / omit passing Auth.userId 2019-01-11 19:15:31 +00:00
KDSBrowne
f11fed7bd7 add take presenter role to actions menu 2019-01-10 16:10:45 +00:00
Pedro Beschorner Marin
824b6c83c9 Extra config to be used with generic Etherpad servers 2019-01-10 10:12:33 -02:00
Anton Georgiev
3fbcb84bb2
Change label of hand tool in whiteboard tools 
Closes #6297
 2019-01-09 16:13:47 -05:00
Anton Georgiev
02e72e9a96
Update tooltip for multi-user mode 
Closes #6333
 2019-01-09 16:03:34 -05:00
Anton Georgiev
0466189624
Merge pull request #6491 from Tainan404/issue-6335 
Add custom font feature and define desktop version to 14px
 2019-01-09 15:27:29 -05:00
Anton Georgiev
c2a9ff67ae
Merge pull request #6389 from BobakOftadeh/record-indicator 
Record indicator
 2019-01-09 14:42:58 -05:00
Tainan Felipe
a5f15b2e1c Add 400 bad request status to error screen 2019-01-08 16:38:26 -02:00
Pedro Beschorner Marin
a8517638c0 Shared notes title and extra config 2019-01-08 13:26:33 +00:00
Pedro Beschorner Marin
e413d0a5c3 Included shared notes feature 2019-01-08 13:24:34 +00:00
Bobak Oftadeh
17ccd17e54 Fixed focus on record button 2019-01-03 21:39:52 +00:00
Bobak Oftadeh
e4d97538a3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testRecord 2019-01-03 20:28:27 +00:00
Bobak Oftadeh
eb5c061e8f Implemented recording timer 2019-01-03 18:43:17 +00:00
Anton Georgiev
66512f9e75
Merge pull request #6411 from zhu/fix-file-uploader-2 
Fix file uploader mobile
 2019-01-03 13:19:27 -05:00
Tainan Felipe
38a91e4559 rename settings variables 2019-01-03 15:55:10 -02:00
Tainan Felipe
c1aacc8823 Add custom font feature and define desktop version to 14px 2019-01-03 15:35:52 -02:00
Lucas Zawacki
6101ca5c13 Close presentation via a button in the top corner 2019-01-02 16:08:33 -03:00
KDSBrowne
aba38b635b update tooltips to use sentence case 2018-12-28 21:26:35 +00:00
Tainan Felipe
53c935b7eb Add breakout room invitation feature 2018-12-27 14:20:03 -02:00
KDSBrowne
418d0ee5a3 set showParticipantsOnLogin flag default to true 2018-12-21 20:24:53 +00:00
KDSBrowne
7c0bef6256 add config param to show userlist on join 2018-12-21 20:16:36 +00:00
Anton Georgiev
85d2e162c5
Merge pull request #6404 from Tainan404/issue-6261 
Add mobile version to sort user on create breakout rooms
 2018-12-19 13:40:07 -05:00
prlanzarin
8e7fe4b50b Removed generic camera errors and improved video-preview gUM error handling 2018-12-17 17:45:57 +00:00
zhu
a0afca45b8 add dropzoneImagesLabel for images dropzone 2018-12-17 17:30:32 +08:00
zhu
01279fd804 separate pics or files upload in mobile device 2018-12-17 17:27:17 +08:00
zhu
b4d58fbd9c notify user when selected files is rejected 2018-12-17 17:23:00 +08:00
Tainan Felipe
18ba3e402f Merge remote-tracking branch 'upstream/master' into issue-6261 2018-12-14 17:01:19 -02:00
Tainan Felipe
b279dac9e9 Add mobile version to sort user on breakout rooms 2018-12-14 10:33:58 -02:00
Anton Georgiev
fbb12b055e
Merge pull request #6276 from Tainan404/issue-6262 
Add drag & drop grid for breakout rooms
 2018-12-13 11:35:24 -05:00
Bobak Oftadeh
5dfbafb30f Implemented recording modal 2018-12-12 11:09:33 -08:00
Anton Georgiev
0c05b7befa
Fix typos 
Close #6369
 2018-12-10 15:05:42 -05:00
Anton Georgiev
c69cb2d454
Update html5 client BBB version 2018-12-03 17:34:11 -05:00
Anton Georgiev
a236fd071b modify clientLog structure for easier parse-edit 2018-12-03 21:36:40 +00:00
Anton Georgiev
9c99457938
Edit poll label 
Closes #6303
 2018-11-29 15:43:20 -05:00
Tainan Felipe
d1ae927f6f Add warn message and open the breakouts room when create 2018-11-29 17:47:04 -02:00
Tainan Felipe
27e012ac56 Add drag and drop grid to sort user by room 2018-11-27 10:44:22 -02:00
Tainan Felipe
63a268b12f Add intl to free join and change the state to true by dafault 2018-11-23 15:20:49 -02:00
Bobak Oftadeh
70b533ba2e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-21 12:25:53 +00:00
Bobak Oftadeh
7edb133825 removed allowModeratorToUnmuteAudio property from settings.yml 2018-11-20 18:29:49 +00:00
Anton Georgiev
557f22a7fb
Merge pull request #6161 from BobakOftadeh/user-manage-b 
User manage button clear status, mute meeting implementation
 2018-11-16 16:21:05 -05:00
Bobak Oftadeh
15d4e84d55 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-16 12:06:57 -08:00
Bobak Oftadeh
5fb58cd604 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-11-15 12:55:57 -08:00
Maxim Khlobystov
e9a6d387e4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice 2018-11-14 17:20:43 -05:00
Bobak Oftadeh
cd6aae26e4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-13 14:20:50 -08:00
bobakoftadeh
c33723ac14 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C 2018-11-12 09:15:55 -08:00
Anton Georgiev
98ac77dc03 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands 2018-11-12 17:01:06 +00:00
bobakoftadeh
04421e631b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-mange-b 2018-11-12 08:40:47 -08:00
Anton Georgiev
ce26a3ed5e
Merge branch 'master' into remove-client-side-acl 2018-11-12 11:29:43 -05:00
Tainan Felipe
460cbdbcde Re-add settings 2018-11-12 09:46:20 -02:00
bobakoftadeh
87f63baa5a Improved interface for lock settings modal 2018-11-09 16:25:15 -08:00
João Francisco Siebel
076864ffd0 merge with master 2018-11-09 13:54:33 -02:00
Tainan Felipe
164835d49b
Merge branch 'master' into breakout-room-html5 2018-11-09 13:49:15 -02:00
Anton Georgiev
adbe9bb546 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands 2018-11-08 19:34:57 +00:00
bobakoftadeh
020ac800af Implemented functionality of lock settings 2018-11-08 10:55:12 -08:00
Anton Georgiev
9555cd68b8
Merge pull request #6105 from KDSBrowne/start-poll-01 
Add start, stop and publish a poll for Presenter
 2018-11-08 13:52:36 -05:00
Maxim Khlobystov
9f67ce4106 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice 2018-11-06 18:17:52 -05:00
Maxim Khlobystov
90f38561c3 Add Webcam Settings to choose a camera 2018-11-06 18:10:56 -05:00
bobakoftadeh
856459e989 Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C 2018-11-06 13:47:38 -08:00
Bobak Oftadeh
edc941da9e Implementation of lock-view modal menu 2018-11-06 13:39:07 -08:00
João Francisco Siebel
016efcc0eb Remove ACL from client side. close #6138 2018-11-05 17:30:37 -02:00
Tainan Felipe
fd8a63fbbb Change the method permissions for moderator 2018-11-05 10:27:56 -02:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
Ghazi Triki
ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master 
# Conflicts:
#	bigbluebutton-html5/imports/ui/services/audio-manager/index.js
 2018-11-02 21:02:02 +01:00
Bobak Oftadeh
a97a1ece37 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-11-02 09:17:07 -07:00
Tainan Felipe
5ea3ff2a7c Add permissioin on acl to moderator end breakout 2018-11-01 15:04:56 -03:00
Anton Georgiev
04883ffcdb handle iframe toggleRecording and toggle self muting 2018-11-01 15:03:16 +00:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
KDSBrowne
76e3759039 add formated message 2018-10-30 15:57:10 +00:00
Bobak Oftadeh
6bde6b06f5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-29 14:39:25 -07:00
Tainan Felipe
07d89a0132 Add intl to breakout room name 2018-10-29 16:29:45 -03:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
KDSBrowne
935eb1289d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-10-25 18:39:26 +00:00
Anton Georgiev
c80e379de6
Merge pull request #6104 from Tainan404/zoom-implementation 
Add fit-to-width  for html5
 2018-10-25 14:31:29 -04:00
KDSBrowne
47218ea351 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton 2018-10-25 16:18:31 +00:00
Anton Georgiev
1c720be973 pulled html5 locales oct 24, 2018 2018-10-24 20:36:48 +00:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
Anton Georgiev
e888f5dc14 removed dummy button examples visible without presentation 2018-10-24 14:01:07 +00:00
Anton Georgiev
57dc55b559 drop metadata configs; use userdata configs for autoSwap 2018-10-23 20:44:17 +00:00
Tainan Felipe
2b5c9a32b4 Add intl 2018-10-23 17:34:09 -03:00
Tainan Felipe
4d7861f0be Add intl message 2018-10-23 16:29:19 -03:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -03:00
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Bobak Oftadeh
0cde376e67 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-22 10:06:18 -07:00
Anton Georgiev
591adc89e6
Merge pull request #6168 from jfsiebel/configurable-whiteboard-tools-list 
Configurable whiteboard tools
 2018-10-22 13:00:14 -04:00
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage 
User manage button
 2018-10-22 10:54:18 -04:00
João Francisco Siebel
f936e319de implement configurable whiteboard tools. close #5826 2018-10-19 14:05:56 -03:00
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
KDSBrowne
bae71203a5 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router 2018-10-17 20:34:05 +00:00
Tainan Felipe
bd01d7e4aa to squash 2018-10-16 14:55:20 -03:00
KDSBrowne
51e14946db fix live results not being reset 2018-10-16 17:22:12 +00:00
Anton Georgiev
8ebb71322b remove chat url from settings.yml 2018-10-16 15:58:41 +00:00
KDSBrowne
cb6e988134 add missing items from setting.yml after merge 2018-10-16 15:25:45 +00:00
KDSBrowne
45eeb1d400 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-16 15:19:24 +00:00
Bobak Oftadeh
0a3568cc74 Added mute meeting settings to yml file 2018-10-15 15:24:56 -07:00
KDSBrowne
6c377b97bf add formatted strings 2018-10-15 19:05:50 +00:00
KDSBrowne
14066b4280 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into post-router-style-fix 2018-10-15 14:54:15 +00: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
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00