229 Commits

Author	SHA1	Message	Date
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
Joao Siebel	218890d8a6	Alter status tooltip to match selected status	2017-12-15 11:11:28 -02: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