Anton Georgiev
|
eb9dd49b75
|
Merge pull request #4551 from Tainan404/fix-errors-linter
[HTML5] Fix issue introduced on #4488
|
2017-10-23 15:53:32 -02:00 |
|
Fred Dixon
|
333f239b0b
|
Merge pull request #4552 from riadvice/screen-share-improve
[Flash 2.0] - Center ScreenshareViewWindow and make windows behind visible
|
2017-10-23 13:49:11 -04:00 |
|
Ghazi Triki
|
ca18daa681
|
Update switch display button style.
|
2017-10-23 18:20:10 +01:00 |
|
Ghazi Triki
|
d1cadd1237
|
Center ScreenshareViewWindow and make windows behind visible.
|
2017-10-23 18:14:16 +01:00 |
|
Tainan Felipe
|
02c617da68
|
solve error in nav-bar component
|
2017-10-23 14:26:56 -02:00 |
|
Tainan Felipe
|
da608da325
|
fix merge issue
|
2017-10-23 14:15:55 -02:00 |
|
Tainan Felipe
|
1469791bc7
|
solve merge issues
|
2017-10-23 13:50:31 -02:00 |
|
Tainan Felipe
|
5ac96e6979
|
solve merge issues
|
2017-10-23 13:47:14 -02:00 |
|
Oswaldo Acauan
|
1dcfb9e3fa
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications
|
2017-10-23 13:31:33 -02:00 |
|
Anton Georgiev
|
4566d82a2a
|
Merge pull request #4488 from Tainan404/fix-errors-linter
[HTML5] Fix errors linter
|
2017-10-23 12:27:38 -02:00 |
|
Tainan Felipe
|
896883ecd9
|
remove comment in recording-indicator component
|
2017-10-23 12:01:00 -02:00 |
|
gcampes
|
ff35ad9602
|
delete unused files, cleanup code
|
2017-10-23 10:41:09 -02:00 |
|
Oswaldo Acauan
|
f17faf6d75
|
Fix closeToast warning
|
2017-10-23 10:25:05 -02:00 |
|
Fred Dixon
|
ca285e13f6
|
Merge pull request #4550 from riadvice/screen-share-improve
[Flash 2.0] - Improve desktop sharing windows placement and resize window behaviour
|
2017-10-22 07:41:26 -04:00 |
|
Ghazi Triki
|
08eced8bbe
|
Improve desktop sharing windows placement and resize window behaviour.
|
2017-10-22 11:56:27 +01:00 |
|
Oleksandr Zhurbenko
|
380c67f18f
|
Merge pull request #4538 from MaximKhlobystov/khmer-locale-fix
[HTML5 Client] Khmer locale fix
|
2017-10-21 21:31:14 -04:00 |
|
Maxim Khlobystov
|
6dd484db4f
|
Indentations cleanup.
|
2017-10-21 21:30:24 -04:00 |
|
Oswaldo Acauan
|
8af4d227db
|
Fix notification service exports
|
2017-10-20 17:27:00 -02:00 |
|
Oswaldo Acauan
|
11908b8ecf
|
Fix file extension and turn eslint rule off
|
2017-10-20 17:09:01 -02:00 |
|
Oswaldo Acauan
|
9f910fa26e
|
Move hoc and service to separate dir's
|
2017-10-20 17:01:07 -02:00 |
|
Oswaldo Acauan
|
a26e20d76b
|
Fix wrong prop name record => recording
|
2017-10-20 17:00:34 -02:00 |
|
Maxim Khlobystov
|
03eced3236
|
Updated locales.
|
2017-10-20 15:17:52 +00:00 |
|
Richard Alam
|
24def2ce7e
|
Merge branch 'riadvice-config-options-clean' into v2.0.x-release
|
2017-10-20 08:05:24 -07:00 |
|
Richard Alam
|
bf5d5de34e
|
Merge branch 'config-options-clean' of https://github.com/riadvice/bigbluebutton into riadvice-config-options-clean
|
2017-10-20 07:58:22 -07:00 |
|
Richard Alam
|
bd68aa3128
|
Merge pull request #4543 from ritzalam/remove-auto-join-voice-on-reconnect
Remove auto-join voice handler on auto-reconnect
|
2017-10-20 10:56:49 -04:00 |
|
Richard Alam
|
333dba585b
|
- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
|
2017-10-20 07:38:50 -07:00 |
|
Ghazi Triki
|
bd1e8a0f08
|
Remove trailing spaces in config.xml.template
|
2017-10-20 15:37:38 +01:00 |
|
Richard Alam
|
97f14ddfac
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release
|
2017-10-20 07:36:39 -07:00 |
|
Richard Alam
|
fb58a5f0ca
|
Merge branch 'riadvice-breakout-audio-rejoin' into v2.0.x-release
|
2017-10-20 07:36:14 -07:00 |
|
Anton Georgiev
|
e0db8b1d3e
|
Merge pull request #4533 from jfsiebel/fix-update-voice-user-function-name
Fix function name in updateVoiceUser
|
2017-10-20 12:30:25 -02:00 |
|
Ghazi Triki
|
f3ba3e5ac9
|
Clean ununsed options properties and classes.
|
2017-10-20 11:17:19 +01:00 |
|
gcampes
|
029a13d2a0
|
better error handling, code cleanup
|
2017-10-20 08:11:51 -02:00 |
|
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 |
|