Commit Graph

1593 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
a2c635d094 Fixed a bug with Settings not being closed when click Cancel 2017-10-23 16:19:02 -07:00
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
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
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
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
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
Joao Siebel
8b8456a1ac Closes breakout room modal when the breakout room are closed 2017-10-12 19:39:03 -03:00
Oleksandr Zhurbenko
430ddc0d3b Removing unnecessary 2x from the collections, publishers, subscriptions and logs 2017-10-12 12:07:02 -07:00
Tainan Felipe
4bda76c5bb Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-12 15:36:52 -03:00
Anton Georgiev
4acecd358c Merge pull request #4505 from OZhurbenko/merge-2.0-1.1-api
[HTML5] - Merged 2.0 and 1.1 api folders
2017-10-12 13:45:46 -03:00
Anton Georgiev
0824bc1471 Merge pull request #4503 from oswaldoacauan/user-list-scroll-bg
[HTML5] Fix user-list scroll shadow and message list max height
2017-10-12 09:53:42 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Anton Georgiev
c06ebab63b Merge pull request #4502 from KDSBrowne/z01-style-updates
[HTML5] - Update focus styles
2017-10-11 16:12:33 -03:00
Oleksandr Zhurbenko
21dcafb047 Fixed some of the console warning happenning when user is a moderator and he opens user-list/chat 2017-10-11 12:11:04 -07:00
Anton Georgiev
aa39361360 Merge pull request #4483 from OZhurbenko/presenter-functionality-2x
Fix for the Pencil Mongo additions
2017-10-11 15:22:39 -03:00
Oswaldo Acauan
34106e6de4 Fix user list messages max height 2017-10-11 15:11:48 -03:00
KDSBrowne
4a82fdf6c6 remove important flags and add color constant 2017-10-11 11:06:28 -07:00
Tainan Felipe
d6a6ff5eca remove .scss extension and changed path 2017-10-11 14:54:00 -03:00
Anton Georgiev
7c4e4a61d9 Merge pull request #4501 from antobinary/hide-lock-settings
[HTML5 client] Temporarily hide moderator view of lock settings
2017-10-11 14:31:23 -03:00
Oswaldo Acauan
2bebe4262a Fix user-list scroll background 2017-10-11 14:28:34 -03:00
KDSBrowne
392d819905 apply new focus style to message input 2017-10-11 10:27:43 -07:00
Anton Georgiev
ac93460ba7 temporarily hide moderator view of lock settings 2017-10-11 13:51:41 -03:00
Tainan Felipe
c12a3f173b revert modal fullscreen 2017-10-11 12:06:29 -03:00
Tainan Felipe
a667e3d05b Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-11 11:46:16 -03:00
KDSBrowne
a2cd4222d2 Merge branch 'v2.0.x-release' into z01-style-updates 2017-10-11 05:39:05 -07:00
Tainan Felipe
50cc876cf7 fix errors linter 2017-10-10 19:08:51 -03:00
Maxim Khlobystov
6146f391f0 Made sure the locales that contain underscore are displayed properly when shown as current language in the Settings window. 2017-10-10 20:56:33 +00:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03:00
KDSBrowne
ac4181cc09 change focused state border thickness to 2px 2017-10-10 05:47:34 -07:00
Oleksandr Zhurbenko
4d8233fe10 Fix for the pencil Mongo additions 2017-10-09 18:30:29 -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
Oswaldo Acauan
d049c982a0 Fix user-list scroll styles 2017-10-06 15:11:19 -03: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
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
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
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
Oswaldo Acauan
37569a5158 Update more icon and rotate it 90deg 2017-10-05 17:21:33 -03: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