Commit Graph

389 Commits

Author SHA1 Message Date
Maxim Khlobystov
90f38561c3 Add Webcam Settings to choose a camera 2018-11-06 18:10:56 -05:00
bobakoftadeh
856459e989 Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C 2018-11-06 13:47:38 -08:00
Bobak Oftadeh
edc941da9e Implementation of lock-view modal menu 2018-11-06 13:39:07 -08:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
Ghazi Triki
ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master
# Conflicts:
#	bigbluebutton-html5/imports/ui/services/audio-manager/index.js
2018-11-02 21:02:02 +01:00
Bobak Oftadeh
a97a1ece37 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-11-02 09:17:07 -07:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2018-11-01 14:00:54 +01:00
KDSBrowne
76e3759039 add formated message 2018-10-30 15:57:10 +00:00
Bobak Oftadeh
6bde6b06f5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-29 14:39:25 -07:00
Tainan Felipe
07d89a0132 Add intl to breakout room name 2018-10-29 16:29:45 -03:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
KDSBrowne
935eb1289d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-10-25 18:39:26 +00:00
Anton Georgiev
c80e379de6
Merge pull request #6104 from Tainan404/zoom-implementation
Add fit-to-width  for html5
2018-10-25 14:31:29 -04:00
KDSBrowne
95bb36df82 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-25 17:25:26 +00:00
Anton Georgiev
1c720be973 pulled html5 locales oct 24, 2018 2018-10-24 20:36:48 +00:00
Anton Georgiev
e888f5dc14 removed dummy button examples visible without presentation 2018-10-24 14:01:07 +00:00
Tainan Felipe
2b5c9a32b4 Add intl 2018-10-23 17:34:09 -03:00
Tainan Felipe
4d7861f0be Add intl message 2018-10-23 16:29:19 -03:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -03:00
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage
User manage button
2018-10-22 10:54:18 -04:00
KDSBrowne
45eeb1d400 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-16 15:19:24 +00:00
KDSBrowne
6c377b97bf add formatted strings 2018-10-15 19:05:50 +00:00
Bobak Oftadeh
21b84a5303 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-12 09:17:19 -07:00
Bobak Oftadeh
52aa4fd3c1 Mute meeting functionality implemented 2018-10-11 14:27:56 -07:00
Bobak Oftadeh
e5ae59908c Altered lock viewers label 2018-10-04 15:16:09 -07:00
KDSBrowne
28d46b7ca8 change formatted message id's / replace reduce with map 2018-10-03 03:24:34 +00:00
Tainan Felipe
aa24a4b3b5 change intl label for have concistency with others options 2018-10-02 16:39:09 -03:00
Tainan Felipe
ac09d4e69a Add user list item and panel 2018-10-02 10:48:12 -03:00
Tainan Felipe
380b8b77e5 add intl messages 2018-09-28 15:09:15 -03:00
Tainan Felipe
adbf0f0098 Add breakout room button 2018-09-25 14:03:09 -03:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56 clean up code / add formatted messages / fix bugs 2018-09-23 22:57:03 +00:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Anton Georgiev
7e4f4d9eaa html5-locales-2018-09-10 2018-09-10 18:49:54 +00:00
Tainan Felipe
cce66b352e Add hand icon 2018-09-05 16:28:10 -03:00
Tainan Felipe
7c082c608a Add zoom tooll and styles 2018-08-28 14:14:01 -03:00
Maxim Khlobystov
82a69fb902 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-28 12:49:06 -04:00
Maxim Khlobystov
242200ac91 Replaced Ice with ICE in strings. 2018-08-22 14:51:25 -04:00
Maxim Khlobystov
d67aba6c8a Listening to ice connection failures when screensharing. 2018-08-22 14:10:08 -04:00
Anton Georgiev
6459b84c83 Pulled HTML5 locales aug 15; Fix for locale switch edge case (#5984) 2018-08-15 13:58:23 -03:00
Anton Georgiev
1e8a4cf1e7
Merge pull request #5973 from KDSBrowne/5963-notifications-rename
Rename 'push notifications' to 'alerts'
2018-08-14 13:13:31 -04:00
Anton Georgiev
f83374491b
Merge pull request #5971 from MaximKhlobystov/ice-connection-state-errors
Better handling of video ice connection state errors.
2018-08-14 13:12:12 -04:00
Maxim Khlobystov
c6e42f4029 Better error message. 2018-08-13 16:30:56 -04:00
KDSBrowne
d7b6d027a2 change name of formatted string id's 2018-08-13 19:16:22 +00:00
Anton Georgiev
8092fa1304
Merge pull request #5968 from BobakOftadeh/add-help-button
Added help button to drop-down list
2018-08-13 15:02:26 -04:00
Maxim Khlobystov
cf1de23629 Properly handling ice connection state errors. 2018-08-12 18:39:39 -04:00
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
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
Anton Georgiev
19c36acd2c pulled locales for HTML5 client 2018-07-31 2018-07-31 20:30:13 +00:00
Anton Georgiev
e6f834e80a pulled html5 locales 2018-07-25 2018-07-25 20:39:44 +00: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
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
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
Tainan Felipe
e424970018 Comply audio lock setting 2018-07-09 16:23:16 -03:00
Tainan Felipe
3468447f81 add message in en.json 2018-07-06 14:47:06 -03: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
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
prlanzarin
1f50746c91 Revert pt_BR locales 2018-06-08 18:29:36 +00:00
prlanzarin
6f78cf057c Merge remote-tracking branch 'gutobenn/webrtc_stats' into webrtc_stats 2018-06-08 16:36: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
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
Bobak Oftadeh
fe1dbb9fdf Warning modal now displays for iOS Chrome users 2018-05-25 09:24:01 -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
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
Augusto Bennemann
1985958191 WebRTC stats for each video 2018-04-26 22:19:15 +00:00
Tainan Felipe
9b47937383 reverse a key changed by mistake 2018-04-25 16:39:30 -03:00
Tainan Felipe
d515a3cbe2 WIP feedback modal 2018-04-25 12:33:05 -03: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
Oswaldo Acauan
5918fc4483 Impl new webcam design 2018-04-09 11:39:27 -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
João Francisco Siebel
fe0f6a67a3 Reverse data saving logic 2018-03-26 15:26:52 -03: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
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
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
Tainan Felipe Pauli de Almeida
2c5d894d05 add webcam controls in videoMenu button 2018-03-06 10:52:16 -03: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
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
Tainan Felipe Pauli de Almeida
473fdea28b revert changes in en.json 2018-02-14 09:39:15 -02: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
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