Commit Graph

3859 Commits

Author SHA1 Message Date
Anton Georgiev
e56a3d5364
Merge pull request #7192 from KDSBrowne/2.2-High-contrast-outline
Adds outline to elements for high contrast themes (windows)
2019-05-07 11:02:01 -04:00
Tainan Felipe
162f796c01 Fix text annotation 2019-05-06 17:32:45 -03:00
Anton Georgiev
128e0b9cec
Merge branch 'master' into 2.2-High-contrast-outline 2019-05-06 15:55:59 -04:00
Anton Georgiev
299a071349
Merge pull request #7306 from diegobenetti/base-rerender-tests
All subscriptions moved from Base to new component
2019-05-03 15:55:20 -04:00
Anton Georgiev
47b90cf0e3
Merge branch 'master' into set-lock-settings-on-meeting-create 2019-05-03 10:46:42 -04:00
Anton Georgiev
3d4fd35d14
Merge pull request #7328 from capilkey/investigate-video-preview
Refactor video preview modal
2019-05-02 13:47:42 -04:00
Anton Georgiev
dd949f6ee5
Merge pull request #7326 from Tainan404/issue-7292
Fix create breakout room missing some users.
2019-05-02 11:45:22 -04:00
Pedro Beschorner Marin
a0590c12ea Merge remote-tracking branch 'origin/master' into set-lock-settings-on-meeting-create 2019-05-02 11:05:34 -03:00
Anton Georgiev
22f90b37fc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into test-7293 2019-05-01 20:14:53 +00:00
Anton Georgiev
83ecc5575f trim whitespace at end of youtube url 2019-05-01 20:09:49 +00:00
Anton Georgiev
f8e790abfc Merge branch 'issue-7282' of github.com:Tainan404/bigbluebutton into test-7293 2019-05-01 19:33:22 +00:00
Chad Pilkey
d4d72f8376
Merge pull request #7329 from KDSBrowne/2.2-small-fixes
Fix typo in regular expression detecting iOS version
2019-05-01 14:25:38 -04:00
Chad Pilkey
7095bae71d minor video preview tweaks 2019-05-01 10:36:25 -07:00
Richard Alam
47ea1bed67
Merge pull request #7270 from pedrobmarin/unmute-users
Unmute users
2019-05-01 10:52:12 -04:00
Chad Pilkey
4f59580f6b video preview spacing and localized strings 2019-04-30 15:29:30 -07:00
KDSBrowne
40619f1f4c add missing condition to render line separator 2019-04-30 21:41:15 +00:00
KDSBrowne
450b6156a5 remove extra black space in regular expression 2019-04-30 21:35:44 +00:00
Diego Benetti
dfdc98543e Merge remote-tracking branch upstream/master into base-rerender-tests 2019-04-30 17:01:01 -03:00
Chad Pilkey
2aeed72c8d refactor video preview media selection 2019-04-30 12:54:56 -07:00
Tainan Felipe
10c4e8ee88 Fix create breakout room missing some users 2019-04-30 16:24:04 -03:00
Anton Georgiev
202af13c61
Merge pull request #7315 from BobakOftadeh/update-record-label
Update record button label
2019-04-30 09:42:01 -04:00
Anton Georgiev
7a389ade65
Merge pull request #7303 from capilkey/legacy-browser-support-2
Legacy browser support take 2
2019-04-29 15:54:42 -04:00
Bobak Oftadeh
7b8b459c05 update record button label 2019-04-26 20:56:12 +00:00
Anton Georgiev
63b8d04b04 remove capitalization of error message 2019-04-26 17:59:04 +00:00
Anton Georgiev
5681d44ca4 add error code missing titles 2019-04-26 17:52:18 +00:00
Anton Georgiev
3ce8006209 add 403 text to error screen 2019-04-26 17:14:37 +00:00
Diego Benetti
0ae817a951 Merge remote-tracking branch 'upstream/master' into base-rerender-tests 2019-04-25 14:57:59 -03:00
Diego Benetti
d673cab8ba Removes comented variables 2019-04-25 10:22:15 -03:00
Diego Benetti
0b29e1d4ae Unused variables removed 2019-04-25 10:04:44 -03:00
Anton Georgiev
785c1b1d0b
Merge pull request #7016 from KDSBrowne/2.2-Edge-audio-settings-modal-overflow
Fix Edge audio settings modal overflow / toast issues
2019-04-24 18:23:16 -04:00
Chad Pilkey
098c8ce255 add alternate legacy browser content 2019-04-24 15:12:27 -07:00
Diego Benetti
2e71ed3c40 Base subscriptions moved to new component 2019-04-24 17:48:16 -03:00
Anton Georgiev
c268bed1ab
Revert "Add alternate legacy browser content" 2019-04-24 16:22:19 -04:00
Anton Georgiev
e516472899
Merge pull request #7295 from capilkey/legacy-browser-support
Add alternate legacy browser content
2019-04-24 15:14:15 -04:00
Anton Georgiev
e24cfc1618
Merge pull request #7298 from Tainan404/issue-7026
Fix user count in breakout panel using users collection
2019-04-24 13:48:15 -04:00
Tainan Felipe
25047f57a9 Remove stop video button of video modal 2019-04-24 14:19:35 -03:00
Tainan Felipe
94e9a2518f Fix user count using users collection 2019-04-24 09:50:45 -03:00
Anton Georgiev
2b44925fc2
Merge pull request #7290 from antobinary/logcodes
Added logCode in video_provider
2019-04-24 08:37:03 -04: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
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
Pedro Beschorner Marin
324681d5b2 Renamed unmuteUsers to allowModsToUnmuteUsers 2019-04-23 12:30:55 -03:00
KDSBrowne
7fd1b1899c adjust switch presenter label for current / other users 2019-04-22 21:23:16 +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