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
Tainan Felipe
896883ecd9
remove comment in recording-indicator component
2017-10-23 12:01:00 -02: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
Joao Siebel
8b8456a1ac
Closes breakout room modal when the breakout room are closed
2017-10-12 19:39:03 -03: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
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07:00
Tainan Felipe
d6a6ff5eca
remove .scss extension and changed path
2017-10-11 14:54:00 -03:00
Tainan Felipe
50cc876cf7
fix errors linter
2017-10-10 19:08:51 -03:00
Tainan Felipe
5393051d9d
fix errors linter
2017-10-10 10:06:34 -03:00
Oswaldo Acauan
37569a5158
Update more icon and rotate it 90deg
2017-10-05 17:21:33 -03:00
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
KDSBrowne
4ac45b30f9
add aria label for userlist btn notification
2017-04-17 10:00:15 -07:00
KDSBrowne
2b8c9812ee
fix merge conflict
2017-04-17 06:34:11 -07:00
Anton Georgiev
573db8dcc3
updated icons to v11, adjusted few icons
2017-04-12 12:12:47 -04:00
KDSBrowne
a5f1857c67
add descriptions to defined messages
2017-04-10 08:50:03 -07:00
KDSBrowne
3ff1096cf4
fix merge conflict
2017-04-06 07:11:57 -07:00
KDSBrowne
800c47f462
remove default messages
2017-04-05 17:02:07 -07:00
KDSBrowne
4cbf7bedbb
add formatted message for userlist toggle btn label
2017-03-29 08:22:26 -07:00
KDSBrowne
71fef7c86a
remove unused import
2017-03-29 08:12:07 -07:00
KDSBrowne
658c80147c
remove local storage usage and add separator
2017-03-29 07:31:15 -07:00
KDSBrowne
2fae315db2
add menu item separation NVDA fiendly
2017-03-27 14:41:10 -07:00
KDSBrowne
d802d26836
remove direct DOM manipulation
2017-03-27 11:10:24 -07:00
KDSBrowne
c4c9ce5577
fix lint issues
2017-03-23 07:31:54 -07:00
KDSBrowne
918684b6c7
change variable name
2017-03-23 07:22:02 -07:00
KDSBrowne
2d876550db
merge with master
2017-03-23 07:16:47 -07:00
KDSBrowne
ceeb66ceed
Merge remote-tracking branch 'upstream/master' into Fullscreen-Label-Change
2017-03-21 08:50:09 -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
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
Oswaldo Acauan
f020964c50
Fix merge conflicts
2017-03-16 20:25:14 +00: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
cafe64c0de
add aria-expanded to user-list button
2017-03-15 08:43:59 -07:00
KDSBrowne
c510921509
remove DropdownListSeparator
2017-03-15 08:36:42 -07:00
KDSBrowne
c4e8dffdb7
add landmark roles and labels
2017-03-15 08:24:57 -07:00
Anton Georgiev
64c43f4084
reuse isMeetingBreakout
2017-03-14 17:06:52 -04:00
Oswaldo Acauan
be7f36e00c
Refactor the i18n server code
2017-03-09 19:50:21 +00:00
KDSBrowne
1de05d1f23
remove event listeners
2017-02-24 10:54:52 -08:00
KDSBrowne
b0dfa33723
switch label if Esc key used to exit fullscreen
2017-02-14 11:57:37 -08:00
KDSBrowne
cbfaf16ac1
add formatted message to local file
2017-02-14 07:11:27 -08:00
KDSBrowne
f71f62d19a
modified previous code structure
2017-02-13 08:21:53 -08:00
JaeeunCho
50b0790dfb
HTML 5 - changed css for divider
2017-02-06 09:44:38 -08:00
JaeeunCho
94db42d7b1
HTML5 - changed divider of record button
2017-02-02 07:36:49 -08:00
JaeeunCho
6689527505
HTML5 - changed property for checking recording status
2017-01-30 06:55:20 -08:00
JaeeunCho
99d685d818
HTML5 - changed divider of recorded icon
2017-01-24 15:06:57 -08:00
Lajellu
11e5809340
HTML5 - Remove unncessary background-color CSS
2016-12-21 13:13:00 -08:00
Lajellu
ec49a0a343
HTML5 - Fix Recording Indicator Logic
...
Original:
The indicator is always visible.
If the meeting is currently being recorded,
Then indicator turns red
Changed to:
If the meeting is currently being recorded
Then the indicator is displayed and red
2016-12-21 11:13:08 -08:00
Lajellu
b3f1d9f804
HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues
2016-12-20 10:06:01 -08:00
Anton Georgiev
cf0238cba3
cleaning up
2016-12-08 16:20:47 +00:00
Anton Georgiev
b102e85840
remove ref to clientBuildInfo
2016-12-08 16:04:28 +00:00
Anton Georgiev
8608c6b716
comply with feedback - about component
2016-12-08 15:59:52 +00:00
Anton Georgiev
fe30dde5dd
fix conflict
2016-12-08 15:58:58 +00:00
Anton Georgiev
b56ee1e553
add client information in About
2016-12-07 21:14:14 +00:00
Oswaldo Acauan
3309a1ad95
Improve navbar button hover and focus style
2016-12-06 11:39:48 -02:00
Oswaldo Acauan
48a2ecdb15
Improve overall components sizing of the navbar
2016-12-05 18:17:31 -02:00
Oswaldo Acauan
a1cd283ab6
Refactor the navbar title separator to use CSS instead of text
2016-12-05 18:09:03 -02:00
Oswaldo Acauan
60b49971d8
Refactor the recording indicator to use CSS instead of SVG
2016-12-05 18:00:09 -02:00
Oswaldo Acauan
b627f93435
Fix presentation title spacing
2016-12-05 17:26:08 -02:00
Oswaldo Acauan
1a5e309335
Remove unnecessary padding on navbar buttons
2016-12-05 17:16:52 -02:00
Oswaldo Acauan
306fcc9c56
Remove duplicated padding on the navbar
2016-12-05 16:58:40 -02:00
Oswaldo Acauan
cda0d56afd
Change the unread messages notification on the toggle button
2016-12-05 16:54:20 -02:00
gcampes
5089c18ef3
imports underscore, removes prefix not needed in variables
2016-11-29 13:49:08 -02:00
gcampes
903ba22713
Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
...
* upstream/master:
Removed carriage returns from bigbluebutton.properties
make function export default
fix Meteor.Error
removed duplication
fixed lint issue
added suggestions
removed console logs
fixed lint issues
added moderator condition
Shows main setting options based on role
2016-11-29 08:25:59 -02:00
gcampes
470b6e08c1
Change breakout code
2016-11-28 17:48:02 -02:00
gcampes
b3c9d60182
Redo some breakouts code
2016-11-25 14:06:36 -02:00
gcampes
f75c73b4e6
Polish breakout rooms code
2016-11-24 17:22:04 -02:00
KDSBrowne
f5d82b8d38
Shows main setting options based on role
2016-11-23 12:01:09 -08:00
gcampes
0aa6022c89
Changes breakout code to handle the new message format
2016-11-23 13:32:04 -02:00
Gabriel Carvalho de Campes
85013eac1f
Fix issues from merge
2016-11-16 15:44:05 -02:00
Gabriel Carvalho de Campes
39dffd68b4
Update breakout rooms in html5
2016-11-14 09:57:10 -02:00
Gabriel Carvalho de Campes
a262430871
Add code to handle breakout rooms in html5
2016-11-07 13:52:39 -02:00
Lajellu
373dd9535b
HTML5 - fixes fullscreen toggle to un-fullscreen
2016-10-17 14:14:12 -07:00
JaeeunCho
d214eff554
added css for red dot and fixed code
2016-10-11 10:36:28 -07:00
JaeeunCho
04e9d1818c
HTML 5 - added to display the state of unreaded messages right next to the user icon
2016-10-04 12:23:43 -07:00
JaeeunCho
3962349517
HTML5 - Settings : changed to label
2016-09-26 14:55:33 -07:00
JaeeunCho
b0947c85c1
HTML5 - Settings : added description messages and changed to label
2016-09-22 13:51:00 -07:00
JaeeunCho
fefef4bc62
HTML5 - Settings dropdown
2016-09-21 12:49:31 -07:00
JaeeunCho
cbf8e88e68
HTML5 Actions button
2016-09-13 12:46:12 -07:00
JaeeunCho
9b594e8a52
HTML5 Dropdown - fixed warnings and added style
2016-09-07 12:17:15 -07:00
Oswaldo Acauan
d88d566d55
Fixes and improvements on the Dropdown and Modal components
2016-09-06 19:10:18 +00:00
Oswaldo Acauan
82eaf3b663
Change dropdown component
2016-09-01 20:19:37 +00:00
Matthew Marangoni
43f7369806
Merge remote-tracking branch 'upstream/master' into settings-accessibility
2016-08-25 11:12:40 -07:00
Jaeeun Cho
926387ce63
HTML5 dropdown for settings menu - modify aria-labelledby and aria-describedby for each menus
2016-08-25 07:34:27 -07:00
Jaeeun Cho
8f70d252f2
HTML5 dropdown for settings menu - changing directory structure
2016-08-24 12:22:05 -07:00
Matthew Marangoni
f0a5c550a7
Merge remote-tracking branch 'upstream/master' into settings-accessibility
2016-08-24 07:37:54 -07:00
Jaeeun Cho
8eddccc66c
HTML5 dropdown for settings menu
2016-08-24 07:17:30 -07:00
Oleksandr Zhurbenko
f64ed1fd4a
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning
2016-08-20 16:37:11 -07:00
Jaeeun Cho
8e47a5f937
dropdown _v2
2016-08-11 16:05:26 -04:00
mmarangoni
c141576ef7
Merge remote-tracking branch 'upstream/master' into html5test
2016-08-05 09:26:18 -07:00
Oswaldo Acauan
afe1a66e02
Fix conflicts and merge master
2016-07-28 19:50:44 +00:00
Oswaldo Acauan
b8e4a2692c
Add handlers for kick
2016-07-28 19:48:26 +00:00
Oleksandr Zhurbenko
d510907179
Upgraded Meteor to 1.4
2016-07-27 14:50:35 -07:00
Oswaldo Acauan
34fedc8e46
Fix user-list toggle
2016-07-21 14:24:50 +00:00
Matthew Marangoni
a37799f19f
Merge remote-tracking branch 'upstream/master' into html5test
...
Conflicts:
bigbluebutton-html5/imports/ui/components/modals/settings/SettingsModal.jsx
bigbluebutton-html5/imports/ui/components/modals/settings/submenus/SessionMenu.jsx
2016-07-11 10:37:00 -07:00
Matthew Marangoni
8175ecef2f
Added aria and tabbing features
...
- All pages in the settings modal now contain aria labels and descriptions
- Tabbing has been fixed and is now contained within the settings modal
- Tab order has been correct
- Menu's and submenus changed to container-style instead of lists
- Fixed scrolling issue caused by resize buttons in Application submenu
- aria roles have been added to all submenus
2016-07-11 10:01:09 -07:00
Oswaldo Acauan
9b53090c81
Change Auth service to be a singleton class
2016-07-11 13:45:24 +00:00
Oswaldo Acauan
1c0132ed5b
Merge after git conflict/lost object
2016-07-11 12:34:58 +00:00
Oleksandr Zhurbenko
f26ab0ac52
Title and calculated styling for the polling UI
2016-06-30 15:21:46 -07:00
Jaeeun Cho
9eacf32497
fixes html5 clinet logout and nav-bar
2016-06-28 15:30:43 -04:00
Jaeeun Cho
eded89d5f0
fixes html5 clinet logout and nav-bar
2016-06-28 14:50:44 -04:00
Oleksandr Zhurbenko
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07:00
Jaeeun Cho
3d36d3fed2
fixes html5 clinet logout and nav-bar
2016-06-24 19:09:32 -04:00
Jaeeun Cho
3325ac4974
fixes html5 clinet logout and nav-bar
2016-06-24 10:48:09 -04:00
Jaeeun Cho
73c9898698
fixes html5 clinet logout and nav-bar
2016-06-17 18:15:11 -04:00
Oswaldo Acauan
406c55f1c2
Fix renderCircle and add hideLabel prop
2016-06-17 16:42:17 +00:00
Oswaldo Acauan
c11447cc62
Fix button className inheritance
2016-06-07 11:33:22 -03:00
Oswaldo Acauan
216bfd2ac2
Fix nav-bar userlist toggle icon
2016-05-20 13:39:58 -03:00
Oswaldo Acauan
29c09afee9
Add basic nav-bar styles
2016-05-20 13:29:55 -03:00
Oswaldo Acauan
d3d997d211
Rename navbar, media, whiteboard and videodock to the new structure
2016-05-20 10:44:27 -03:00
Oswaldo Acauan
d81cb28f35
Add new component button and some basic styles
2016-05-20 10:37:19 -03:00
Anton Georgiev
298927cf4f
Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
...
Conflicts:
bigbluebutton-html5/collections/collections.js
bigbluebutton-html5/imports/api/meetings/server/meetings.js
bigbluebutton-html5/imports/startup/server/collectionManagers/poll.js
bigbluebutton-html5/imports/startup/server/eventHandlers.js
bigbluebutton-html5/imports/startup/server/helpers.js
bigbluebutton-html5/imports/startup/server/meteorMethods/publishVoteMessage.js
bigbluebutton-html5/imports/startup/server/publish.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
bigbluebutton-html5/server/server.js
2016-05-10 19:39:01 +00:00
Anton Georgiev
dcce6d3122
set baseUrl to html5client/
2016-05-09 19:19:52 +00:00
perroned
4a7938e1c0
Adds settings and styling
2016-05-06 12:46:14 -05:00
perroned
d602a66d7f
Begins adding modals
2016-05-05 16:14:39 -05:00
Oswaldo Acauan
2d57d7cbed
Rename Actionsbar and Navbar to ActionsBar and NavBar
2016-05-04 11:48:53 -03:00
