Commit Graph

18475 Commits

Author SHA1 Message Date
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
Anton Georgiev
d9bf0c6752 Merge pull request #4490 from pedrobmarin/fix-4410
Updating presenter status
2017-10-10 17:53:52 -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
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
Richard Alam
2dfb896c60 Merge pull request #4480 from ritzalam/ant-locale-target
- add new ant locale target
2017-10-09 17:50:19 -04:00
Richard Alam
92464995b3 - add new ant locale target 2017-10-09 14:48:29 -07:00
Richard Alam
ad71e9c2c0 Merge pull request #4478 from ritzalam/fix-locale
- try fixing locale that's breaking build
2017-10-09 17:09:32 -04:00
Richard Alam
2221e9a36f - try fixing locale that's breaking build 2017-10-09 14:08:18 -07:00
Oswaldo Acauan
96ea918919 Fix file permissions 2017-10-09 17:20:27 -03:00
Richard Alam
a6fb90e9c8 - replace voice user when a new user joined voice conf event is received from the server. 2017-10-09 13:17:06 -07:00
Anton Georgiev
6f6ec5cccf Merge pull request #4477 from capilkey/fix-help-button
Fix help button URL
2017-10-09 15:31:07 -04:00
Chad Pilkey
8b7a96adf6 Merge pull request #4476 from antobinary/flash-redirect-to-html
Navigate to html5 login if no Flash on system
2017-10-09 15:29:47 -04:00
Anton Georgiev
1326cfb42b navigate to html5 login if no Flash on system 2017-10-09 15:12:55 -04:00
Chad Pilkey
a88c684abc improved the help URL loading 2017-10-09 12:10:17 -07:00
Richard Alam
0f7478b238 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2017-10-09 12:02:38 -07:00
Richard Alam
9b6c708a88 Merge branch 'riadvice-2x-client-theme' into v2.0.x-release 2017-10-09 12:00:35 -07:00
Oswaldo Acauan
73d4607288 Skip checkToken in client calls 2017-10-09 15:53:45 -03:00
Richard Alam
5ccfc019ce Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-10-09 11:48:48 -07:00
Ghazi Triki
3dfdccb3f9 Update breakout room timer. 2017-10-09 15:45:19 -03:00
Richard Alam
e0fb20acd4 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-10-09 11:44:18 -07:00
Anton Georgiev
98e00a8056 Merge pull request #4464 from oswaldoacauan/qa-design
[HTML5] Fix some style issues
2017-10-09 14:12:13 -04:00
Ghazi Triki
63a4482e6e Remove additional space from the application top. 2017-10-09 14:32:34 -03:00
Oswaldo Acauan
7d664c8be7 Add a check for the passed credentials agains the token in Acl 2017-10-09 09:49:07 -03:00
Anton Georgiev
a9e9ac31e8 Merge pull request #4471 from MaximKhlobystov/default-locale-setting
[HTML5] Fix for the default locale in the Settings modal's selector (a.k.a. "Bulgarian bug").
2017-10-06 15:18:27 -04:00
KDSBrowne
584f7e4bc8 add checks to handler 2017-10-06 11:12:33 -07:00
Oswaldo Acauan
d049c982a0 Fix user-list scroll styles 2017-10-06 15:11:19 -03:00
Maxim Khlobystov
d1f6d7c4e0 Replaced double quotes with single ones in the YAML file. 2017-10-06 18:05:30 +00:00
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
KDSBrowne
9da39339cd remove unused checks 2017-10-06 10:56:56 -07:00
Anton Georgiev
bb1960ef6a Merge pull request #4469 from Gcampes/fix-breakout-close
[HTML5] - Fix Breakout tab not closing
2017-10-06 13:56:22 -04:00
KDSBrowne
d70bfdb337 remove code duplication 2017-10-06 10:52:14 -07:00
Oswaldo Acauan
38c8ff4abc Update emoji menu to use emoji constants 2017-10-06 13:49:46 -03:00
Maxim Khlobystov
5f79db2554 Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal. 2017-10-06 16:29:52 +00:00
KDSBrowne
36ebec64c5 change modifier name 2017-10-06 09:16:55 -07:00
KDSBrowne
fc4b0dbcb1 add changeRole handler call to changeRole modifier 2017-10-06 09:10:23 -07:00
KDSBrowne
5c1ff8efbc fix promoted users not being able to execute moderator actions 2017-10-06 08:18:27 -07:00
Oswaldo Acauan
29117285ef Merge remote-tracking branch 'upstream/v2.0.x-release' into qa-design 2017-10-06 11:59:07 -03:00
gcampes
189760d393 fix breakout not closing on end 2017-10-06 11:58:21 -03:00
Ghazi Triki
21477b7917 Use blue style for all main actions buttons in popups. 2017-10-06 15:21:51 +01:00
Anton Georgiev
edf569f479 Merge pull request #4466 from OZhurbenko/presenter-functionality-2x
HTML5 - Fix for an incorrectly displayed pop-up in the UserList
2017-10-06 10:00:36 -04:00
Anton Georgiev
9ae15aa310 Merge pull request #4463 from antobinary/change-welcome-message
Welcome msg-drop location of phone icon so it applies to both html5 and flash clients
2017-10-06 09:55:34 -04:00
KDSBrowne
b20ab84abd make changeRole.js return publishUserMessage 2017-10-06 06:31:56 -07:00
KDSBrowne
58ab2f974d add missing locale string 2017-10-06 06:29:16 -07:00
KDSBrowne
4191ce56ed set allowHTML5Moderator to true 2017-10-06 06:27:45 -07:00
Fred Dixon
9d8a4bd45d Merge pull request #4467 from riadvice/2x-client-theme
[Flash 2.0] - Improve poll and add new feature "moderatorUnmute"
2017-10-06 08:20:45 -04:00