Commit Graph

23410 Commits

Author SHA1 Message Date
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
Tainan Felipe
cd3f47abda Remove unnecessary consoles 2019-01-08 16:58:46 -02:00
Tainan Felipe
a5f15b2e1c Add 400 bad request status to error screen 2019-01-08 16:38:26 -02: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
Tainan Felipe
35ace3e32a Add error description on error screen 2019-01-07 14:26:23 -02: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
Fred Dixon
b8b0f24e88
Update check for ffmpeg 4.1 2019-01-03 15:07:46 -04:00
Bobak Oftadeh
eb5c061e8f Implemented recording timer 2019-01-03 18:43:17 +00:00
Anton Georgiev
66512f9e75
Merge pull request #6411 from zhu/fix-file-uploader-2
Fix file uploader mobile
2019-01-03 13:19:27 -05:00
prlanzarin
04ec52111a Reorganized the gDP code a bit to also support Edge 2019-01-03 18:17:13 +00:00
Tainan Felipe
38a91e4559 rename settings variables 2019-01-03 15:55:10 -02:00
Tainan Felipe
c1aacc8823 Add custom font feature and define desktop version to 14px 2019-01-03 15:35:52 -02:00
prlanzarin
c2646b78a2 Add support for getDisplayMedia on Chrome 2019-01-03 17:08:41 +00:00
Anton Georgiev
60f2989a68
Merge pull request #6462 from vitormateusalmeida/fix-issue-6415
Fix skip to slide handler
2019-01-03 11:31:34 -05:00
Anton Georgiev
f95c72418b
Merge pull request #6480 from KDSBrowne/2.2-ui-improvments-01
UI improvements and bug fixes
2019-01-03 11:13:43 -05:00
KDSBrowne
db64de8258 remove chat input auto-focus on mobile only 2019-01-03 15:41:20 +00:00
Anton Georgiev
3018093b27
Merge pull request #6458 from MaximKhlobystov/improve-webcam-picker
Improve webcam picker
2019-01-02 15:50:58 -05:00
Anton Georgiev
3d6da277d3
Merge pull request #6484 from prlanzarin/fix-ss-error-exit
Fixed incorrect error toast on screenshare presenter exit
2019-01-02 13:58:30 -05:00
Anton Georgiev
30b6c4ea35
Merge pull request #6460 from vitormateusalmeida/fix-issue-6449
Fix proptype warnings
2019-01-02 13:56:23 -05:00