prlanzarin
8608fd9f94
Tooltips for video buttons and actions-bar container service calls fixes
2017-12-21 17:40:00 +00:00
prlanzarin
3a72afa350
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
2017-12-21 17:37:07 +00:00
KDSBrowne
0868e98240
add comment to actions-dropdown component
2017-12-15 20:32:17 -08:00
KDSBrowne
f1cd5f2d6e
move _.uniqueId() out of render function
2017-12-15 20:25:41 -08:00
Joao Siebel
218890d8a6
Alter status tooltip to match selected status
2017-12-15 11:11:28 -02:00
KDSBrowne
b59106912a
fix console warnings
2017-12-14 09:31:05 -08:00
Joao Siebel
845692b9e5
Merge remote-tracking branch 'upstream/v2.0.x-release' into hide-audio-labels
2017-12-14 09:01:38 -02:00
Joao Siebel
0d2276e8c5
Change actions button icon
2017-12-11 15:09:09 -02:00
Joao Siebel
8740b7aac6
Hide labels from actions, status, mute/unmute and join/leave audio buttons
2017-12-11 11:48:50 -02:00
prlanzarin
24e4317f9a
Removed unused methods from actions bar component
2017-12-08 16:32:08 +00:00
Tainan Felipe
b58248bafc
fix React warns in emoji select
2017-12-01 11:11:17 -02:00
Tainan Felipe
19723f3da1
change id of the intl
2017-11-30 08:29:52 -02:00
Tainan Felipe
c7c58fea51
remove whitespace and changes in package.json
2017-11-23 15:40:38 -02:00
Tainan Felipe
d15bb139bb
refactor emoji menu
2017-11-23 15:20:27 -02:00
Tainan Felipe
0d25ba5ae7
add blue color on emoji menu for ethe emoji selected
2017-11-21 08:50:20 -02:00
Tainan Felipe
1e53a17522
changed color value by css variable and fix variable declared wrong
2017-11-13 13:44:01 -02:00
Tainan Felipe
cb46c8f70c
fix design issues
...
fix design issues
2017-11-13 10:58:04 -02:00
prlanzarin
f43b77c19f
Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
...
Conflicts:
bigbluebutton-html5/imports/startup/client/base.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/app/container.jsx
bigbluebutton-html5/imports/ui/components/screenshare/service.js
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
prlanzarin
2166b56304
Added toggle options for kurento video/screensharing in the HTML5 config yaml
...
Also made cam button respond to those config values
2017-11-10 21:08:40 +00:00
prlanzarin
e96fc385f1
Handling HTML5 screensharing stop
...
The action bar stop button is temporary
2017-11-06 15:39:55 +00:00
Gabriel Carvalho de Campes
cf73251feb
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-10-26 16:26:19 -02:00
Anton Georgiev
967be17440
Merge pull request #4521 from Tainan404/fix-presenter-modal-bug
...
[HTML5] Fix presentation upload modal bug
2017-10-24 17:02:47 -02:00
gcampes
d32330b208
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-10-24 11:19:58 -02:00
Tainan Felipe
8e2f29e667
changed assign of the function
2017-10-24 08:52:44 -02:00
Tainan Felipe
98b23640fd
solve bug no disppear modal presentation-upload
2017-10-12 21:12:00 -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
gcampes
fafbba06cb
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-10-12 13:58:39 -03:00
gcampes
6b44504e5d
Adds timeout to transfer, fix css, remove logs
2017-10-12 11:49:50 -03:00
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07:00
gcampes
3cba60201e
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-10-11 18:22:36 -03:00
gcampes
02cdcb2562
changes to styles and texts in audio flow
2017-10-10 15:03:29 -03:00
prlanzarin
67da01e81c
Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare
2017-10-10 17:10:03 +00:00
Tainan Felipe
5393051d9d
fix errors linter
2017-10-10 10:06:34 -03: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
Oswaldo Acauan
89c2947d78
Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge
2017-09-29 17:32:31 -03:00
gcampes
6d0d6f6651
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
2017-09-29 10:52:12 -03:00
Oswaldo Acauan
bb94ed6b25
Remove unused defaultProps
2017-09-29 10:51:41 -03:00
Oswaldo Acauan
4ac554af56
Fix typo
2017-09-29 10:51:17 -03:00
Oswaldo Acauan
0300b854d5
Update emoji icon status when selected
2017-09-28 15:58:25 -03:00
Anton Georgiev
fe7130473d
Merge pull request #4418 from KDSBrowne/xx-02-mute-show-bug
...
[HTML5] - Mute button fix
2017-09-26 16:30:38 -04:00
gcampes
152527d1ab
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
2017-09-26 14:25:11 -03:00
KDSBrowne
32187d446a
rename service import and remove constants
2017-09-25 18:18:08 -07:00
gcampes
62fe06516f
Change audio modal styles and structure. WIP
2017-09-25 17:28:36 -03:00
KDSBrowne
00ac3b1a54
move functions to service and rename callback
2017-09-25 08:39:56 -07:00
KDSBrowne
baa1f0955e
change function signature line length
2017-09-25 07:13:14 -07:00
Oswaldo Acauan
36699bedb1
Merge remote-tracking branch 'upstream/master' into presentation-manager-merge
2017-09-22 15:11:48 -03:00
KDSBrowne
83adf4200f
remove unneeded if condition
2017-09-21 08:03:42 -07:00
KDSBrowne
c6647dfc95
mute button wont render for listenOnly users
2017-09-20 17:42:35 -07:00
Augusto Bennemann
d0592a7acb
HTML5 video: share and unshare buttons
2017-09-20 00:12:10 -03:00
gcampes
ea637a1e49
first changes to audio components and services. WIP
2017-09-19 16:31:04 -03:00
Augusto Bennemann
31f2e1cac7
HTML5 ScreenShare Presenter
2017-09-12 17:47:06 -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
Oswaldo Acauan
6070a4ea25
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x
2017-08-31 09:49:59 -03: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
JaeeunCho
3f773684bc
[HTML5] changed string id to camelCase
2017-08-10 10:34:34 -07:00
Klaus
0807960da4
Fix missing method for mute user
2017-08-04 17:05:18 -03:00
Klaus
d45ae64558
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-08-02 11:29:33 -03:00
Oleksandr Zhurbenko
b207a1275e
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-01 13:49:46 -07:00
Klaus
11cf4b8d78
A few fixes on client
2017-08-01 10:41:24 -03:00
Klaus
9d42ca9bd7
Move from users to voice-users
2017-08-01 10:10:12 -03:00
Klaus
eea2c0ee8b
Refactor user
2017-07-26 11:09:07 -03:00
Oleksandr Zhurbenko
23263c997b
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-17 16:01:05 -07:00
Klaus
87943cb3f8
Change relative path of the sass to absolute
2017-07-17 15:21:45 -03: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
Klaus
54234cecac
Handling emoji messages
2017-07-13 10:15:42 -03: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
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
b80fb29fb2
switch to callback ref
2017-06-10 12:21:13 -07:00
KDSBrowne
c189faceff
fix merge conflicts
2017-06-08 11:00:06 -07:00
Oswaldo Acauan
ccb6fd2a53
Fix merge conflicts
2017-06-07 12:01:18 +00: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
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
KDSBrowne
159a47694e
add suggested changes
2017-05-18 16:16:17 -07:00
KDSBrowne
de6e7093f3
remove custom aria prop name
2017-05-18 11:38:07 -07:00
KDSBrowne
d1543584ba
change file permission to 644
2017-05-17 09:07:41 -07:00
KDSBrowne
f4d6f173ea
fix new lint issues
2017-05-17 09:02:13 -07:00
KDSBrowne
16e507fbb2
fix merge conflicts
2017-05-17 08:54:48 -07:00
Anton Georgiev
746ef9478c
Merge pull request #3939 from KDSBrowne/userlist-accessibility
...
[HTML5] - Userlist accessibility improvement
2017-05-17 11:52:52 -04:00
KDSBrowne
2f79f3ff20
change locale stringformat
2017-05-16 17:02:27 -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
9e672c2c88
remove commented code
2017-05-12 11:23:55 -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
Oswaldo Acauan
1dc3bccb0d
Add presenter upload capabilities
2017-05-03 17:51:17 -03:00
Oswaldo Acauan
ff5d3d1211
Merge remote-tracking branch 'upstream/master' into presentation-uploader
...
* upstream/master: (83 commits)
resolve issues with modal on breakouts
Update generate_css_dpi.sh comments.
Added multi-resolution generated css files for the mobile client.
Added a shell script to generate multi-dpi css files for the mobile client.
Fix origin on pencil cursor
Fix a missing bracket in mobile demo
Delete services directory.
New cursors for flash client
update mobile demo to support https
Set icon-44.png to its true size and set value for allowBrowserInvocation in Main-app.xml
Delete services/bbb-web-api project.
Delete bbb-web-api project.
Renamed clours for mobile application styles.
Handle audio on refactored modal (#2 )
Put all toolbar logic in TopToolbarMediatorAIR to avoid double mediator registration.
fix lint issues
Fix the audio-modal
fix tabIndex for the settings closed caption submenu
remove extra list separator
fix console errors for missing key and invalid prop
...
2017-05-03 13:36:54 -03:00
Oswaldo Acauan
71fc15a803
Add presenter upload capabilities
2017-05-03 13:36:16 -03:00
Anton Georgiev
0521571218
Merge pull request #3838 from Klauswk/AddServerCallback
...
Add server callback with error
2017-05-03 11:11:35 -04:00
KDSBrowne
583677df18
fix focus bug in userlist
2017-05-03 07:09:39 -07:00
Anton Georgiev
30e73e7640
Merge pull request #3879 from KDSBrowne/accessibility-update-07
...
[HTML5] - Accessibility update 07
2017-05-02 15:12:21 -04:00
Anton Georgiev
78937a5ac9
Merge pull request #3831 from oswaldoacauan/modal-refactor-pr
...
[HTML5] Refactor of the Modal component state
2017-05-02 15:09:38 -04:00
Anton Georgiev
5087e5b24b
Handle audio on refactored modal ( #2 )
...
* handle audio on refactored modal
* wrap component with withModalMounter
2017-05-02 13:18:01 -04:00
Oswaldo Acauan
d434ba6893
Fix the audio-modal
2017-05-01 16:52:57 -03:00
KDSBrowne
eef9fd782a
fix merge conflict
2017-05-01 12:23:01 -07:00
Klauswk
30b7c3c1e4
Merge branch 'master' into AddServerCallback
2017-04-28 17:28:45 -03:00
Klaus Klein
31ae8854c9
Lint problems fixed
2017-04-28 17:01:02 -03:00
Oswaldo Acauan
edd64a97f4
Fix merge conflicts
2017-04-28 16:15:29 +00:00
Anton Georgiev
121cb47093
localize mute, unmute buttons
2017-04-28 11:34:20 -04:00
Anton Georgiev
684f87e77a
demote html5 moderator user to viewer based on flag
2017-04-27 16:07:27 -04:00
KDSBrowne
737da5937d
add aria descriptionfor current status
2017-04-27 08:57:41 -07:00
KDSBrowne
ef18f652aa
fix lint issues
2017-04-26 07:08:47 -07:00
Klaus Klein
e56546137b
Change callServer function name
2017-04-26 10:47:44 -03:00
Anton Georgiev
67700f605b
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring
2017-04-19 11:22:48 -04: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
Anton Georgiev
450d2f3435
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring
2017-04-17 11:37:49 -04:00
KDSBrowne
e316f38cda
fix merge conflicts
2017-04-11 07:07:49 -07:00
KDSBrowne
8fe66f35f9
change some descriptions
2017-04-11 06:52:30 -07:00
KDSBrowne
b80d55b6a1
elaborate on some descriptions
2017-04-10 14:28:07 -07:00
KDSBrowne
a5f1857c67
add descriptions to defined messages
2017-04-10 08:50:03 -07:00
Anton Georgiev
adf63397a3
Merge pull request #3780 from KDSBrowne/accessibility-update-03
...
[HTML5] - Accessibility update 03
2017-04-07 08:11:30 -04:00
Anton Georgiev
c257839e5b
Merge pull request #3753 from KDSBrowne/actions-button-fix
...
[HTML5] - Actions Button Fix
2017-04-07 08:08:14 -04: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
a8067b7bd8
clean up render function
2017-04-05 12:43:50 -07:00
KDSBrowne
47ec0ed4d5
remove unneeded css prop
2017-04-05 09:24:43 -07:00
KDSBrowne
ffab4a0898
change line endings
2017-04-05 09:20:32 -07:00
KDSBrowne
12ff717033
fix ability to click actions btn
2017-04-05 09:14:37 -07:00
Ghazi Triki
ae866c88a1
Updated HTML5 emoji status names to match with the Flex client.
2017-04-05 09:23:44 +01:00
KDSBrowne
940905e4b7
add aria-label to status btn
2017-04-03 10:34:37 -07:00
KDSBrowne
694baed724
use cx import to handle styles
2017-03-29 10:44:20 -07:00
KDSBrowne
208383d3a5
fix DropdownListSeparator to work with NVDA
2017-03-29 08:09:47 -07:00
KDSBrowne
658c80147c
remove local storage usage and add separator
2017-03-29 07:31:15 -07:00
KDSBrowne
396e7e4f0b
clean up css
2017-03-29 06:59:43 -07:00
KDSBrowne
67fbb8ddef
remove hidden duplicate component
2017-03-29 06:56:54 -07:00
Anton Georgiev
f4aeb3f7ee
move phone api to audio/service.js
2017-03-28 10:02:23 -04:00
KDSBrowne
2fae315db2
add menu item separation NVDA fiendly
2017-03-27 14:41:10 -07:00
Anton Georgiev
eae765cc69
move styles.sccs to audio-test
2017-03-27 11:45:24 -04:00
KDSBrowne
93d1aed4c3
remove unneeded variable
2017-03-24 12:27:45 -07:00
Anton Georgiev
8bb1386699
moved audio-modal and audio-settings under audio/
2017-03-24 12:01:35 -04:00
KDSBrowne
1edb4ec736
remove console log
2017-03-24 08:37:33 -07:00
KDSBrowne
a633492b98
move user and presenter views to main render function
2017-03-24 08:34:45 -07:00
Anton Georgiev
feac446be4
moved audio-menu under audio/
2017-03-24 11:34:03 -04:00
KDSBrowne
c26965e794
make actions button display only for Presenter
2017-03-24 07:49:38 -07:00
KDSBrowne
e1bdeffa46
add missing import to fix JoinAudio Btn
2017-03-23 07:34:59 -07:00
KDSBrowne
2d876550db
merge with master
2017-03-23 07:16:47 -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
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
Oswaldo Acauan
2090883b03
Refactor Auth logout and credentials getter
2017-03-17 14:23:00 +00:00
KDSBrowne
d2405d4c61
pass props down from createContainer
2017-03-16 16:30:46 -07:00
KDSBrowne
c510921509
remove DropdownListSeparator
2017-03-15 08:36:42 -07: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
KDSBrowne
e385e28445
rename open and close function
2017-03-14 10:17:59 -07:00
KDSBrowne
75f3f8cc2e
move if condition
2017-03-14 10:16:33 -07:00
KDSBrowne
c913d81578
rename open and close function
2017-03-14 09:40:17 -07:00
KDSBrowne
b112a5573e
add in suggestions
2017-03-14 09:32:50 -07:00
KDSBrowne
cc00f38602
move api function to container
2017-03-13 09:05:54 -07:00
KDSBrowne
251066045c
make mute button return null if not in Audio
2017-03-13 08:55:16 -07:00
Oleksandr Zhurbenko
7b3bc48be4
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update
2017-03-02 10:11:59 -08:00
Oleksandr Zhurbenko
80666bd688
Updated icons in the html5 client
2017-03-01 17:03:02 -08:00
Oswaldo Acauan
8bd65c1a43
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Updated with correct version
Check for initial values in application.conf
remove defaultMessage
Remove wrong selector when upserting captions
Localize other labels through the application
localize labels for AudioSettings component
localize label for AudioTest component
hide option to reset status if there is no status (emojis)
drop voice in main room when joining breakout room
add defaultMessage for Public Chat
localize Join/Leave Audio labels
Remove console logs
Fix ´get_all_meetings_request´ being published multiple times
Clean captions when handling the history reply
Fix presentation slide coordinates
- when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
use localized Public Chat label
finish locals for the audio modal
Returning number of users that participated in each meeting in getRecordings call
add comment for condition
...
2017-02-23 17:46:30 +00:00
Oswaldo Acauan
f16926c94d
Refactor emojiStatus method
2017-02-22 13:11:47 +00:00
Anton Georgiev
f4516180e2
localize Join/Leave Audio labels
2017-02-14 11:28:21 -05:00
Anton Georgiev
d1176678d9
Merge pull request #3609 from KDSBrowne/Audio-Modal-Reduction
...
Add Transaprent Base for Audio Modal only
2017-02-02 12:07:54 -05:00
KDSBrowne
6c372ed68b
fix lint issues
2017-02-02 08:46:49 -08:00
KDSBrowne
c6ab4c2687
remove glow prop and use className to change style
2017-02-01 11:40:00 -08:00
KDSBrowne
1ab0b05e37
rename css class
2017-02-01 10:03:50 -08:00
KDSBrowne
d6370a8808
add box shadow to button and remove label glow
2017-02-01 08:16:02 -08:00
KDSBrowne
cc3fb848c6
change mute button style if user is talking
2017-01-27 08:57:14 -08:00
KDSBrowne
7ce0c175b9
fix inverted mute status icon
2017-01-27 06:41:22 -08:00
KDSBrowne
ef9c98b0ec
fix merge conflict
2017-01-09 11:41:59 -08:00
Anton Georgiev
47c2fef149
Merge branch 'keyboard-nav' of github.com:mmarangoni/bigbluebutton into merge-3530
2017-01-09 18:42:02 +00:00
KDSBrowne
04b948c281
remove unneeded comment
2017-01-09 08:40:16 -08:00
KDSBrowne
2b6400379b
move joinListenOnly from component to container
2017-01-09 08:35:25 -08:00
Lajellu
a7afa00b0f
HTML5 - Emojis - Remove the extra icons added in by the previous merge
2016-12-21 09:01:33 -08:00
Lajellu
9a77ace223
Merge remote-tracking branch 'upstream/master' into completeEmojiIcons
2016-12-21 09:00:12 -08:00
Lajellu
8389d2b2e3
HTML5 - comment out Join Video to fix DOM positioning
...
The reason there was so much space between `Join Audio` and `Status` was that `Join Video` was in between. Join Video was removed
to fix this positioning.
Leave Audio and Join Video icons are being hidden, which still holds the space for that component in the DOM, but does not show
it.
`Join Audio` should not be commented out because the icon is displayed at certain times.
`Join Video` can be commented out for now for UI purposes and put back when it's implemented.
2016-12-20 12:27:16 -08:00
Matthew Marangoni
ba19b1443a
Update new audio and mute icons
2016-12-20 11:45:48 -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
Lajellu
98db4c8eec
HTML5 - fixes merge conflicts bw master and this branch
2016-12-20 09:18:24 -08:00
KDSBrowne
5d328560a1
added suggestion
2016-12-15 08:15:04 -08:00
KDSBrowne
a4fc8440ea
cleaned up
2016-12-14 16:02:08 -08:00
KDSBrowne
ae70ce1116
temporarily hide the Cam button
2016-12-14 11:55:35 -08:00
Matthew Marangoni
0daa2798d5
updated with master/fixed merge conflicts
2016-12-09 12:39:48 -08:00
Matthew Marangoni
7e68432c29
Merge remote-tracking branch 'upstream/master' into html5-stun-audio
2016-12-09 12:30:33 -08:00
Matthew Marangoni
76f5de8722
mute button container and component improvements
2016-12-08 10:11:49 -08:00
Anton Georgiev
aaecd871b6
Merge pull request #3491 from KDSBrowne/Audio-Components-Breakdown
...
Added audio-setting components
2016-12-07 10:34:49 -05:00
Matthew Marangoni
6f300b4832
isolated mute button, reduced button movement on actions bar, improved join listen only
2016-12-06 13:15:23 -08:00
Oswaldo Acauan
7971541282
Update emoji icons to reflect the names on the font release v7
2016-12-05 18:49:34 -02:00
Oswaldo Acauan
09f97377a8
Remove extra div from actions-bar
2016-12-05 18:41:24 -02:00
Oswaldo Acauan
4c55ea5732
Match actions-bar and navbar paddings
2016-12-05 18:36:57 -02:00
KDSBrowne
d220c17bba
removed component name duplication
2016-12-05 09:07:25 -08:00
Anton Georgiev
c98813e7b3
Merge pull request #3460 from mmarangoni/html5-stun-audio
...
Mute, Unmute, Leave Audio
2016-11-18 17:03:13 -05:00
Matthew Marangoni
c9221c94f3
removed unecessary import statements
2016-11-18 13:35:02 -08:00
Matthew Marangoni
aa65afffa4
adjusted to meet component/container structure conventions and simplify code
2016-11-18 13:24:59 -08:00
Matthew Marangoni
0abcc06bfc
linting fixes & updated based on feedback
2016-11-15 13:00:28 -08:00
KDSBrowne
cba6e75735
cleaning up
2016-11-14 18:48:56 -08:00
Matthew Marangoni
807f434d72
fixed an error with exit audio
2016-11-11 14:11:00 -08:00
Matthew Marangoni
482fc97388
Added mute/unmute/join listen only/leave audio features to join audio modal
2016-11-11 13:09:34 -08:00
KDSBrowne
2296a122f5
Actions button only available to Presentor
2016-11-07 10:19:00 -08:00
Matthew Marangoni
7fb492894e
Added exiting audio
2016-10-25 14:16:40 -07:00
Matthew Marangoni
0d3f231ac1
Merge remote-tracking branch 'upstream/master' into html5-stun-audio
2016-10-24 09:08:13 -07:00
JaeeunCho
6d1823f2c7
HTML5 - fixed linebreak with lint
2016-10-17 14:29:00 -07:00
Anton Georgiev
11f0c2da03
Merge pull request #3401 from KDSBrowne/Localization-update
...
Localization update #1
2016-10-13 10:44:13 -04:00
Matthew Marangoni
918ae83fc8
Added initial Join Audio modal
2016-10-11 12:04:50 -07:00
Lajellu
1f114eb908
Merge remote-tracking branch 'origin/EmojiReworked' into EmojiReworked
2016-10-06 13:44:03 -07:00
Lajellu
63c9f94b54
HTML5 - changes status names, and user list sorting logic to match flash client
2016-10-06 13:42:37 -07:00
KDSBrowne
b811f01ad1
Fixed lint issues
2016-10-03 08:10:20 -07:00
KDSBrowne
d2cc6e1b18
Localization update
2016-10-02 08:46:15 -07:00
Anton Georgiev
27c1896629
Merge branch 'EmojiReworked' of github.com:lajellu/bigbluebutton into merge-pr
2016-09-28 23:47:28 +00:00
JaeeunCho
3962349517
HTML5 - Settings : changed to label
2016-09-26 14:55:33 -07:00
Lajellu
7d724022e4
HTML5 - changes folder name emojiMenu to emoji-menu for uniform style in project
2016-09-26 14:06:41 -07:00
Lajellu
c68ad3240d
HTML5 - adds Emoji showing up on user list
2016-09-26 13:29:44 -07:00
JaeeunCho
b0947c85c1
HTML5 - Settings : added description messages and changed to label
2016-09-22 13:51:00 -07:00
JaeeunCho
f64d4b5221
HTML5 - Actions button : change lab to label and location
2016-09-21 12:22:48 -07:00
JaeeunCho
cd38051d5e
HTML5 - Actions button : change lab to label and location
2016-09-21 12:15:32 -07:00
JaeeunCho
ce9f1c3dce
HTML5 - Actions button : add messages
2016-09-21 11:29:31 -07:00
Lajellu
88b05d2cb9
HTML5 - adds Emoji considering dropdown rewrite by Oswaldo
2016-09-21 11:03:18 -07:00
JaeeunCho
cbf8e88e68
HTML5 Actions button
2016-09-13 12:46:12 -07:00
Oleksandr Zhurbenko
d9ddbfbda6
Cleanup, linting, fixed css modules' imports
2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
d510907179
Upgraded Meteor to 1.4
2016-07-27 14:50:35 -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
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07:00
Oswaldo Acauan
29c09afee9
Add basic nav-bar styles
2016-05-20 13:29:55 -03:00
Oswaldo Acauan
0e9b8f7eff
Add basic styles for actions-bar
2016-05-20 13:17:21 -03:00
Oswaldo Acauan
99c2e94c80
Remove unnecessary extension on imports
2016-05-20 10:46:30 -03:00
Oswaldo Acauan
d81cb28f35
Add new component button and some basic styles
2016-05-20 10:37:19 -03:00
Oswaldo Acauan
2d57d7cbed
Rename Actionsbar and Navbar to ActionsBar and NavBar
2016-05-04 11:48:53 -03:00
