Commit Graph

481 Commits

Author SHA1 Message Date
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage
User manage button
2018-10-22 10:54:18 -04: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
Bobak Oftadeh
e5ae59908c Altered lock viewers label 2018-10-04 15:16:09 -07:00
Tainan Felipe
aa24a4b3b5 change intl label for have concistency with others options 2018-10-02 16:39:09 -03:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07: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
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
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