BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,455 Commits 13 Branches 260 Tags 1.1 GiB
50cc876cf7
Commit Graph

18455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tainan Felipe
50cc876cf7 fix errors linter 2017-10-10 19:08:51 -03:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -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
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
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
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
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
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
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
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
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
Ghazi Triki
cb1ae776ea Added new option "moderatorUnmute" 2017-10-06 10:57:19 +01:00
Oleksandr Zhurbenko
6639ee5e8e Fixed incorrectly displayed dropdown in the user list, if it was scrolled down 2017-10-05 14:46:46 -07:00
Oswaldo Acauan
1e3470c136 Fix unread button styles 2017-10-05 17:49:02 -03:00
Anton Georgiev
9cdf0897c3 welcome msg - drop location of phone icon from msg 2017-10-05 16:46:28 -04:00
Anton Georgiev
7cd475b2bf Merge pull request #4461 from MaximKhlobystov/hide-push-notifications-setting 
[HTML5] Hide Push Notifications Setting
 2017-10-05 16:23:55 -04:00
Oswaldo Acauan
37569a5158 Update more icon and rotate it 90deg 2017-10-05 17:21:33 -03:00
Ghazi Triki
23bb6bd34e Show hint for presenters in PollResultsModal. 2017-10-05 21:18:57 +01:00
Oswaldo Acauan
30bf1b4425 Change chat-dropdown icon and vertical align it with the title 2017-10-05 17:13:29 -03:00
Oswaldo Acauan
901552abad Add collapse style for system messages 2017-10-05 16:58:49 -03:00
Maxim Khlobystov
03c94bba73 Dropped the file extension from the stylesheet name. 2017-10-05 19:40:38 +00:00
Maxim Khlobystov
350bbdfcc9 Added a comment to not forget about the push notifications setting. 2017-10-05 19:21:57 +00:00
Maxim Khlobystov
a7798f6c1a Fixed some ESLint errors. 2017-10-05 19:18:30 +00:00
Ghazi Triki
ae5e448a97 Add hint label above poll button. 2017-10-05 20:11:14 +01:00
Maxim Khlobystov
c3ba004bec Hidden Push Notifications setting's UI until it is implemented. 2017-10-05 19:06:28 +00:00
Anton Georgiev
af0e0ff5a0 Merge pull request #4460 from KDSBrowne/xx-05-avatar-voiceUser-notification 
[HTML5] Avatar indicator bug's
 2017-10-05 13:02:13 -04:00
Oswaldo Acauan
360d8d12b2 Remove user list title 2017-10-05 11:52:34 -03:00
Oswaldo Acauan
a34ec8eb0d Update chat list item text color 2017-10-05 11:47:35 -03:00
Oswaldo Acauan
0ec0121648 User avatar styles update 2017-10-05 11:43:08 -03:00
KDSBrowne
d4b8706926 fix talking style being shown when muted 2017-10-04 12:08:33 -07:00