Commit Graph

159 Commits

Author SHA1 Message Date
Oswaldo Acauan
909af38fc3 Update chat notification style 2017-09-28 16:18:04 -03:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Oleksandr Zhurbenko
65da71c12a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-05 18:53:51 -07:00
JaeeunCho
43f6fd9c03 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-09-01 11:22:45 -07:00
Anton Georgiev
d60e06e28f Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase
[HTML5] changed string id to camelCase
2017-09-01 10:05:50 -04:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Anton Georgiev
f6e8e743e0 Merge pull request #4244 from KDSBrowne/fix-meeting-title
[HTML5] - Meeting title fix
2017-08-15 15:11:27 -04:00
KDSBrowne
66d1a3b06a fix meeting title 2017-08-15 10:24:58 -07:00
JaeeunCho
237d1b6ac3 divided code into new container.jsx 2017-08-11 13:32:33 -07:00
Klaus
babc981867 Messages been correct handle 2017-08-11 14:14:50 -03:00
JaeeunCho
8607eff5d6 changed fullScreen to fullscreen 2017-08-10 12:09:16 -07:00
JaeeunCho
3f773684bc [HTML5] changed string id to camelCase 2017-08-10 10:34:34 -07:00
Oleksandr Zhurbenko
82a1ad2c8a Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 15:43:41 -07:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Oleksandr Zhurbenko
cb25c7641b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-27 12:41:12 -07:00
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Klaus
b3865ef90d Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis 2017-06-20 14:11:19 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
KDSBrowne
c189faceff fix merge conflicts 2017-06-08 11:00:06 -07:00
Oleksandr Zhurbenko
52fae1b8c8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks 2017-06-05 19:51:20 -07:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oleksandr Zhurbenko
a0224dcffc Replaced String refs with callback refs
String refs will be deprecated in the next React releases, since they have some performance issues
2017-06-03 16:58:27 -07:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
KDSBrowne
9b6f6e2fa1 fix merge conflict 2017-06-02 12:01:12 -07:00
JaeeunCho
510288bfe1 HTML5 - added new line at the end of the file 2017-06-01 13:13:14 -07:00
JaeeunCho
5efb697c9c HTML5 - fixed conflict 2017-05-29 13:24:29 -07:00
Anton Georgiev
250c6cdb8b Merge pull request #3948 from KDSBrowne/x0-lint-Client
[HTML5] - Fix client lint issues
2017-05-25 13:57:04 -04:00
JaeeunCho
4c9c5701c3 HTML5 - fixed setting's dropdown re-render issue 2017-05-24 15:42:02 -07:00
KDSBrowne
beddf61532 remove new operator 2017-05-19 07:25:24 -07:00
KDSBrowne
de6e7093f3 remove custom aria prop name 2017-05-18 11:38:07 -07:00
KDSBrowne
df76d33cba set files permission to 644 2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c Fix client lint issues except those which are comment related 2017-05-16 08:37:17 -07:00
KDSBrowne
fc2a36f14b remove element refs not being used 2017-05-15 09:01:46 -07:00
KDSBrowne
dd1e830dc2 fix merge conflicts 2017-05-12 10:52:12 -07:00
KDSBrowne
8bb1da0ed5 fix focus and tab order bugs 2017-05-06 16:04:59 -07:00
Anton Georgiev
8d037bc4fa resolve issues with modal on breakouts 2017-05-03 11:06:28 -04:00
KDSBrowne
583677df18 fix focus bug in userlist 2017-05-03 07:09:39 -07:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Anton Georgiev
4188394a82 Merge branch 'patch-1' of github.com:oswaldoacauan/bigbluebutton into test-3850 2017-04-27 16:20:41 -04:00
Oswaldo Acauan
4466cd084e Update component.jsx 2017-04-26 11:57:40 -03:00
Oswaldo Acauan
4e29024783 Prevent breakout dropdown when theres no breakout 2017-04-26 11:55:49 -03:00
KDSBrowne
230bc1f11c fix merge conflicts 2017-04-26 07:14:25 -07:00
KDSBrowne
ef18f652aa fix lint issues 2017-04-26 07:08:47 -07:00
Anton Georgiev
90d34da942 Merge pull request #3832 from Klauswk/FixFullScreen
Fix full screen when console is open, HTML5
2017-04-24 14:55:35 -04:00
Klaus Klein
a071c34939 Fix console problem open on fullscreen, HTML 5 issue #3824 2017-04-18 17:00:50 -03:00
Oswaldo Acauan
5fa27107cb Fix merge conflicts 2017-04-18 19:42:55 +00:00
Oswaldo Acauan
334026833b Refactor Modal related components 2017-04-18 19:38:26 +00:00
Klaus Klein
feb1efc1df Fixed button when console is open 2017-04-18 14:14:07 -03:00
KDSBrowne
3bddf30a92 change formattedMessage description 2017-04-17 10:04:24 -07:00