Commit Graph

18806 Commits

Author SHA1 Message Date
Maxim Khlobystov
a11e695756 Made sure the fix for escaping backslashes is applied when you run the Transifex for all locales at once. 2017-10-19 20:58:47 +00:00
Maxim Khlobystov
0b84b9c443 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into khmer-locale-fix 2017-10-19 20:34:02 +00:00
Maxim Khlobystov
f455ec97bd Updated the Khmer labels (doesn't break anymore). 2017-10-19 20:29:30 +00:00
Maxim Khlobystov
c44bd1c7fd Fixed the Transifex script to make sure it preserve escaping backslashes in the JSON file supplied by Transifex. 2017-10-19 20:24:36 +00:00
Ghazi Triki
b447d18b04 Invalidate 'breakoutEjectFromAudio' state if the join audio button is pressed. 2017-10-19 15:59:01 +01:00
Ghazi Triki
ec48b1ec2d Display join audio window if back from breakout room. 2017-10-19 15:51:58 +01:00
Richard Alam
1abba9391d Merge branch 'riadvice-2x-client-theme' into v2.0.x-release 2017-10-19 07:17:30 -07:00
Richard Alam
b718d92767 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-10-19 07:12:46 -07:00
gcampes
c600a78fea Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor 2017-10-19 09:45:06 -02:00
Oswaldo Acauan
27ba271f56 Fix condition for duplicated notification 2017-10-19 09:44:09 -02:00
gcampes
3bd709c629 Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor 2017-10-19 09:39:50 -02:00
Oswaldo Acauan
ebfed7795e Add notification when recording start/stop 2017-10-19 08:45:07 -02:00
Oswaldo Acauan
cbc3ea9e36 Add handlers for recording messages 2017-10-19 08:44:41 -02:00
Oswaldo Acauan
0686a596e9 Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-19 08:07:42 -02:00
gcampes
b15322e7f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-18 17:42:49 -02:00
gcampes
1dda597fca Toast notifications on audio and overall changes 2017-10-18 17:40:01 -02:00
Oswaldo Acauan
317335d359 Revert caret for the react-tostify package 2017-10-18 17:38:53 -02:00
Ghazi Triki
e1b5d6b9f1 Improve screen-sharing view layout and video scaling. 2017-10-18 18:31:04 +01:00
Joao Siebel
da9e2ef3a4 Fix function name in updateVoiceUser 2017-10-18 10:30:33 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
Richard Alam
fa877e8f73 Merge branch 'capilkey-fix-user-avatar-size' into v2.0.x-release 2017-10-16 10:36:35 -07:00
Richard Alam
9e193bf631 Merge branch 'fix-user-avatar-size' of https://github.com/capilkey/bigbluebutton into capilkey-fix-user-avatar-size 2017-10-16 10:30:39 -07:00
prlanzarin
26303748c8 Merge remote-tracking branch 'origin/html5-video-screenshare' into node-bbb-apps-packaging 2017-10-16 13:50:22 +00:00
prlanzarin
340fac36cb Added bbb-webrtc-sfu WS session identification 2017-10-16 13:37:13 +00:00
Richard Alam
bffaabfffd Merge branch 'riadvice-2x-client-theme' into v2.0.x-release 2017-10-13 14:37:26 -07:00
Richard Alam
d4997454e8 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-10-13 14:21:40 -07:00
Ghazi Triki
f72d165fa9 Make most of the popup windows closable using keayboard ESCAPE button. 2017-10-13 18:14:50 -03:00
prlanzarin
07f50252bb Properly close webrtc peers when sharing webcam 2017-10-13 21:13:41 +00:00
Ghazi Triki
0d634b4c0d Redesign CustomLayoutNameWindow window. 2017-10-13 18:13:33 -03:00
Ghazi Triki
c693215cab Remove scrollbar from AddChatTabBox component. 2017-10-13 18:12:43 -03:00
prlanzarin
eec9c8c3b1 Removed postinstall from node app package.json 2017-10-13 20:06:16 +00:00
prlanzarin
b49362d8d5 Some screensharing pubsub rework
Added package.json
2017-10-13 19:51:50 +00:00
Chad Pilkey
b77be1a9f4 fix user avatar image sizing 2017-10-13 11:37:41 -07:00
Oswaldo Acauan
c801ad8996 Fix the version of react-toastify util we update to react 16 2017-10-13 15:24:58 -03:00
Anton Georgiev
f1de51595d Merge pull request #4515 from OZhurbenko/fix-warnings-assign-presenter
[HTML5] - Fix for the React console warnings
2017-10-13 14:06:31 -03:00
prlanzarin
6b24bb0080 Configurable client port for node-bbb-apps 2017-10-13 15:00:16 +00:00
prlanzarin
5ce924f892 node-bbb-apps config example and keys dir removal 2017-10-13 14:50:41 +00:00
Oswaldo Acauan
0dd371087b Fix logClient method name 2017-10-13 11:49:48 -03:00
Ghazi Triki
cbe9ca666a Add new skins for the NumericStepper component to make the UI consistent. 2017-10-13 11:40:24 -03:00
Richard Alam
62d7461ae5 Merge branch 'riadvice-2x-browser-detection' into v2.0.x-release 2017-10-13 07:03:30 -07:00
Richard Alam
f197aaff62 Merge branch '2x-browser-detection' of https://github.com/riadvice/bigbluebutton into riadvice-2x-browser-detection 2017-10-13 06:52:32 -07:00
Augusto Bennemann
ec941bacab Improve video reconnection 2017-10-13 13:50:48 +00:00
prlanzarin
fa1043d432 First draft of node-bbb-apps module 2017-10-13 13:50:17 +00:00
gcampes
2ae020ba9a Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor-notifications 2017-10-13 10:43:27 -03:00
Tainan Felipe
873d227819 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-13 10:35:38 -03:00
Oleksandr Zhurbenko
b3572cec3a Changed the way the object is assigned 2017-10-12 17:20:27 -07:00
Anton Georgiev
8e6e450195 Merge pull request #4514 from OZhurbenko/merge-2.0-1.1-api
[HTML5] - Follow up on 2.0 -> 1.1 api merge
2017-10-12 21:17:47 -03:00
Anton Georgiev
8e1e6225bb Merge pull request #4517 from jfsiebel/breakoutrooms-modal-hide
[HTML 5] Closes breakout room modal when the breakout room are closed
2017-10-12 21:17:18 -03:00
Tainan Felipe
98b23640fd solve bug no disppear modal presentation-upload 2017-10-12 21:12:00 -03:00
Ghazi Triki
7449f1555e Fix toolbar top paddingTop style. 2017-10-12 20:14:14 -03:00