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

639 Commits

Author SHA1 Message Date
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
Vitor Mateus
64210cc610 Fixes 2019-01-30 15:43:11 -02:00
Vitor Mateus
e0ddffbf66 Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-30 10:01:29 -02: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
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
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
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
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