Commit Graph

1853 Commits

Author SHA1 Message Date
Anton Georgiev
bd409e3919 Merge pull request #3749 from OZhurbenko/icons-update
Icons update and a missing import
2017-03-23 18:56:45 -04:00
JaeeunCho
fd08d99b6f HTML5 - removed unused imports, fixed variable names 2017-03-23 12:02:40 -07:00
JaeeunCho
aa2615b52b Merge remote-tracking branch 'upstream/master' into close 2017-03-23 11:59:54 -07:00
Oleksandr Zhurbenko
0120e3cfe2 Added a missing import 2017-03-23 09:19:02 -07:00
Oleksandr Zhurbenko
a42c817a41 Updated icon sets to the latest
Contains a fixed icon for the audio modal
2017-03-23 09:15:33 -07:00
gcampes
8582c18be9 Merge conflicts 2017-03-22 10:00:37 -03:00
JaeeunCho
75dbfc23b6 HTML5 - changed underscore to lodash 2017-03-21 14:52:10 -07:00
JaeeunCho
b81957da43 HTML5 - fixed conflict 2017-03-21 13:29:46 -07:00
Anton Georgiev
5575d32438 Merge pull request #3730 from KDSBrowne/action-buttons-center
Actions Bar Positioning
2017-03-21 12:18:46 -04:00
Anton Georgiev
09833f6c22 Merge pull request #3740 from antobinary/br-kick
[HTML5] Handle properly 'Cancel' on breakout room invitation. Drop unused packages
2017-03-21 12:10:41 -04:00
Anton Georgiev
55ce33e7bb revert tabIndex change 2017-03-21 12:09:44 -04:00
KDSBrowne
ceeb66ceed Merge remote-tracking branch 'upstream/master' into Fullscreen-Label-Change 2017-03-21 08:50:09 -07:00
KDSBrowne
c7c44c4c63 add local folder 2017-03-21 07:46:41 -07:00
KDSBrowne
8f76ec495c remove unused imports 2017-03-21 07:35:09 -07:00
KDSBrowne
7479570a8c move handleExitAudio to service 2017-03-21 07:29:54 -07:00
KDSBrowne
96212a1045 remove merge conflict 2017-03-21 07:17:53 -07:00
KDSBrowne
79e1d0bcbe fix more linting issues 2017-03-21 06:56:38 -07:00
KDSBrowne
25f745cf32 lint nav settings dropdown container 2017-03-21 06:52:59 -07:00
KDSBrowne
1234325a02 remove unused imports 2017-03-21 06:44:14 -07:00
KDSBrowne
d92a0f5188 change function name 2017-03-21 06:41:13 -07:00
Anton Georgiev
2223172612 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into br-kick 2017-03-20 14:44:51 -04:00
Anton Georgiev
6d325297ee remove unused packages 2017-03-20 14:37:55 -04:00
Anton Georgiev
a183595d73 improve check for dismiss object 2017-03-20 14:33:32 -04:00
JaeeunCho
823c667cac HTML5 - changed session method to props 2017-03-17 11:25:41 -07:00
JaeeunCho
eb176e77ac HTML5 - changed session and variables name 2017-03-17 08:27:37 -07:00
Oswaldo Acauan
72dc94ab31 Remove old Kicked screen in favor of the new error screen 2017-03-17 14:38:18 +00:00
Oswaldo Acauan
2090883b03 Refactor Auth logout and credentials getter 2017-03-17 14:23:00 +00:00
KDSBrowne
ed8fdf6f89 remove the else block 2017-03-16 17:29:58 -07:00
KDSBrowne
c6e08c5518 improve adding and removing of events 2017-03-16 17:06:34 -07:00
KDSBrowne
d2405d4c61 pass props down from createContainer 2017-03-16 16:30:46 -07:00
JaeeunCho
cb56e0771d HTML5 - changed variable name 2017-03-16 15:39:34 -07:00
Oswaldo Acauan
f020964c50 Fix merge conflicts 2017-03-16 20:25:14 +00:00
Oswaldo Acauan
22bb1adab2 Refactor of the chat notification for unread messages 2017-03-16 19:57:45 +00:00
Oswaldo Acauan
8d21c435b5 Refactor of the App component 2017-03-16 16:52:43 +00:00
gcampes
b9f5eb7a94 Change dropdown styles 2017-03-16 11:56:39 -03:00
Anton Georgiev
59d6f12fad Merge pull request #3734 from Gcampes/settings-refactor
[HTML5] Increases default font size
2017-03-16 10:34:29 -04:00
gcampes
9ac3c01b01 tweaks to the dropdown styling on mobile 2017-03-16 11:34:03 -03:00
gcampes
31adb14543 Increases default font size 2017-03-16 10:10:39 -03:00
gcampes
8ef43d9270 Remove unused code. Fix button size issue 2017-03-16 09:34:00 -03:00
gcampes
66e9680d48 Merge remote-tracking branch 'upstream/master' into dropdown-mobile-fix
* upstream/master:
  add isBreakoutRoom on render
  pass flag as a property
  pass flag as a property
  evaluate in container, pass boolean flag to component
  apply recommendations from pr comments
  reuse isMeetingBreakout
  don't allow kick user in breakout rooms
  Linting
  Corrected the fix
  [HTML5] Open first submenu for settings
  Fixed permissions and some exceptions
2017-03-15 17:16:02 -03:00
gcampes
9ed21657c5 Adds localization to dropdown 2017-03-15 17:11:34 -03:00
Anton Georgiev
3a20663873 breakouts cancel join: only trigger callback if defined 2017-03-15 15:52:35 -04:00
Anton Georgiev
85a445b919 add isBreakoutRoom on render 2017-03-15 15:03:56 -04:00
gcampes
7c42f3a535 Makes dropdown usable on mobile devices 2017-03-15 15:09:20 -03:00
Anton Georgiev
70ad071d5b pass flag as a property 2017-03-15 14:03:58 -04:00
Anton Georgiev
26582033f2 pass flag as a property 2017-03-15 13:54:40 -04:00
Anton Georgiev
29de597e10 evaluate in container, pass boolean flag to component 2017-03-15 13:43:03 -04:00
Anton Georgiev
9315b79b6c apply recommendations from pr comments 2017-03-15 12:21:26 -04:00
KDSBrowne
6fba48fae6 move openJoinAudio to container 2017-03-14 16:21:55 -07:00
KDSBrowne
dd34a9cbd7 change prop names 2017-03-14 15:34:57 -07:00