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

668 Commits

Author SHA1 Message Date
Anton Georgiev
57dc55b559 drop metadata configs; use userdata configs for autoSwap 2018-10-23 20:44:17 +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
Bobak Oftadeh
0cde376e67 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-22 10:06:18 -07:00
Anton Georgiev
591adc89e6
Merge pull request #6168 from jfsiebel/configurable-whiteboard-tools-list 
Configurable whiteboard tools
 2018-10-22 13:00:14 -04:00
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage 
User manage button
 2018-10-22 10:54:18 -04:00
João Francisco Siebel
f936e319de implement configurable whiteboard tools. close #5826 2018-10-19 14:05:56 -03:00
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
KDSBrowne
bae71203a5 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router 2018-10-17 20:34:05 +00:00
Tainan Felipe
bd01d7e4aa to squash 2018-10-16 14:55:20 -03:00
KDSBrowne
51e14946db fix live results not being reset 2018-10-16 17:22:12 +00:00
Anton Georgiev
8ebb71322b remove chat url from settings.yml 2018-10-16 15:58:41 +00:00
KDSBrowne
cb6e988134 add missing items from setting.yml after merge 2018-10-16 15:25:45 +00:00
KDSBrowne
45eeb1d400 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-16 15:19:24 +00:00
Bobak Oftadeh
0a3568cc74 Added mute meeting settings to yml file 2018-10-15 15:24:56 -07:00
KDSBrowne
6c377b97bf add formatted strings 2018-10-15 19:05:50 +00:00
KDSBrowne
14066b4280 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into post-router-style-fix 2018-10-15 14:54:15 +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
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
Maxim Khlobystov
97ebd02595
Merge pull request #6090 from jfsiebel/ini-configuration-file 
Remove settings and use yml file
 2018-10-11 13:03:48 -04:00
KDSBrowne
5654f08b43 clean up code 2018-10-10 18:25:35 +00:00
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00: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
KDSBrowne
c2e785b8c4 add poll max custom fields to config 2018-10-02 23:59:45 +00:00
Tainan Felipe
aa24a4b3b5 change intl label for have concistency with others options 2018-10-02 16:39:09 -03:00
Anton Georgiev
0c8eafc2c8 Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router 2018-10-02 14:47:25 +00: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
cf23293e10 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-09-25 12:44:38 +00:00
João Francisco Siebel
68aa29de68 rename file and add users-settings subscription 2018-09-25 09:37:45 -03:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings 
Custom user settings
 2018-09-25 08:29:48 -04:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
João Francisco Siebel
81e6e815d9 remove .ini file 2018-09-24 14:51:07 -03:00
João Francisco Siebel
296ef8fb88 Merge remote-tracking branch 'upstream/master' into HEAD 2018-09-24 14:46:17 -03: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
João Francisco Siebel
a445e0d2e5 make whiteboard tools list configurable 2018-09-21 16:42:39 -03:00
João Francisco Siebel
3c3a5ae59a implement multiUserPenOnly configuration 2018-09-21 13:42:00 -03:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
Tainan Felipe
3bfce89396 change the setting prod 2018-09-19 12:00:49 -03:00
João Francisco Siebel
09d0a62076 Remove settings files 2018-09-19 11:00:36 -03:00
João Francisco Siebel
6f8a3fd9cd read settings from ini file 2018-09-18 13:12:16 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release 
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
 2018-09-10 15:09:55 -04:00
Anton Georgiev
7e4f4d9eaa html5-locales-2018-09-10 2018-09-10 18:49:54 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Tainan Felipe
cce66b352e Add hand icon 2018-09-05 16:28:10 -03:00
Tainan Felipe
742229e88f Fix lint errors 2018-08-28 16:30:37 -03:00
Tainan Felipe
7c082c608a Add zoom tooll and styles 2018-08-28 14:14:01 -03:00
Tainan Felipe
25834dd4f8 zoom calc based in flash 2018-08-28 14:13:18 -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
Anton Georgiev
aed8577606 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into log-config-restructure 2018-08-22 18:30:02 +00:00
Anton Georgiev
6da18cd52d made clientLog structure easier to edit via script 2018-08-22 18:25:43 +00:00
Maxim Khlobystov
d67aba6c8a Listening to ice connection failures when screensharing. 2018-08-22 14:10:08 -04:00
Anton Georgiev
778e22d42f
Merge pull request #5991 from prlanzarin/sfu-cam-target-bitrate 
[HTML5] Added target bitrate option for WebRTC screenshare and webcam
 2018-08-21 10:02:56 -04:00
Anton Georgiev
666a59232e
Merge pull request #5993 from KDSBrowne/5980-chat-input-font-size 
Adjust chat input font size
 2018-08-21 09:52:56 -04:00
prlanzarin
9f9e248de7 Made webcam constraints configurable, removed fps limitations and resolution floor 
Also fixed handlePlayStop and stopWebRTCPeer exceptions
 2018-08-20 18:08:10 +00:00
Anton Georgiev
6459b84c83 Pulled HTML5 locales aug 15; Fix for locale switch edge case (#5984) 2018-08-15 13:58:23 -03:00
KDSBrowne
29bcbea923 rename to alerts / missing from #5973 2018-08-15 02:35:58 +00: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
Anton Georgiev
ca873cd6da
Merge pull request #5839 from KDSBrowne/5782-move-set-status 
Move set status menu to user item dropdown
 2018-08-13 15:00:04 -04:00
Maxim Khlobystov
cf1de23629 Properly handling ice connection state errors. 2018-08-12 18:39:39 -04:00
Bobak Oftadeh
4d0b8418db Added help icon 2018-08-10 08:29:52 -07:00
Bobak Oftadeh
9feb47a1ca Option to disable the help button added 2018-08-09 15:40:52 -07: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
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