Lucas Fialho Zawacki
65a2fb592f
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor
2018-03-20 17:22:11 +00:00
Anton Georgiev
d17ca71a60
Merge pull request #5157 from jfsiebel/implement-start-stop-recording-html5
...
Implement start stop recording html5
2018-03-09 14:28:14 -05:00
João Francisco Siebel
bfc2f6bc24
Fix when to see the record indicator
2018-02-28 11:10:00 -03:00
João Francisco Siebel
8f43508b4f
Linter some code and simplify action button logic display
2018-02-20 15:23:35 -03:00
João Francisco Siebel
56a9bf70ff
Change end to stop in labels
2018-02-19 15:42:22 -03:00
João Francisco Siebel
c2076c5260
Fix logic for showing start/end recording
2018-02-19 13:30:21 -03:00
Lucas Fialho Zawacki
388fee31b6
Renaming files to better suit html5 structure
2018-02-19 04:23:05 +00:00
João Francisco Siebel
919c2aa644
Implement start/stop recording logic
2018-02-15 17:42:50 -02:00
Augusto Bennemann
1d5bfce167
Fix share/unshare video button style and remove old files
2018-02-07 12:51:40 -02:00
Anton Georgiev
9b16ae8d51
Merge pull request #4938 from KDSBrowne/z.0.1-mobile-btn-alignmet
...
Fix alignment of ActionsBar buttons for small screens
2018-01-18 16:34:27 -02:00
Augusto Bennemann
975525fe9b
Fix keys usage on actions-dropdown
2018-01-17 19:51:33 -02:00
Augusto Bennemann
10cdd603bc
Fix null child element
2018-01-17 11:34:35 -02:00
Augusto Bennemann
5bf96b3c84
Screenshare button conditional rendering
2018-01-17 01:17:07 -02:00
Augusto Bennemann
90adda6a93
Display either 'start' or 'stop' screenshare button, if screenshare enabled on config
2018-01-16 17:12:41 -02:00
KDSBrowne
2e2a1609a4
resolve lint issue
2018-01-12 11:32:33 -05:00
KDSBrowne
9593b12904
remove css not being used
2018-01-10 09:22:03 -08:00
KDSBrowne
57424ecedd
add css class to align btns as presenter for small mobile screens
2018-01-10 07:44:21 -08:00
KDSBrowne
7c6e490b82
fix btn positioning using media queries
2018-01-09 13:13:31 -08:00
KDSBrowne
438afc6241
reduce margin between btns on action bar
2018-01-09 12:30:38 -08:00
Anton Georgiev
980a6490ec
Merge pull request #4832 from KDSBrowne/x.0.3-fix-console-warnings
...
Fix Invalid prop 'children[2]' supplied to `DropdownList`
2018-01-09 13:28:17 -02: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
KDSBrowne
3fd964d3ca
remove import not being used
2018-01-03 09:04:28 -08:00
KDSBrowne
ed3d58f0f2
Merge remote-tracking branch 'upstream/v2.0.x-release' into x.0.3-fix-console-warnings
2018-01-03 08:56:22 -08:00
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
