450 Commits

Author	SHA1	Message	Date
Maxim Khlobystov	4067f5f808	Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-bulk-upsert	2018-04-25 14:39:48 +00:00
Maxim Khlobystov	8d1e80fbf0	Put the bulk lifespan value into configs.	2018-04-25 14:27:53 +00:00
KDSBrowne	01cbce8a0b	change userlist toggle aria-label to match headings inside userlist	2018-04-24 09:11:22 -07:00
Anton Georgiev	c4226e0c95	Merge pull request #5369 from Tainan404/issue-4901 ... Change hand to pointer icon in Whiteboard toolbar.	2018-04-23 14:35:40 -04:00
Tainan Felipe	1e8558c77a	Remove hand key in en.jon	2018-04-23 15:34:20 -03:00
Tainan Felipe	2e76439395	Change hand to pointer icon	2018-04-18 16:32:13 -03:00
Tainan Felipe	7c2309c382	change status message to comply with client	2018-04-18 14:34:03 -03:00
Anton Georgiev	457eb28cd6	Merge pull request #5327 from oswaldoacauan/webcams-styling ... Update on video designs and swap	2018-04-16 17:00:55 -04:00
Oswaldo Acauan	c640c77101	Merge remote-tracking branch 'upstream/v2.0.x-release' into polls-styling	2018-04-13 16:05:15 -03:00
Oswaldo Acauan	9c2e8472cc	Merge branch 'presentation-styles' into webcams-styling	2018-04-13 10:06:11 -03:00
Anton Georgiev	e9c4f2c7ab	pulled locales April 11, 2018	2018-04-12 21:25:09 +00:00
Oswaldo Acauan	66b25e4417	Merge branch 'v2.0.x-release' into webcams-styling	2018-04-11 15:54:01 -03:00
Tainan Felipe	7121a4c897	Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256	2018-04-10 16:48:13 -03:00
Oswaldo Acauan	c4e429dd01	Merge remote-tracking branch 'upstream/v2.0.x-release' into webcams-styling	2018-04-09 15:49:25 -03:00
Oswaldo Acauan	5918fc4483	Impl new webcam design	2018-04-09 11:39:27 -03:00
Anton Georgiev	21b6dab852	Merge pull request #5267 from Tainan404/issue-5237 ... Add custom logo area	2018-04-05 15:08:05 -04:00
Tainan Felipe	539d9b7b15	Add branding setting on setting-production.json	2018-04-05 15:48:56 -03:00
Tainan Felipe	a5ccd54cc3	Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256	2018-04-05 15:31:24 -03:00
Anton Georgiev	ff3f9758fa	Merge pull request #5285 from KDSBrowne/z-02-accessibility-zeeshan-3 ... Screen reader accessibility update	2018-04-04 10:07:01 -04:00
KDSBrowne	d7ac0ef18d	edit locale strings	2018-04-03 18:51:07 -07:00
KDSBrowne	9340c19621	update strings	2018-04-03 10:58:01 -04:00
Tainan Felipe	8e1bca98f3	Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256	2018-04-02 16:29:11 -03:00
Anton Georgiev	5bf7f908b5	Merge pull request #5295 from Tainan404/issue-5015 ... Update clear status label for be consistent with userlist clear status	2018-04-02 14:51:12 -04:00
Anton Georgiev	ccc4585cc7	Merge pull request #5281 from jfsiebel/change-data-saving-labels ... Reverse data saving logic	2018-04-02 13:32:45 -04:00
Tainan Felipe Pauli de Almeida	7328d33b6c	add disabled label for whiteboard-toolbar. closes #5042	2018-03-29 13:43:41 -03:00
KDSBrowne	51c3dbb7a1	Merge remote-tracking branch 'upstream/v2.0.x-release' into z-02-accessibility-zeeshan-3	2018-03-27 07:33:58 -07:00
Tainan Felipe Pauli de Almeida	70f34b7725	Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256	2018-03-26 16:01:31 -03:00
João Francisco Siebel	fe0f6a67a3	Reverse data saving logic	2018-03-26 15:26:52 -03:00
Anton Georgiev	38aeba2c31	Merge pull request #5221 from jfsiebel/handle-audio-configuration ... Handle audio configuration	2018-03-26 11:05:06 -04:00
Tainan Felipe Pauli de Almeida	66adb5b833	Update clear status label for be consistent with userlist clear status. Closes #5015	2018-03-23 15:51:10 -03:00
KDSBrowne	5775325f5f	edit localized string for aria label	2018-03-23 08:40:25 -07:00
Tainan Felipe Pauli de Almeida	873cb24f34	closes issues #5256 and #5248	2018-03-22 14:41:44 -03:00
Tainan Felipe Pauli de Almeida	978b8c7cdc	switch displayBrandingArea for false	2018-03-21 15:46:33 -03:00
Tainan Felipe Pauli de Almeida	505a00daba	add custom logo area	2018-03-21 15:19:09 -03:00
KDSBrowne	589a950eea	remove extra text from user aria-label string	2018-03-21 10:41:54 -07:00
KDSBrowne	cb8d293cec	add aria-labels to yes / no btns in echo test	2018-03-21 10:19:35 -07:00
Anton Georgiev	c9fa0d7387	Merge pull request #5244 from KDSBrowne/z-02-accessibility-zeeshan-2 ... Screen reader accessibility update	2018-03-19 16:56:51 -04:00
Anton Georgiev	172a4eb45c	Merge pull request #5230 from jfsiebel/screenshare-notification ... Implement notification when a presenter start and end a screenshare	2018-03-19 14:13:33 -04:00
Anton Georgiev	472215cf95	Merge pull request #5212 from Tainan404/issue-5160 ... Add webcam controls menu in video button.	2018-03-16 14:04:17 -04:00
Anton Georgiev	47088cdc73	pulled html5 locales 2018-03-16	2018-03-16 14:57:19 +00:00
Tainan Felipe Pauli de Almeida	938bac7527	Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5160	2018-03-15 16:55:54 -03:00
KDSBrowne	8358023a66	edit aria-label localized string	2018-03-14 09:26:01 -07:00
KDSBrowne	024c0f0d47	enhance logout experience with screen reader	2018-03-14 09:21:11 -07:00
KDSBrowne	9968425ac7	localize text in switch component	2018-03-14 09:09:52 -07: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
Joao Siebel	cb70001f37	Implement notification when a presenter start and end a screenshare	2018-03-09 08:20:08 -03:00
Joao Siebel	48cc9f3ca9	Handle join audio connection errors and update production settings	2018-03-08 10:38:18 -03:00
Anton Georgiev	34a2959b34	Merge pull request #5222 from antobinary/increase-logging ... Increase logging - needed to detect audio state inconsistencies	2018-03-07 11:42:58 -05:00
Anton Georgiev	d29af2bf25	increase logging level in production	2018-03-07 11:18:02 -05:00
KDSBrowne	665bc1ca73	Merge remote-tracking branch 'upstream/v2.0.x-release' into z-02-accessibility-zeeshan-1	2018-03-06 07:34:02 -08:00
João Francisco Siebel	1cd8aab376	Fix handling audio options	2018-03-06 11:36:49 -03:00
Tainan Felipe Pauli de Almeida	2c5d894d05	add webcam controls in videoMenu button	2018-03-06 10:52:16 -03:00
Anton Georgiev	42809a61f0	Merge pull request #5099 from jfsiebel/screenshare-data-saving-setting ... Implement screen share data saving setting	2018-03-05 11:54:48 -05:00
João Francisco Siebel	85b8769ad5	Handle autoJoin, listenOnlyMode and skipCheck	2018-03-02 09:01:34 -03:00
Maxim Khlobystov	c58fa045e9	Removed the filename field from development and production settings.	2018-02-28 11:20:58 -05:00
João Francisco Siebel	9a2c797274	Fix problems with merge and language	2018-02-23 14:44:51 -03:00
João Francisco Siebel	efbf830e31	Change recording indicator to match #5127 changes	2018-02-23 13:26:33 -03:00
KDSBrowne	1ba4b952a1	add more context to userlist toggle aria label for screen reader	2018-02-22 12:27:19 -08:00
João Francisco Siebel	56a9bf70ff	Change end to stop in labels	2018-02-19 15:42:22 -03:00
João Francisco Siebel	4d8d522bb8	Fix settings file	2018-02-19 14:04:26 -03:00
João Francisco Siebel	6bb031076b	Resolve merge problems	2018-02-19 14:00:43 -03:00
João Francisco Siebel	d13be2c77b	Add tooltip to recording indicator	2018-02-16 11:47:55 -02:00
João Francisco Siebel	919c2aa644	Implement start/stop recording logic	2018-02-15 17:42:50 -02:00
Lucas Fialho Zawacki	fcca273f8f	Merge branch 'settings-lock-video-dock' of https://github.com/Tainan404/bigbluebutton into settings-lock-video-dock	2018-02-14 15:55:10 +00:00
Tainan Felipe Pauli de Almeida	473fdea28b	revert changes in en.json	2018-02-14 09:39:15 -02:00
Lucas Fialho Zawacki	23b635b4ff	Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock	2018-02-08 14:48:33 +00:00
Joao Siebel	eddc480851	Implement screenshare data saving setting. Fix #5029	2018-02-06 11:33:48 -02:00
Oleksandr Zhurbenko	6e1102999d	Turned on logging for the production	2018-02-05 12:39:08 -08:00
Oleksandr Zhurbenko	e1568baa24	Fixed the logging of the Meteor serser-side methods	2018-02-05 12:34:03 -08:00
Tainan Felipe Pauli de Almeida	cba6628de0	add to the functionality of deactivating the videodock via settings	2018-01-30 14:32:37 -02:00
Tainan Felipe Pauli de Almeida	0bfe3093c0	add interface for data saving tab	2018-01-30 09:20:51 -02:00
Anton Georgiev	7d6868ef63	Merge pull request #5033 from antobinary/pull-locales-2 ... Pulled html5 client locales 2018-01-25	2018-01-26 16:09:11 -02:00
Anton Georgiev	d2709c9d9d	adjust production settings to match changes on dev settigns	2018-01-26 11:22:17 -05:00
Anton Georgiev	952b4457f5	pull the latest German translations	2018-01-25 14:15:51 -05:00
Anton Georgiev	e5b1289b9c	remove duplicated Japanese locale	2018-01-25 13:42:33 -05:00
Anton Georgiev	ba7d3325b7	adjust Khmer locale, related to #4538	2018-01-25 13:36:19 -05:00
Anton Georgiev	0d2f52c033	pulled html5 client locales 2018-01-25	2018-01-25 12:28:45 -05:00
Anton Georgiev	72ea8b8906	remove duplicated keys in en.json	2018-01-24 16:49:48 -05:00
Anton Georgiev	b8400c7501	remove duplicated keys in en.json	2018-01-24 16:46:18 -05:00
Anton Georgiev	3159973533	Merge pull request #4961 from KDSBrowne/z.0.3-transifex-blank-locale ... Make transifex.sh ignore locales with no translated strings	2018-01-19 18:54:19 -02:00
Joao Siebel	a42d88250e	Resolve merge conflict in english locales file	2018-01-19 17:43:11 -02:00
Anton Georgiev	2ba9433c1d	change copyright year to 2018	2018-01-17 16:31:50 -05:00
Oleksandr Zhurbenko	f6ed7c3575	Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4897	2018-01-15 12:33:29 -08:00
KDSBrowne	387f539c52	remove empty locale file	2018-01-14 10:29:36 -08:00
prlanzarin	acc9650370	Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-upstream-errors	2018-01-12 21:39:24 +00:00
prlanzarin	8594ce169d	Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors	2018-01-12 20:02:45 +00:00
Tainan Felipe	8ae1fd1820	Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends	2018-01-11 09:19:56 -02:00
Joao Siebel	0764ae867c	Remove old whiteboard toolbar items config	2018-01-11 08:51:37 -02:00
Joao Siebel	0b02d90927	Resolve merge conflicts	2018-01-10 17:22:42 -02:00
Oleksandr Zhurbenko	7871681448	Changed all the references of kick to remove, to be consistent	2018-01-09 14:28:48 -08:00
Oleksandr Zhurbenko	4af6d30f6a	Switched from the broken 4commerce:env-settings package to native Meteor.settings	2018-01-07 16:24:05 -08:00
Augusto Bennemann	e2ef3281ec	Localize video and screnshare error messages	2018-01-05 19:43:53 +00:00
Anton Georgiev	d22a6d5a96	Merge pull request #4883 from OZhurbenko/fix-issue-4863 ... Updated the message displayed to the kicked user	2018-01-04 14:20:00 -02:00
Anton Georgiev	850ac870e9	Merge pull request #4884 from OZhurbenko/fix-issue-4715 ... Updated the html5 client's font to use the latest icons	2018-01-04 13:30:36 -02:00
Anton Georgiev	34a503b218	Merge pull request #4624 from Tainan404/toast-breakout-ends ... [HTML5] show audio modal and toast notification when breakout room ends	2018-01-03 19:11:27 -02:00
Oleksandr Zhurbenko	b3ceb4d5f6	Updated the html5 client's font to use the latest icons ... Fixes #4715	2018-01-03 12:35:01 -08:00
Oleksandr Zhurbenko	d8533a86b3	Changed the message displayed to the kicked user ... Fixes #4863	2018-01-03 12:25:13 -08:00
prlanzarin	31fb95bf72	Removed wrong video peer stop procedure and reset the kurento.yaml config file	2017-12-22 12:30:24 +00:00
prlanzarin	3a72afa350	Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection	2017-12-21 17:37:07 +00:00
Lucas Zawacki	06f8b56a82	Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow ... Conflicts: bigbluebutton-html5/imports/ui/components/video-dock/component.jsx	2017-12-20 18:43:33 -02:00
prlanzarin	362335f727	Made the users own webcam local instead of server-side	2017-12-20 20:06:27 +00:00
Tainan Felipe	2c48392b2c	change intl id	2017-12-18 08:53:37 -02:00
Anton Georgiev	d6aa4ed44d	Merge pull request #4733 from oswaldoacauan/fix-4700 ... Improvements on Presentation Management	2017-12-15 19:03:54 -02:00
Lucas Zawacki	1e514aad04	Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu ... Removed several variables that were in this.state to this in the html5 video-dock component Conflicts: bigbluebutton-html5/imports/ui/components/video-dock/component.jsx	2017-12-15 13:47:03 -02:00
Tainan Felipe	c582f5bf08	add meetingEnded in Base component aand add intl translation	2017-12-14 17:03:34 -02:00
Joao Siebel	45ec92c230	Merge remote-tracking branch 'upstream/v2.0.x-release' into whiteboard-toolbar-locale	2017-12-14 08:47:45 -02:00
Tainan Felipe	a66db4797a	Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-breakout-ends	2017-12-11 08:14:27 -02:00
Anton Georgiev	085eb57556	add ejectUserFromVoice for moderator	2017-12-08 11:40:52 -05:00
prlanzarin	89bd746f1c	Changed webcam localization strings	2017-12-08 16:23:21 +00:00
João Francisco Siebel	950eb488a0	Add locale to whiteboard toolbox items	2017-12-08 11:28:02 -02:00
Anton Georgiev	48bf163559	linting and clean-up	2017-12-07 17:13:44 -05:00
Anton Georgiev	bf7c26f02b	Merge pull request #4712 from Tainan404/localize-public-clear ... Localize message from when clear the chat.	2017-12-07 18:27:55 -02:00
Anton Georgiev	c9a5ded2c1	Merge pull request #4662 from Tainan404/fix-design ... Fix design issues	2017-12-05 18:54:08 -02:00
Anton Georgiev	255d64d430	Merge pull request #4687 from Gcampes/audio-refactor-bugfixes ... Audio bugfixes and improvements	2017-12-05 17:17:35 -02:00
Oswaldo Acauan	938c3c2c0d	Add actual current pres indicator	2017-12-04 14:18:57 -02:00
Lucas Zawacki	1f2f5dc218	More reconnect logic and some translations	2017-12-01 21:40:25 -02:00
prlanzarin	f2bf5cca87	Fixed missing comma in english localization file	2017-11-29 14:02:55 +00:00
Tainan Felipe	488f9eacc3	Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-design	2017-11-29 09:32:39 -02:00
Tainan Felipe	2afd7b16a0	readd missing messages	2017-11-29 08:48:57 -02:00
Oswaldo Acauan	807bd99f82	Fix stuck state on conversion failure	2017-11-28 10:26:00 -02:00
Oswaldo Acauan	e8de534964	Add error handling on presentation upload and covnersion	2017-11-27 15:44:45 -02:00
Tainan Felipe	d15bb139bb	refactor emoji menu	2017-11-23 15:20:27 -02:00
Tainan Felipe	545d9e158b	altered id of the intl message	2017-11-23 11:00:41 -02:00
Tainan Felipe	5f66e79263	linter fixes	2017-11-23 09:49:10 -02:00
Tainan Felipe	37440e11f1	Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-breakout-ends	2017-11-22 11:11:21 -02:00
Tainan Felipe	6845aed0e0	localize message from when clear the chat	2017-11-21 16:31:53 -02:00
Anton Georgiev	697f178b8f	Merge pull request #4647 from Tainan404/translate-slide-option ... Add localization for slides options	2017-11-20 18:11:37 -02:00
Gabriel Carvalho de Campes	74bb2bb5e8	fix permission overlay positioning, localizes messages	2017-11-17 17:01:52 -02:00
Tainan Felipe	881a8e153e	change name of the variables for goToSlide	2017-11-17 13:54:23 -02:00
Gabriel Carvalho de Campes	effb21fc1f	Changes and enhancements on audio, wIP	2017-11-17 09:52:48 -02:00
Tainan Felipe	0c37aa96df	hchange of slide for slideLabel	2017-11-17 08:27:12 -02:00
Gabriel Carvalho de Campes	36c9d85749	Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor	2017-11-16 09:13:47 -02:00
Anton Georgiev	51652fc790	Merge pull request #4669 from jfsiebel/add-moderator-unmute-config ... add moderatorUnmute feature in HTML5 client	2017-11-14 16:49:41 -02:00
Anton Georgiev	b6befb3ae0	Merge pull request #4601 from Tainan404/notification-chat-message ... Add toast notification for new chat messages and uncomment settings for chat notifications.	2017-11-14 13:50:25 -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
Tainan Felipe	7318370a7e	Add localization for slides options	2017-11-09 13:45:24 -02:00
prlanzarin	e96fc385f1	Handling HTML5 screensharing stop ... The action bar stop button is temporary	2017-11-06 15:39:55 +00:00
Anton Georgiev	8b80d7e9c2	Merge pull request #4621 from Tainan404/fix-upload-percentage ... [HTML 5] Rounds upload percentage, localize messages in presentation uploader	2017-11-02 11:03:03 -02:00
Gabriel Carvalho de Campes	e55ee0d28e	fix listen only dead end on permissions denied	2017-11-02 10:10:01 -02:00
Tainan Felipe	9db759074f	moved intl messages to locales/en	2017-11-01 14:37:44 -02:00
Anton Georgiev	8853d562ce	Merge pull request #4497 from Gcampes/audio-refactor ... [HTML5] Refactor Audio	2017-10-31 15:39:37 -02:00
Gabriel Carvalho de Campes	fde5d56d87	change ask permissions timing, small code fixes	2017-10-31 08:53:06 -02:00
Joao Siebel	86264dcb11	Read allowModeratorToUnmuteAudio property from config	2017-10-30 17:15:43 -02:00
Joao Siebel	4a0fedce3d	Remove the unmute flag from config, fix mute and unmute options for listen only user and check server-side	2017-10-30 16:27:17 -02:00
Tainan Felipe	e1ca9950a1	add chat push notification and refactor audio notification	2017-10-30 08:34:28 -02:00
Gabriel Carvalho de Campes	81f35bac4f	Fix concerns from review	2017-10-26 15:14:56 -02:00
Joao Siebel	d349150bae	add moderatorUnmute feature in HTML5 client	2017-10-26 10:50:55 -02:00
KDSBrowne	34313c6eaa	replace strings with constants	2017-10-25 12:00:31 -07:00
gcampes	d32330b208	Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor	2017-10-24 11:19:58 -02:00