Commit Graph

18516 Commits

Author SHA1 Message Date
Richard Alam
a8df8f3cb3 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2017-10-12 06:37:12 -07:00
Richard Alam
bc9f66d63b Merge branch 'riadvice-2x-client-theme' into v2.0.x-release 2017-10-12 06:36:21 -07:00
Richard Alam
265dbb037b Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-10-12 06:23:02 -07:00
Anton Georgiev
af9f1e4dd3 Merge pull request #4506 from KDSBrowne/z01-update-locale-files
[HTML5] - add translation files from Transifex
2017-10-12 10:17:28 -03:00
Anton Georgiev
0824bc1471 Merge pull request #4503 from oswaldoacauan/user-list-scroll-bg
[HTML5] Fix user-list scroll shadow and message list max height
2017-10-12 09:53:42 -03:00
Ghazi Triki
aa157c7e08 Imporve create shared notes window. 2017-10-11 19:19:58 -03:00
Anton Georgiev
a850d1c9c1 Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite
[HTML5] Redis class refactor
2017-10-11 17:40:28 -03:00
Ghazi Triki
94cbc5177f Fix quote display when no quote is loaded from locales. 2017-10-11 17:23:26 -03:00
Ghazi Triki
83290fa384 Move shared notes setting button to the right. 2017-10-11 17:22:03 -03:00
Ghazi Triki
0353fa7985 Handle IO errors when saving files to desktop. 2017-10-11 17:10:51 -03:00
Anton Georgiev
c06ebab63b Merge pull request #4502 from KDSBrowne/z01-style-updates
[HTML5] - Update focus styles
2017-10-11 16:12:33 -03:00
KDSBrowne
5d80b29ca5 add traslations from Trasifex 2017-10-11 12:06:33 -07:00
Anton Georgiev
aa39361360 Merge pull request #4483 from OZhurbenko/presenter-functionality-2x
Fix for the Pencil Mongo additions
2017-10-11 15:22:39 -03:00
Oswaldo Acauan
34106e6de4 Fix user list messages max height 2017-10-11 15:11:48 -03:00
KDSBrowne
4a82fdf6c6 remove important flags and add color constant 2017-10-11 11:06:28 -07:00
Ghazi Triki
a694b95aec Update shared notes exported file name. 2017-10-11 14:49:25 -03:00
Anton Georgiev
7c4e4a61d9 Merge pull request #4501 from antobinary/hide-lock-settings
[HTML5 client] Temporarily hide moderator view of lock settings
2017-10-11 14:31:23 -03:00
Anton Georgiev
3af2969311 Merge pull request #4499 from antobinary/fix-emoji
[HTML5 client] Add missing states in emoji button icon change
2017-10-11 14:31:07 -03:00
Oswaldo Acauan
2bebe4262a Fix user-list scroll background 2017-10-11 14:28:34 -03:00
KDSBrowne
392d819905 apply new focus style to message input 2017-10-11 10:27:43 -07:00
Ghazi Triki
dc96e5b485 Fix chat tab close button style. 2017-10-11 14:13:25 -03:00
Anton Georgiev
ac93460ba7 temporarily hide moderator view of lock settings 2017-10-11 13:51:41 -03:00
Oswaldo Acauan
7935cbff01 Fix file permissions 2017-10-11 12:35:43 -03:00
Oswaldo Acauan
10fff502f7 Add comment about redis.js 2017-10-11 12:34:56 -03:00
Oswaldo Acauan
c08f6a9c4f Fix file permissions 2017-10-11 12:22:08 -03:00
Ghazi Triki
3c1a61751d Make shared notes format button selected when the format box is visible. 2017-10-11 11:20:41 -03:00
Ghazi Triki
fe032258fd Reposition firefox broswer helper for micrphone. 2017-10-11 10:54:59 -03:00
Anton Georgiev
3f1fd9e459 Merge pull request #4496 from MaximKhlobystov/underscore-locales-fix
[HTML5 Client] Fix for locales containing `_`
2017-10-11 10:54:08 -03:00
Ghazi Triki
05ee5b0438 Center quote and loading bar in screen. 2017-10-11 10:31:39 -03:00
Anton Georgiev
3b8c410a3c rearrange normalized emojis to match order of emoji definition 2017-10-11 10:09:47 -03:00
Anton Georgiev
50970b6cb3 fixes to change-emoji-button-on-emoji-change 2017-10-11 10:06:23 -03:00
KDSBrowne
a2cd4222d2 Merge branch 'v2.0.x-release' into z01-style-updates 2017-10-11 05:39:05 -07:00
Anton Georgiev
351a0e43cb Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator
[HTML5] -Allow HTML5 Moderator
2017-10-11 09:04:54 -03:00
Anton Georgiev
6c1526fec2 Merge pull request #4462 from KDSBrowne/xx-06-toggle-element-color-change
[HTML5] - Change toggle-switch  on/off state colors
2017-10-11 08:58:57 -03:00
Oleksandr Zhurbenko
bbe1f99527 Improvements 2017-10-10 16:20:52 -07:00
Oleksandr Zhurbenko
8b5a53a59a Moved pencil_chunk_size to the config
... And adjusted the way we fetch annotation statuses from the config
2017-10-10 14:50:11 -07:00
Maxim Khlobystov
6146f391f0 Made sure the locales that contain underscore are displayed properly when shown as current language in the Settings window. 2017-10-10 20:56:33 +00:00
Anton Georgiev
d9bf0c6752 Merge pull request #4490 from pedrobmarin/fix-4410
Updating presenter status
2017-10-10 17:53:52 -03:00
Oswaldo Acauan
3e5dacdaf1 Change meetingQueue delete 2017-10-10 15:30:45 -03:00
Oswaldo Acauan
d8ed7e23ee Remove debug message 2017-10-10 14:50:06 -03:00
Oswaldo Acauan
80a318309c Implement multi queues and async messages on Redis class 2017-10-10 14:43:42 -03:00
Pedro Beschorner Marin
5dfd772654 Updating presenter status 2017-10-10 14:38:27 -03:00
Anton Georgiev
66f8be63d2 Merge pull request #4475 from oswaldoacauan/fix-token-security
[HTML5] Add a check for the passed credentials agains the token in Acl
2017-10-10 12:48:41 -04:00
KDSBrowne
d9ae121130 remove wrapping body in an object 2017-10-10 08:05:16 -07:00
Chad Pilkey
a49a4f4354 Merge pull request #4489 from antobinary/fix-audio
[HTML5 client] Modify format of TURN server config for webrtc
2017-10-10 10:29:44 -04:00
Anton Georgiev
f50fb6aea8 modify format of TURN server config for webrtc 2017-10-10 11:12:35 -03:00
KDSBrowne
ac4181cc09 change focused state border thickness to 2px 2017-10-10 05:47:34 -07:00
Oleksandr Zhurbenko
1ab85be722 Permissions 2017-10-09 18:55:53 -07:00
Oleksandr Zhurbenko
4d8233fe10 Fix for the pencil Mongo additions 2017-10-09 18:30:29 -07:00
Richard Alam
f39174ab8c Merge pull request #4479 from ritzalam/fix-voice-user
- replace voice user when a new user joined voice conf event is rece…
2017-10-09 17:50:51 -04:00