Commit Graph

30 Commits

Author SHA1 Message Date
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
JaeeunCho
d902724309 HTML5 - removed useless line 2017-06-07 14:57:27 -07:00
JaeeunCho
c7e654511c Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-07 14:53:39 -07:00
JaeeunCho
5b658dcd97 HTML5 - fixed long string at cc box 2017-06-06 10:32:56 -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
JaeeunCho
cb2c849692 Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-05 11:32:50 -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
JaeeunCho
eb4619dbde HTML5 - fixed long string at cc box 2017-06-02 08:27:55 -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
Anton Georgiev
453a2cf6a4 code style improvements of closed-captions 2017-05-03 17:54:26 -04:00
gcampes
3ea21df973 Fix closed captions settings issue 2017-04-06 08:46:15 -03:00
gcampes
ed4f1cf5c2 Fix issues based on PR comments 2017-03-13 08:48:00 -03:00
gcampes
417b2e4500 Fix issues based on PR comments 2017-03-09 11:34:33 -03:00
gcampes
8d2a51a00a Remove console log 2017-03-01 17:29:18 -03:00
gcampes
f941eaea3d solve closed captions settings issue, continue settings implementation 2017-02-21 17:29:36 -03:00
Oleksandr Zhurbenko
bedcb559cc Added auto-scrolling for the closed-captions 2016-12-23 11:29:03 -08:00
Oleksandr Zhurbenko
40b8462c52 Minor fixes 2016-12-23 10:49:17 -08:00
Oleksandr Zhurbenko
8f0d552f4f Finished closed-captions 2016-12-23 00:26:22 -08:00
Oleksandr Zhurbenko
875023eb03 Styled the closed-captions box 2016-12-20 15:54:39 -08:00
Oleksandr Zhurbenko
d9ddbfbda6 Cleanup, linting, fixed css modules' imports 2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
df9b79e52d Fixed a bug with collapsing whitespaces 2016-08-19 21:23:46 -07:00
Oleksandr Zhurbenko
bce22aba4e Fixed bugs related to retrieving the data on the client side 2016-08-09 15:35:16 -07:00
Oleksandr Zhurbenko
10272d5317 Changed the way of how we iterate through captions' collection 2016-08-08 14:45:09 -07:00
Oleksandr Zhurbenko
ed51c99803 Adjusted view to the new CC data format 2016-07-26 16:05:22 -07:00
Oleksandr Zhurbenko
fd0247d719 Injected initial component for the closed-captions 2016-07-22 17:12:31 -07:00