Commit Graph

23317 Commits

Author SHA1 Message Date
KDSBrowne
0fc148af55 add create breakout room option to user manage menu 2019-01-10 18:25:08 +00:00
Fred Dixon
b1cf09879c
Merge pull request #6527 from pedrobmarin/notes-extra-config
Extra config to be used with generic Etherpad servers
2019-01-10 08:22:36 -05:00
Pedro Beschorner Marin
824b6c83c9 Extra config to be used with generic Etherpad servers 2019-01-10 10:12:33 -02:00
Fred Dixon
b29800f438
Format message for applying local changes 2019-01-09 19:20:02 -05:00
Fred Dixon
eb19469c0b
Merge pull request #6526 from ffdixon/add-apply-config
Use /etc/bigbluebutton/bbb-conf/apply-config.sh for applying local co…
2019-01-09 19:15:47 -05:00
Fred Dixon
7cc318d68b Use /etc/bigbluebutton/bbb-conf/apply-config.sh for applying local config options 2019-01-09 18:13:21 -06:00
Anton Georgiev
0d155b8d96
Merge pull request #6525 from BobakOftadeh/toast-fix
Toast fix
2019-01-09 17:31:03 -05:00
Anton Georgiev
0733048d44
Merge pull request #6464 from KDSBrowne/2.2-fix-broken-locales
Fix broken locales on load
2019-01-09 17:16:52 -05:00
Bobak Oftadeh
5afba4cf67 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into tRecord 2019-01-09 14:14:47 -08:00
Bobak Oftadeh
471c242758 Fixed toasts from popping up on lock settings change 2019-01-09 14:11:39 -08:00
KDSBrowne
7e304e0866 add Bulgarian locale to addLocaleData 2019-01-09 21:43:54 +00:00
Anton Georgiev
3fbcb84bb2
Change label of hand tool in whiteboard tools
Closes #6297
2019-01-09 16:13:47 -05:00
Anton Georgiev
02e72e9a96
Update tooltip for multi-user mode
Closes #6333
2019-01-09 16:03:34 -05:00
Anton Georgiev
d76363f633
Merge pull request #6494 from BobakOftadeh/chat-spacing-fix
Added margin to chat-window
2019-01-09 15:55:33 -05:00
Bobak Oftadeh
381b28714e Removed console log 2019-01-09 12:50:24 -08:00
Anton Georgiev
2b33abb9d3
Merge pull request #6517 from KDSBrowne/2.2-data-save-mobile-presentation-bug
Reposition presentation on mobile when data saving is turned on
2019-01-09 15:39:17 -05:00
Anton Georgiev
af854755a4
Merge pull request #6486 from Tainan404/issue-6234
Fix user rejoining to meeting when is ejected
2019-01-09 15:30:36 -05:00
Anton Georgiev
0466189624
Merge pull request #6491 from Tainan404/issue-6335
Add custom font feature and define desktop version to 14px
2019-01-09 15:27:29 -05:00
Anton Georgiev
bd1150550f
Merge pull request #6516 from jfsiebel/save-chat-public-messages
Add Welcome Message back to save/copy chat
2019-01-09 15:20:17 -05:00
Anton Georgiev
c2a9ff67ae
Merge pull request #6389 from BobakOftadeh/record-indicator
Record indicator
2019-01-09 14:42:58 -05:00
Bobak Oftadeh
6317647b23 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into tRecord 2019-01-09 11:42:06 -08:00
Anton Georgiev
f7c509aeea
Merge pull request #6510 from pedrobmarin/notes-2.2.1
Shared notes adapted with the new panel manager
2019-01-09 14:12:04 -05:00
Anton Georgiev
ec2349e851
Merge pull request #6341 from BobakOftadeh/fix-modal-structure
Added option to use modal component without header border
2019-01-09 13:53:50 -05:00
Pedro Beschorner Marin
a246eaa815 Calling for current user only once 2019-01-09 18:09:05 +00:00
Pedro Beschorner Marin
299861d383 Injecting title directly in note 2019-01-09 18:06:23 +00:00
Pedro Beschorner Marin
dbad55e74e Refactored note styles 2019-01-09 18:03:46 +00:00
Anton Georgiev
e47fd6760b
Merge pull request #6305 from KDSBrowne/2.2-close-btn-bug
Fix close button remaining visible after menu closes
2019-01-09 11:25:19 -05:00
Bobak Oftadeh
5d45cb8214 Removed margin when user panel is closed 2019-01-09 07:59:16 -08:00
João Francisco Siebel
a0fac637e8 remove moderator message in save/copy 2019-01-09 09:41:52 -02:00
João Francisco Siebel
fa70c04375 add welcome message and moderator only message to save/copy chat feature and fix a race condition bug when clearing the chat. close #6314 2019-01-09 09:36:14 -02:00
Bobak Oftadeh
dd89bed5e8 Added checks to meetingId 2019-01-08 14:21:47 -08:00
Anton Georgiev
fee2463851
Merge pull request #6513 from antobinary/401-work
BBB-web: add allowRequestsWithoutSession=false to handle missing cookie
2019-01-08 16:52:35 -05:00
Anton Georgiev
47dffd5f3a add parenthesis to improve readability 2019-01-08 21:47:08 +00:00
Anton Georgiev
c9505ff56a set allowRequestsWithoutSession=false by default 2019-01-08 19:56:50 +00:00
Anton Georgiev
79ecdf56e8 BBB-web: add allowRequestsWithoutSession=false to handle stripped JSESSIONID 2019-01-08 19:54:08 +00:00
KDSBrowne
e54823d174 fix presentation positioning when data saving is enabled 2019-01-08 14:46:24 +00:00
Pedro Beschorner Marin
a8517638c0 Shared notes title and extra config 2019-01-08 13:26:33 +00:00
Pedro Beschorner Marin
e413d0a5c3 Included shared notes feature 2019-01-08 13:24:34 +00:00
Anton Georgiev
bb6fbdfe2d
Merge pull request #6467 from vitormateusalmeida/fix-issue-6014
Fix padding in the webcam dropdown menu
2019-01-07 11:14:03 -05:00
Anton Georgiev
e28d04827f
Merge pull request #6466 from vitormateusalmeida/fix-style-border-presentation-toolbar
Fix style border presentation toolbar
2019-01-07 10:50:50 -05:00
Bobak Oftadeh
b41761350d Improved checks for record time 2019-01-04 21:32:59 +00:00
Bobak Oftadeh
6ed8b09d51 Merge branch 'fix-modal-structure' of https://github.com/BobakOftadeh/bigbluebutton into testRecord 2019-01-04 18:43:01 +00:00
Bobak Oftadeh
697b8da803 Moved margin to presentation 2019-01-04 18:29:41 +00:00
Anton Georgiev
114f150768
Merge pull request #6497 from jfsiebel/ajust-more-messages-below-button
Adjust "more messages below" button
2019-01-04 10:28:59 -05:00
João Francisco Siebel
2a98c3b0f0 Ajust more messages below button style 2019-01-04 11:43:19 -02:00
Bobak Oftadeh
8ff95dbaac Added margin to chat-window 2019-01-03 23:25:21 +00:00
Bobak Oftadeh
17ccd17e54 Fixed focus on record button 2019-01-03 21:39:52 +00:00
Bobak Oftadeh
09147faaac Fixed conflicts after merge 2019-01-03 20:50:43 +00:00
Bobak Oftadeh
e4d97538a3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testRecord 2019-01-03 20:28:27 +00:00
Fred Dixon
7a07f30c43
Merge pull request #6493 from bigbluebutton/ffdixon-patch-3
Update check for ffmpeg 4.1
2019-01-03 15:08:10 -04:00