Commit Graph

24642 Commits

Author SHA1 Message Date
Anton Georgiev
2b44925fc2
Merge pull request #7290 from antobinary/logcodes
Added logCode in video_provider
2019-04-24 08:37:03 -04:00
Tainan Felipe
285d27b16f Fix error sreen being shown when meeting is ended 2019-04-24 09:20:38 -03:00
Chad Pilkey
99fa3d6bb5 add alternate legacy browser content 2019-04-23 16:10:55 -07:00
Tainan Felipe
976b232b48 merge start/stop buttons and apply logic for just stop when video is sharing 2019-04-23 16:59:10 -03:00
Anton Georgiev
0bd7980f0c adjust formatting in video-provider 2019-04-23 19:57:31 +00:00
Anton Georgiev
ff4e407155 added logCode in video_provider 2019-04-23 18:26:28 +00:00
Anton Georgiev
d97ec2ba91
Merge pull request #7283 from antobinary/meteor-181
Update Meteor from 1.8.0.2 to 1.8.1
2019-04-23 13:16:02 -04:00
Anton Georgiev
39b8a38b3a
Merge pull request #7287 from KDSBrowne/2.2-change-take-presenter-label
Adjust labels displayed for switching presenter
2019-04-23 11:58:20 -04:00
KDSBrowne
e541670867 change formatted label id 2019-04-23 15:45:08 +00:00
Anton Georgiev
84ca672464
Merge pull request #7288 from KDSBrowne/2.2-fix-poll-waiting-msg
Hide poll waiting message on publish
2019-04-23 11:35:25 -04:00
Anton Georgiev
1792af1921
Temporarily disable acceptance tests on html5 2019-04-23 11:32:27 -04:00
Pedro Beschorner Marin
324681d5b2 Renamed unmuteUsers to allowModsToUnmuteUsers 2019-04-23 12:30:55 -03:00
Richard Alam
1a39ecdc64 Merge branch 'master' into add-redis-password-on-master 2019-04-23 07:36:55 -07:00
Tainan Felipe
8cffe046ef Remove server exception when user with expired session tries to join 2019-04-23 11:22:11 -03:00
Anton Georgiev
8faf5d809c manually update "tar" npm package to address node-sass > node-gyp > tar vulnerability 2019-04-23 13:41:29 +00:00
KDSBrowne
7fd1b1899c adjust switch presenter label for current / other users 2019-04-22 21:23:16 +00:00
Anton Georgiev
debe4b4373 update Meteor to 1.8.1 2019-04-22 21:20:00 +00:00
Anton Georgiev
2f6c73c215
Merge pull request #7260 from KDSBrowne/2.2-play-audio-screenshare-end
Add audible feedback when screen share ends
2019-04-22 16:47:33 -04:00
KDSBrowne
524c354bc6 show correct waiting message on poll publish 2019-04-22 18:27:59 +00:00
Anton Georgiev
ae0d9790c3
Merge pull request #7273 from BobakOftadeh/update-hyperlink
Update hyperlink color
2019-04-22 11:44:11 -04:00
Anton Georgiev
eaddfc8107
Merge pull request #7280 from Tainan404/issue-7136
Change dial user icon to phone on in user list
2019-04-22 09:09:02 -04:00
Tainan Felipe
6014785ed0 Change dial user icon to phone on in user list 2019-04-22 09:25:24 -03:00
Fred Dixon
35a2342637
Merge pull request #7271 from kepstin/clean-kurento-logs
Clean up old logs from kurento-media-server in cron job
2019-04-20 10:53:20 -04:00
Anton Georgiev
c368254587
Merge pull request #7250 from KDSBrowne/2.2-suggest-ios-update
Add toast indicating to upgrade iOS version (12.2+)
2019-04-18 16:50:26 -04:00
bobakoftadeh
282dc259c8 update hyperlink style condition 2019-04-18 20:35:04 +00:00
Anton Georgiev
74faa8e90c
Merge pull request #7278 from antobinary/tooltips
Add checks before operating with tooltips
2019-04-18 15:12:31 -04:00
Anton Georgiev
4fb8056b87
Merge pull request #7118 from Tainan404/fix-presentation-toolbar-width
Fix toolbar don't reszing when breakout close.
2019-04-18 15:10:57 -04:00
Anton Georgiev
2346f5de57 revert removing tooltip props 2019-04-18 19:00:26 +00:00
Anton Georgiev
d3f7a89578 added checks before trying to hide tooltips 2019-04-18 18:15:40 +00:00
KDSBrowne
e7bc6a85d6 add ios version check / toast message to cam btn 2019-04-18 17:14:34 +00:00
Anton Georgiev
8f5a6624cd
Merge pull request #7275 from antobinary/minor-tweaks
Minor tweaks - logger param and default dial in num
2019-04-18 10:42:41 -04:00
KDSBrowne
0e724fb890 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-High-contrast-outline 2019-04-18 14:29:17 +00:00
Anton Georgiev
ccadbfbf9a
Merge pull request #7274 from antobinary/locales-3
Reduce webcam logging lines, improve info quality
2019-04-17 16:45:11 -04:00
Anton Georgiev
4e902ff22e
Add another default dial in number to be ignored 2019-04-17 16:36:15 -04:00
Anton Georgiev
cb263fd932
Update component.jsx 2019-04-17 16:24:14 -04:00
bobakoftadeh
ff8d826cf3 update implementation 2019-04-17 20:08:17 +00:00
Anton Georgiev
12eefb7785 pass additional properties in logline 2019-04-17 19:40:08 +00:00
Anton Georgiev
797d8056e3 reduce webcam logging lines, improve info quality 2019-04-17 17:38:49 +00:00
bobakoftadeh
3f8af43a9d update hyperlink color 2019-04-17 17:38:45 +00:00
Anton Georgiev
5ecf9e5536
Merge pull request #7258 from KDSBrowne/2.2-add-poll-bar-color
Improve polling live result design / sorting
2019-04-17 13:13:23 -04:00
KDSBrowne
c05668a519 add waiting / done messages 2019-04-17 16:36:04 +00:00
Calvin Walton
36ff4de20e Clean up old logs from kurento-media-server in cron job 2019-04-17 10:37:05 -04:00
Pedro Beschorner Marin
50afb24653 Changed from unmute only viewers to unmute anyone 2019-04-17 10:55:01 -03:00
Anton Georgiev
c727c12507
Merge pull request #7267 from antobinary/locales-3
Pulled html5 locales April 16, 2019
2019-04-16 17:02:42 -04:00
Anton Georgiev
e188124348 pulled html5 locales April 16, 2019 2019-04-16 21:00:39 +00:00
Anton Georgiev
e3df4857d0
Merge pull request #7266 from bigbluebutton/reword-lock-msg
Reword lock setting msg for webcams
2019-04-16 14:47:53 -04:00
Anton Georgiev
a35d2021a1
Reword lock setting msg for webcams 2019-04-16 14:44:33 -04:00
Anton Georgiev
6d76e61e58
Merge pull request #7230 from BobakOftadeh/dial-option
Implement option for audio dial in audio modal
2019-04-16 13:43:22 -04:00
bobakoftadeh
9d11c0ad1f update invalidDialNumbers 2019-04-16 17:34:12 +00:00
bobakoftadeh
fcf7bc0a73 update audio-dial modal format 2019-04-16 17:08:01 +00:00