BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,152 Commits 13 Branches 260 Tags 1.1 GiB
5713fa54f3
Commit Graph

511 Commits

Author SHA1 Message Date
Anton Georgiev
d80d78589f
Merge pull request #6346 from KDSBrowne/html5-packages-upgrade 
HTML5 packages upgrade
 2018-12-13 14:43:47 -05:00
KDSBrowne
775176d9cf Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-12-12 17:35:22 +00:00
Tainan Felipe
eee11552b3 Change the css variable imports to app component 2018-12-11 09:46:42 -02:00
KDSBrowne
8b30fe00b3 Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade 2018-12-10 02:12:42 +00:00
Anton Georgiev
20386334f6
Merge pull request #6295 from BobakOftadeh/micsLocked-check-fix 
Fixed micsLocked check
 2018-12-07 11:36:31 -05:00
Maxim Khlobystov
f548b46672 Improve the client logs appearing on user join/subscription 2018-12-06 12:26:08 -05:00
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
KDSBrowne
39c75fd449 fix remaining bugs / console errors 2018-12-05 19:31:33 +00:00
Bobak Oftadeh
ad5cf5bd62 Fixed micsLocked check 2018-11-23 17:48:23 +00:00
KDSBrowne
c6851484bb rename toggle handlers / remove reactive source from render 2018-11-23 12:37:18 +00:00
KDSBrowne
e6398ea56f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-11-22 14:46:24 +00:00
Bobak Oftadeh
ce2eb21b57 changed micLocked check 2018-11-21 12:59:30 +00:00
KDSBrowne
86af1e0e9d fix key warning for non resizable panels 2018-11-20 19:18:30 +00:00
KDSBrowne
149b4f091a move render functions from app to panel-manager 2018-11-20 15:28:00 +00:00
KDSBrowne
99e15b20ba add panel manager component 2018-11-19 23:29:48 +00:00
Bobak Oftadeh
51ff9230fa changed meeting query 2018-11-19 20:55:09 +00:00
Bobak Oftadeh
34d525e4c6 Moved api functions to the lock-viewers container 2018-11-16 12:04:21 -08:00
Bobak Oftadeh
31d59e21ec Viewers join listen only when microphones are locked 2018-11-15 12:53:03 -08:00
Bobak Oftadeh
6dd6fb714f Implemented listen-only on startup when viewer joins with mic locked settings 2018-11-13 14:18:26 -08:00
Tainan Felipe
164835d49b
Merge branch 'master' into breakout-room-html5 2018-11-09 13:49:15 -02:00
Tainan Felipe
060435d54e Rename from Breakout-room to breakout-room 2018-11-06 13:42:30 -02:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
Anton Georgiev
357f341a3e
Merge branch 'master' into breakout-room-html5 2018-11-02 09:26:09 -04:00
Anton Georgiev
41c7791272
Merge pull request #6192 from Tainan404/fix-presentation-hover 
Remove behavior that add opacity when hover the presentation area.
 2018-11-01 14:50:47 -04:00
KDSBrowne
38ae789b4a fix userlist poll heading remaining after presenter toggle 2018-10-31 17:28:35 +00:00
Tainan Felipe
32dd8c4740 migrate to session 2018-10-26 12:16:29 -03:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
KDSBrowne
0551691684 edit css styles 2018-10-26 01:40:15 +00:00
KDSBrowne
935eb1289d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-10-25 18:39:26 +00:00
Anton Georgiev
a5c2ddc602 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-25 17:58:00 +00:00
KDSBrowne
ec5af5b855 fix merge issues 2018-10-25 16:54:29 +00:00
KDSBrowne
3f521a6f6a Merge branch 'html5-theming' into test-merge-anton 2018-10-25 16:33:56 +00:00
KDSBrowne
47218ea351 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton 2018-10-25 16:18:31 +00:00
KDSBrowne
de51ab6fd6 position polling in center screen for mobile 2018-10-25 16:07:24 +00:00
Anton Georgiev
ff837fdd09 drop unnecessary Boolean() wrapper 2018-10-25 15:20:37 +00:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
Tainan Felipe
7677d19159 Remove behavior that add opacity when hover the presentation 2018-10-24 14:09:32 -03:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -03:00
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning 
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
 2018-10-23 14:21:58 -02:00
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage 
User manage button
 2018-10-22 10:54:18 -04:00
KDSBrowne
c8b993a3a9 remove use of router in polling 2018-10-18 14:31:17 +00:00
KDSBrowne
bae71203a5 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router 2018-10-17 20:34:05 +00:00
Anton Georgiev
0d1b085d54 improved on logic for open private chat 2018-10-15 20:03:17 +00:00
Anton Georgiev
27a41753f9 hooked on error pages via Session 2018-10-12 17:05:30 +00:00
KDSBrowne
9b42940d63 move polling options for viewer 2018-10-12 15:05:53 +00:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
Anton Georgiev
497db01167 added meteor/session; userList without router 2018-10-05 19:23:16 +00:00
Anton Georgiev
02905fb90d react-router removed, lots of code commented out, client loads 2018-10-03 16:14:10 +00:00
Anton Georgiev
308beb874c Auth logged in 2018-10-02 19:53:13 +00:00
Anton Georgiev
0c8eafc2c8 Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router 2018-10-02 14:47:25 +00:00
Tainan Felipe
ac09d4e69a Add user list item and panel 2018-10-02 10:48:12 -03:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56 clean up code / add formatted messages / fix bugs 2018-09-23 22:57:03 +00:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
Anton Georgiev
fd02b04a2d
Merge pull request #6025 from BobakOftadeh/chat-width-increased-window 
Extended the Width of the Chat Area
 2018-09-19 13:05:06 -04:00
Bobak Oftadeh
121e47982f Changed chat-width from pixel to precent. 2018-09-19 08:21:14 -07:00
KDSBrowne
226adbe254 make poll menu render 2018-09-14 17:50:18 +00:00
Bobak Oftadeh
cacc5e1920 Extended the width of the chat area 2018-08-29 12:57:36 -07:00
Anton Georgiev
cd851fcdbc
Merge pull request #5978 from antobinary/logs-work 
Logging additional cases in HTML5 client
 2018-08-14 13:42:34 -04:00
Anton Georgiev
823629cb30 add log when user fully joined and subscribed to collections 2018-08-14 17:29:03 +00:00
KDSBrowne
fecbee16b5 change folder / component names & localized strings 2018-08-09 17:02:18 +00:00
Maxim Khlobystov
aa8c656d7d Defaulting to desktop when browser detection package fails. 2018-08-01 11:10:21 -04:00
Tainan Felipe
83d5617109 Fix ios scrolling when drawing 2018-07-25 11:08:56 -03:00
Anton Georgiev
13691f0df2
Merge pull request #5880 from Tainan404/issue-5852 
Allow guest user join via html5 client
 2018-07-20 11:28:39 -04:00
Tainan Felipe
193edcb8fd remove comment 2018-07-19 15:12:04 -03:00
Tainan Felipe
005310d22a Allow guest user join via html5 client 2018-07-19 09:46:44 -03:00
Anton Georgiev
94d3d52a77
Merge pull request #5821 from musickiper/fix-navbar-problem-on-iphone 
Adjust Navbar not to cover on the top of any list in mobile view
 2018-07-18 13:59:42 -04:00
James Jung
617446f89b Change the overflow setting of the public chat to make the navbar not cover the public chat save button 2018-07-18 13:42:02 -04:00
James Jung
696399fc3a Fix the header not to overlap the options list of public chat on iphone 2018-07-17 14:59:44 -04:00
Anton Georgiev
4dbe681a46 disable HTML5 waiting screen for guest approve 2018-07-11 12:46:44 +00:00
James Jung
3187cdd3c5 Adjust Navbar not to cover on the top of any list in mobile view 2018-07-05 17:09:43 -04:00
James Jung
430872e506 Adjust Navbar not to cover on the top of any list in mobile view 2018-07-05 17:04:18 -04:00
Tainan Felipe
957a2ef02c Tiny fixes in chat and notifications (#5807) 
* don't notify old messages when user reload the client

* fix chat height
 2018-07-04 14:12:08 -03:00
James Jung
7462710905 adjust view of mobile user actions list 2018-07-03 17:03:27 -04:00
KDSBrowne
b497ac87af improve line readability / fix audio-modal title not being displayed 2018-06-18 17:01:45 +00:00
KDSBrowne
4fa9e745b2 Merge remote-tracking branch 'upstream/v2.0.x-release' into xx.add.Edge-support-html5 2018-06-13 16:30:14 +00:00
Anton Georgiev
827eb7425e Meeting expiration was picked before breakout exp 
resulting in keeping of the client tab open at end-of-meeting page
 2018-06-11 16:05:53 +00:00
Anton Georgiev
deeec76c6f
Merge pull request #5511 from musickiper/adj-partList-chatModule-width 
Adjust default width in the style sheet of participants list and chat module
 2018-06-08 15:54:53 -04:00
James Jung
c9cb37cf52 seperate settings of resizable tags' enable attribute of userList and chat 2018-06-08 15:37:43 -04:00
James Jung
bc6b1bb092 Fix comments for userList and chat width 2018-06-08 15:00:13 -04:00
James Jung
01d703e9f1 Fix indentations 2018-06-08 14:53:15 -04:00
Anton Georgiev
81a6b877b9
Merge pull request #5591 from KDSBrowne/edit/config/locale 
Improve html5 locale fallback selection
 2018-06-08 13:51:53 -04:00
KDSBrowne
b8e9f325e2 Merge branch '01.rework-edge-support' into xx.add.Edge-support-html5 2018-06-07 21:36:55 +00:00
KDSBrowne
41ecfd72ec adds and impliments react-render-in-browser package 2018-06-07 20:00:29 +00:00
KDSBrowne
addcb86b12 add browser/os class to <body> / center indicator icons in edge 2018-06-07 17:51:00 +00:00
James Jung
97deeb67bd Fix indentations 2018-06-07 12:20:41 -04:00
James Jung
46e0d333ea Adjust variable initializations' places according to other merged updates 2018-06-06 12:12:43 -04:00
James Jung
95cc33d713 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into adj-partList-chatModule-width 2018-06-06 11:53:27 -04:00
James Jung
c676d582d3 Make chat module resizable operation more reasonable 2018-06-05 15:08:49 -04:00
Oswaldo Acauan
34dcad8cd6 Fix navbar being hidden on mobile in some cases. Closes #5568 2018-06-05 11:17:07 -03:00
Oswaldo Acauan
fb04db7b54 Fix current width calc 2018-06-04 16:43:54 -03:00
Oswaldo Acauan
a5d173a1f2 Remove redirect on resize and update userlist compact based on its width 2018-06-04 16:11:11 -03:00
Oswaldo Acauan
7bf922c87b Disable resizing of userlist and chat for mobile 2018-06-04 15:56:09 -03:00
Oswaldo Acauan
6922ab1c70 Disable resizing of userlist and chat for mobile 2018-06-04 15:44:23 -03:00
James Jung
f0c3746884 Seperate the logic for calculating the default width of the userList to outside of the Resizable tag 2018-05-28 12:27:40 -04:00
KDSBrowne
9e06d7b7b1 make resize handle same size on userlist and chat 2018-05-27 14:40:14 -07:00
James Jung
19dbdeaf5f Fix spelling mistake 2018-05-25 13:10:13 -04:00
James Jung
0eb5366e9c Initializing some variables for the default size of the user-list to make the logic inside it more readable 2018-05-24 15:02:47 -04:00
James Jung
f7b1524114 Adjust the default size of userList and chat 2018-05-24 13:32:31 -04:00
James Jung
bf63679ed8 Set default width of userList and change the unit of the userList width size from percentage to pixel 2018-05-23 14:21:48 -04:00
James Jung
e8b2d80842 Adjust minWidth of resizable user-list to make the user names on the list look better 2018-05-17 16:16:48 -04:00
KDSBrowne
91edc247a0 remove chatPad element 2018-05-04 10:00:29 -07:00
KDSBrowne
fc82311132 use $small-only breakpoint / remove $medium-down 2018-05-04 09:52:11 -07:00
KDSBrowne
2c639e7ab9 make chat not open at max size 2018-05-04 08:29:43 -07:00
KDSBrowne
248bfbc332 replace pixel values with css constant 2018-04-30 09:01:07 -07:00
KDSBrowne
f13ca9db3d use props in conditions to render resize handle 2018-04-30 08:55:41 -07:00
KDSBrowne
cf4b5de00c add breakpoint 2018-04-30 08:42:58 -07:00
KDSBrowne
cafce78b0f close userlist via mouse / fix null dropdown warning 2018-04-29 14:23:50 -07:00
KDSBrowne
a9072f5a32 fix mobile and small tablet, chat / userlist position 2018-04-28 18:59:45 -07:00
KDSBrowne
261a2e3b59 adjust chat min / max width 2018-04-28 11:06:03 -07:00
KDSBrowne
7e2c20fca8 make the userlist / chat scalable 2018-04-28 10:53:20 -07:00
KDSBrowne
2a217866fb improve mobile SR views 2018-04-24 07:43:11 -07:00
KDSBrowne
af6692bc8f add userlistIsOpen / chatIsOpen props to hide sections from SR 2018-04-23 18:53:27 -07:00
Oswaldo Acauan
9c2e8472cc Merge branch 'presentation-styles' into webcams-styling 2018-04-13 10:06:11 -03:00
Oswaldo Acauan
d8e8fb99f0 Revert back all presentation stuff since its a lost battle. BabyRage 2018-04-13 09:58:47 -03:00
Oswaldo Acauan
fe11dd9a90 Improve media overlay/content styles 2018-04-09 15:28:54 -03:00
Oswaldo Acauan
2d15368af9 Remove extra padding from content area 2018-04-04 15:56:16 -03:00
KDSBrowne
665bc1ca73 Merge remote-tracking branch 'upstream/v2.0.x-release' into z-02-accessibility-zeeshan-1 2018-03-06 07:34:02 -08:00
KDSBrowne
6ebf27e3e4 change region announcment for userlist 2018-02-22 13:10:32 -08:00
KDSBrowne
7f8ee525b0 make userlist appear lower in the DOM for screen readers 2018-02-22 11:56:21 -08:00
Oswaldo Acauan
61c84837a0 Fix user connectionId observer 2018-02-20 14:41:02 -03:00
Oswaldo Acauan
2f741df97b Impl user-session based connections on server. Fix #5150 
Implement a connectionId for each user, each time a user try to validate we change their connectionId
and end all other connections of that user.
 2018-02-20 11:26:36 -03:00
Oleksandr Zhurbenko
bb72cb7b65 Adjusted the pull request to the recent changes 2018-01-15 12:59:09 -08:00
Oleksandr Zhurbenko
f6ed7c3575 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4897 2018-01-15 12:33:29 -08:00
Tainan Felipe
8ae1fd1820 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends 2018-01-11 09:19:56 -02:00
Oleksandr Zhurbenko
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08:00
Oleksandr Zhurbenko
d8533a86b3 Changed the message displayed to the kicked user 
Fixes #4863
 2018-01-03 12:25:13 -08:00
Tainan Felipe
c582f5bf08 add meetingEnded in Base component aand add intl translation 2017-12-14 17:03:34 -02:00
Tainan Felipe
004290183d add screen to when the meeting is closed 2017-12-12 11:08:43 -02:00
Anton Georgiev
63eb812f85
Merge pull request #4578 from OZhurbenko/meteor-react-16-update 
React 16 and packages update
 2017-11-02 10:41:45 -02:00
Oleksandr Zhurbenko
e883995379 Breaking proptypes validation, sorry, any questions to @oswaldoacauan 2017-11-01 13:11:35 -07:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor 
[HTML5] Refactor Audio
 2017-10-31 15:39:37 -02:00
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00
Gabriel Carvalho de Campes
144705ce9b change func call to a variable 2017-10-27 11:44:42 -02:00
Gabriel Carvalho de Campes
9bb0248957 fix logout issue on meeting end 2017-10-26 16:45:03 -02:00
Oleksandr Zhurbenko
df3325e42f Fixed a bug introduced in #4524 2017-10-25 16:12:17 -07:00
Oleksandr Zhurbenko
6dabe055d8 bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
Oswaldo Acauan
0686a596e9 Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-19 08:07:42 -02:00
gcampes
b15322e7f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-18 17:42:49 -02:00
gcampes
1dda597fca Toast notifications on audio and overall changes 2017-10-18 17:40:01 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -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
gcampes
2ae020ba9a Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor-notifications 2017-10-13 10:43:27 -03:00
Oswaldo Acauan
b8261123d0 Add toast notifications 2017-10-12 15:53:33 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07: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
gcampes
189760d393 fix breakout not closing on end 2017-10-06 11:58:21 -03:00
KDSBrowne
7225590c05 fix userEjected modifier and change if condition 2017-10-04 07:57:16 -07:00
KDSBrowne
bc0647ad50 fix merge conflicts 2017-09-29 12:04:27 -07:00
KDSBrowne
10c75afe99 switch handler, modifier and collection prop to ejected 2017-09-27 14:20:22 -07:00
KDSBrowne
cad085a495 add kicked prop 2017-09-25 11:38:36 -07:00
KDSBrowne
9a145c64a8 fix set properties and client kicked condition 2017-09-25 11:32:09 -07:00
Klaus
97d2f6d3e5 Rollback to the right locales 2017-09-22 14:51:47 -03:00
Klaus
ccf4b1ba21 Fix locales problems 2017-09-22 14:23:25 -03:00
Klaus
4d51e0c045 Fix unsplited styles and code duplicated 2017-09-22 11:24:24 -03:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -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
Klaus
de6b40a666 Fix counter in breakout notification 2017-08-11 17:17:35 -03:00
Klaus
babc981867 Messages been correct handle 2017-08-11 14:14:50 -03:00
JaeeunCho
3f773684bc [HTML5] changed string id to camelCase 2017-08-10 10:34:34 -07:00
Oswaldo Acauan
507bb61fb2 Change user-list width 2017-07-18 10:55:19 -03:00
Anton Georgiev
bc9083c0cf Merge pull request #4109 from Klauswk/fix-sass-path 
[HTML5 - 2.0] Change relative path of the sass imports to absolute
 2017-07-17 14:58:02 -04:00
Klaus
87943cb3f8 Change relative path of the sass to absolute 2017-07-17 15:21:45 -03:00
Klaus
2343ef3f1f Add missing merge file 2017-07-17 13:38:18 -03:00
Klaus
3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf 2017-07-17 13:33:45 -03:00
Anton Georgiev
d2d6e1d029 Merge pull request #4056 from KDSBrowne/x03-client-audit-semantics 
[HTML5] - Accessibility Contrast & Semantic Fixes
 2017-07-14 15:17:49 -04:00
Oswaldo Acauan
5353a3a80d Add guest policy to html5 2017-07-14 11:18:07 -03:00
KDSBrowne
efd933bf28 change $color-white to #fff 2017-07-11 07:08:49 -07:00
JaeeunCho
28b81b32eb changed function to pass two parameters 2017-07-07 08:18:19 -07:00
KDSBrowne
0dfa9ca446 Ensures aria-hidden='true' is not present on the document body 2017-07-06 08:30:50 -07:00
JaeeunCho
440c675e23 made function for duplicated code 2017-07-05 15:56:13 -07:00
JaeeunCho
1a1fb6dc57 HTML5 - fixed errors when the meeting is ended by apimate 2017-07-05 07:59:18 -07:00
KDSBrowne
33da4d391e add missing lang attribute 2017-07-04 07:32:22 -07:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03: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
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
JaeeunCho
607a3f4e5d HTML5 - put the order at media class 2017-05-18 13:03:35 -07:00
JaeeunCho
050994fc06 HTML5 - removed unused media query 2017-05-18 12:58:21 -07:00
JaeeunCho
8b6f8e857c HTML5 - removed unused media query 2017-05-17 13:09:10 -07:00
JaeeunCho
5ee206e73e HTML5 - fixed order and slide control position 2017-05-17 13:06:07 -07:00
JaeeunCho
4695395508 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-17 13:04:09 -07:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
JaeeunCho
87b013fd5b HTML5 - fixed fixed closed-caption display 2017-05-15 14:45:44 -07:00
JaeeunCho
92bc296bc0 HTML5 - fixed closed-caption display 2017-05-12 12:17:08 -07:00
Anton Georgiev
66852961d4 Merge pull request #3920 from JaeeunCho/hidden_title 
Tested, seems fine
 2017-05-12 11:53:42 -04:00
JaeeunCho
4012a0d077 HTML5 - fixed navbar to be displayed 2017-05-08 14:03:22 -07:00
Matthew Marangoni
99788090ee fixed audio and settings modal reopening when changing locale in settings 2017-05-03 14:39:07 -07:00
Oswaldo Acauan
d434ba6893 Fix the audio-modal 2017-05-01 16:52:57 -03:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Klaus Klein
d4917e975c Review change 2017-04-26 17:07:22 -03:00
Klaus Klein
d32dbb12f5 Fix wrong import 2017-04-25 14:26:14 -03:00
Klauswk
73fb753edb Merge branch 'master' into FixAuthentication 2017-04-25 14:09:47 -03:00