BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,549 Commits 13 Branches 260 Tags 1.1 GiB
f5410e762e
Commit Graph

639 Commits

Author SHA1 Message Date
Bobak Oftadeh
7b9de769a7 Added help button to the drop-down list 2018-08-09 14:08:16 -07:00
KDSBrowne
fecbee16b5 change folder / component names & localized strings 2018-08-09 17:02:18 +00:00
Anton Georgiev
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support 2018-08-01 14:24:00 -04:00
Anton Georgiev
6533802573
Merge pull request #5932 from oswaldoacauan/presentation-pods 
Presentation pods support
 2018-08-01 13:49:32 -04:00
Bobak Oftadeh
f0d5969b5c Added configurations to the production settings 2018-08-01 09:18:54 -07:00
KDSBrowne
78c81880db Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 5782-move-set-status 2018-08-01 15:43:31 +00:00
Bobak Oftadeh
78bcec7553 Implemented adjustments to logClient 2018-07-31 15:28:03 -07:00
Anton Georgiev
19c36acd2c pulled locales for HTML5 client 2018-07-31 2018-07-31 20:30:13 +00:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00:00
João Francisco Siebel
655483576f fix unread messages counter on public chat and remove some old chat configurations 2018-07-27 10:44:21 -03:00
Anton Georgiev
e6f834e80a pulled html5 locales 2018-07-25 2018-07-25 20:39:44 +00:00
Oswaldo Acauan
b7823c406c Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods 2018-07-24 17:20:37 -03:00
Anton Georgiev
e4edb9f196
Merge pull request #5894 from prlanzarin/sfu-error-handling-3 
SFU error handling part 3
 2018-07-24 13:45:08 -04:00
Bobak Oftadeh
c3172a7691 The client logger can now be configured on the production settings 2018-07-23 09:15:50 -07:00
prlanzarin
727e6b3fc5 Removed trailing comma from locale 2018-07-20 20:16:04 +00:00
prlanzarin
75f70ad06c Added SFU error handling in video-provider component with localized messages 2018-07-20 19:34:50 +00:00
Ghazi Triki
66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
 2018-07-16 16:08:38 +01:00
Bobak Oftadeh
5a2d2934fa Updated settings for client-logger 2018-07-13 12:44:22 -07:00
Bobak Oftadeh
a5354c9c10 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3 2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Anton Georgiev
f50cf96100
Merge pull request #5840 from Tainan404/issue-5833 
Comply audio lock setting.
 2018-07-12 14:38:19 -04:00
KDSBrowne
006b5cfa40 add arrow icon to end of set status option 2018-07-12 17:42:51 +00:00
Anton Georgiev
97fb0e9b4f
Merge pull request #5827 from Tainan404/issue-5562 
Allow html5 user to join in any breakout room
 2018-07-12 12:21:14 -04:00
Anton Georgiev
2e3c071419
Merge pull request #5812 from musickiper/tweak-usrMenu-for-all-text 
Allow longer menu labels (think DE) to spread over several rows within the menu
 2018-07-12 11:39:46 -04:00
Anton Georgiev
5bcbc330af
Merge pull request #5842 from prlanzarin/audio-video-ss-stun-turn 
[HTML5] STUN/TURN config support for SFU client-side apps and general improvements
 2018-07-10 11:24:37 -04:00
prlanzarin
123ec6f3a3 Reverted wrong config changes 2018-07-09 21:33:32 +00:00
prlanzarin
d2bdb67ed3 Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components 2018-07-09 21:29:59 +00:00
Tainan Felipe
e424970018 Comply audio lock setting 2018-07-09 16:23:16 -03:00
Anton Georgiev
b50dda8566
Merge pull request #5232 from oswaldoacauan/fix-4987 
Implement basic GroupChat messages
 2018-07-06 16:45:14 -04:00
James Jung
82229e1a8a Add 1px option for the pencil thickness 2018-07-06 14:47:50 -04:00
Tainan Felipe
3468447f81 add message in en.json 2018-07-06 14:47:06 -03:00
Maxim Khlobystov
f3e8f18a1c DIsabled chat push notifications by default. 2018-07-05 15:04:53 -04:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07:00
James Jung
09b604f954 tweak user menu to allow all text to be displayed 2018-07-04 14:41:05 -04:00
Anton Georgiev
576214f465 pull locales July 03, 2018 2018-07-03 19:17:54 +00:00
prlanzarin
2f5aa09fe5 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-06-27 17:34:33 +00:00
Anton Georgiev
a7d5f5d698 enable push chat notifications by default 2018-06-20 17:30:04 +00:00
Anton Georgiev
6cee7545b2 pulled html5 locales on June 15, 2018 2018-06-15 16:24:35 +00:00
Anton Georgiev
e26fe9ee40
Merge pull request #5685 from musickiper/chg-keyword-in-locale 
Change keyword in locale to use index number than word
 2018-06-14 10:05:11 -04:00
Maxim Khlobystov
98cf239bc7
Merge pull request #5602 from Tainan404/issue-5470 
Add messages for chat push notifications
 2018-06-13 16:23:21 -04:00
James Jung
495933f72e Change keyword to use index than word in locale 2018-06-13 15:35:07 -04:00
Tainan Felipe
46807039a4 add a small style for toast notification and add a content prop in toast 2018-06-12 14:21:31 -03:00
Anton Georgiev
942f0f1ae0 pulled html5 client locales June 12, 2018 2018-06-12 13:45:14 +00:00
Anton Georgiev
e4978983ba
Merge pull request #5422 from gutobenn/webrtc_stats 
WebRTC video statistics
 2018-06-08 14:35:16 -04:00
prlanzarin
1f50746c91 Revert pt_BR locales 2018-06-08 18:29:36 +00:00
Anton Georgiev
81a6b877b9
Merge pull request #5591 from KDSBrowne/edit/config/locale 
Improve html5 locale fallback selection
 2018-06-08 13:51:53 -04:00
prlanzarin
6f78cf057c Merge remote-tracking branch 'gutobenn/webrtc_stats' into webrtc_stats 2018-06-08 16:36:41 +00:00
Anton Georgiev
21dcb0eaeb html5 client title - same format as Flash client 2018-06-07 15:18:11 +00:00
Anton Georgiev
1b755bfb24 make window title configurable 2018-06-01 18:31:41 +00:00
Anton Georgiev
cd4b8bc6fc
Merge pull request #5573 from gutobenn/disable-screenshare-safari 
Display a toast for screensharing not supported by Safari
 2018-05-31 16:49:09 -04:00
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb 
Whiteboard and Cursor performance update
 2018-05-30 11:42:52 -04:00
Oswaldo Acauan
0eb4752818 Clean up 2018-05-30 11:19:19 -03:00
Tainan Felipe
61baba9a53 change last message time 2018-05-29 13:59:44 -03:00
Tainan Felipe
b180a7c350 add messages for chat notification and add link to chat 2018-05-29 13:43:11 -03:00
Anton Georgiev
dd719792a1 tweak an iOS string for Chrome 2018-05-29 15:01:36 +00:00
Oswaldo Acauan
ec07b4434d Change cursor and annotation to user streams and add optimistic updates 
WIP | Use streams to cursor and optimistic updates

WIP | Use streamss to whiteboard and optimistic updates

WIP | Remove fake delay

Add two way batching (server/client client/server)

Fix null userId exception and remove logs

wip

Add two way batching (server/client client/server) for cursor

Remove message frequency from draw-listeners component since we handle on message publication

Handle clear and undo messages
 2018-05-28 14:46:14 -03:00
Bobak Oftadeh
fe1dbb9fdf Warning modal now displays for iOS Chrome users 2018-05-25 09:24:01 -07:00
KDSBrowne
a750e2b2a0 edit config prop / startup-server-index variable names 2018-05-22 12:57:43 -07:00
Augusto Bennemann
68c18ff70f Display a toast for screensharing not supported by Safari 2018-05-22 14:17:35 -03:00
Augusto Bennemann
e8c2e1219c Fix measure name 2018-05-17 15:08:27 -03:00
Augusto Bennemann
5f142fa793 Fix merge conflicts 2018-05-17 14:49:35 -03:00
Tainan Felipe
f2c23b2e19 Fix intl translation 2018-05-17 11:46:25 -03:00
Tainan Felipe
b77e5494e0 add error message for when media server is offline and fix decrtion of intl message 2018-05-17 10:23:18 -03:00
Tainan Felipe
8b1eda92b6 Create intlMediaErrorsMessages and add messages of errors 2018-05-16 15:16:12 -03:00
Tainan Felipe
0c16518025 add specific messages to permissions errors 2018-05-16 14:12:57 -03:00
Anton Georgiev
13e6eb1a05
Merge pull request #5404 from Tainan404/implement-feedback-screen 
Implement feedback screen
 2018-05-14 10:19:53 -04:00
Anton Georgiev
e07d92862e pulled html5 locales May 11, 2018 2018-05-11 17:56:31 +00:00
Tainan Felipe
0707924a47 pass rating to meeting-ended and create feedback endpoint 2018-05-09 15:07:40 -03:00
Maxim Khlobystov
e5c6e098f4
Merge pull request #5451 from KDSBrowne/xx.new-accessKey-Modal 
Adds shortcut modal
 2018-05-08 13:30:47 -04:00
KDSBrowne
48c3adb8d9 clean up css / resolve lint issue 2018-05-03 08:44:59 -07:00
KDSBrowne
be4dc3f9ff add localized strings and edit deviceInfo.js 2018-05-02 19:20:38 -07:00
prlanzarin
42ed428461 Added config to enable kurento listen only bridge 2018-05-02 15:49:57 +00:00
KDSBrowne
2ed76aa244 add shortcut config to settings-production.json 2018-04-30 12:20:27 -07:00
KDSBrowne
819839cb4e add shotcuts keys to dev-config 2018-04-30 12:18:29 -07:00
Tainan Felipe
e0e36344a2 add send feedback label 2018-04-27 17:26:43 -03:00
KDSBrowne
1760a9ede6 add localised messages 2018-04-27 07:42:20 -07:00
Tainan Felipe
e92bea9312 Merge remote-tracking branch 'upstream/v2.0.x-release' into implement-feedback-screen 2018-04-27 11:35:33 -03:00
Anton Georgiev
35fae897fb
Merge pull request #5421 from antobinary/default-chrome-extension 
add-on to pr #5420 - default chrome extension
 2018-04-26 19:22:40 -04:00
Fred Dixon
46e9fecdad
Merge pull request #5420 from antobinary/default-chrome-extension 
Set default KEY and LINK for Chrome screenshare extension
 2018-04-26 19:13:52 -04:00
Anton Georgiev
8e6e14f902 add custom vs default key and link 2018-04-26 22:55:45 +00:00
Anton Georgiev
6aea0b6297 add custom vs default key and link 2018-04-26 22:52:46 +00:00
Augusto Bennemann
1985958191 WebRTC stats for each video 2018-04-26 22:19:15 +00:00
Anton Georgiev
25f3ced26c set default KEY and LINK for Chrome screenshare extension - the one from BBB open source 2018-04-26 16:48:25 +00:00
Anton Georgiev
cffe245c12
Revert "[HTML5 Client] Whiteboard Bulk Operations" 2018-04-25 20:41:19 -04:00
Tainan Felipe
9b47937383 reverse a key changed by mistake 2018-04-25 16:39:30 -03:00
Tainan Felipe
8c7ce5b2be change askForFeedbackonLogout for false 2018-04-25 16:35:49 -03:00
Tainan Felipe
d515a3cbe2 WIP feedback modal 2018-04-25 12:33:05 -03:00
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
Oleksandr Zhurbenko
7c61e4c4b9 Corrected a publisher for presentation-pods 2018-04-09 20:57:24 -07: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
Oswaldo Acauan
8b9cc79c3d Implement basic GroupChat messages. Closes #4987 2018-03-09 15:42:14 -03: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
Oswaldo Acauan
1dcfb9e3fa Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02:00
Maxim Khlobystov
03eced3236 Updated locales. 2017-10-20 15:17:52 +00:00
Maxim Khlobystov
f455ec97bd Updated the Khmer labels (doesn't break anymore). 2017-10-19 20:29:30 +00:00
gcampes
3bd709c629 Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor 2017-10-19 09:39:50 -02:00
Oswaldo Acauan
ebfed7795e Add notification when recording start/stop 2017-10-19 08:45:07 -02:00
gcampes
1dda597fca Toast notifications on audio and overall changes 2017-10-18 17:40:01 -02:00
Tainan Felipe
114689d284 add toast notification for ended breakout room 2017-10-18 17:24:26 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
gcampes
fafbba06cb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-12 13:58:39 -03:00
Anton Georgiev
4acecd358c Merge pull request #4505 from OZhurbenko/merge-2.0-1.1-api 
[HTML5] - Merged 2.0 and 1.1 api folders
 2017-10-12 13:45:46 -03:00
KDSBrowne
31b9a17e2c add new line 2017-10-12 09:17:20 -07:00