BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,728 Commits 13 Branches 260 Tags 1.1 GiB
65012daa7a
Commit Graph

24728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calvin Walton
548ac7edef Recording: Strip control characters in whiteboard text events 
Sometimes when text is pasted into the whiteboard text tool from
external apps, it'll include control characters that mess up later
recording processing scripts.

Run the same cleanup as already used for chat messages on the whiteboard
text as well.

The cleanup has been adjusted to allow newline and tab characters. They
won't really cause issues in chat, and newlines (at a minimum) are
required for the whiteboard.

This is a workaround for #7356
 2019-05-07 11:48:20 -04:00
Anton Georgiev
0803f814c1
Merge pull request #7159 from diegobenetti/issue6613-cursor-not-showing-multi-user-whiteboard 
Cursor not showing multi user whiteboard
 2019-05-07 11:34:51 -04:00
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
Anton Georgiev
be5ccc2abd
Merge pull request #7354 from Tainan404/attempt-fix-tex-annotation 
Fix text annotation
 2019-05-07 10:57:10 -04:00
Fred Dixon
4767087728
Merge pull request #7355 from ffdixon/update-bbb-conf-4 
Hide tomcat7 warnings if tomcat7 not installed
 2019-05-06 18:24:11 -04:00
Fred Dixon
c1b1712145 Hide tomcat7 warning if tomcat7 not installed 2019-05-06 17:23:23 -05: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
5d90789a55
Merge pull request #7348 from antobinary/test-7306 
Pulled locales html5 May 3, 2019
 2019-05-03 17:05:21 -04:00
Anton Georgiev
ffab7a7d8a
Merge branch 'master' into test-7306 2019-05-03 17:04:45 -04:00
Anton Georgiev
4ecedc01c4
Merge pull request #7341 from riadvice/html5-arabic 
Full Arabic translation for the HTML5 client
 2019-05-03 17:04:05 -04:00
Anton Georgiev
7da02bdcdd add missing package-lock.json for useragent 2019-05-03 20:22:22 +00:00
Anton Georgiev
71d9123f3c pulled locales html5 May 3, 2019 2019-05-03 20:21:37 +00: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
74e3892e55 Merge branch 'base-rerender-tests' of github.com:diegobenetti/bigbluebutton into test-7306 2019-05-03 17:47:10 +00:00
Chad Pilkey
6da308adeb
Merge pull request #7344 from ritzalam/allow-duplicate-ext-userid 
- put allow duplicate external userids behind a flag so we can enabl…
 2019-05-03 13:25:51 -04:00
Anton Georgiev
214f447bd8
Merge pull request #7335 from capilkey/legacy-browser-settings 
Move legacy browser versions into settings.yml
 2019-05-03 13:23:26 -04:00
Richard Alam
52964f9e6b - put allow duplicate external userids behind a flag so we can enable/disable 2019-05-03 09:15:14 -07:00
Anton Georgiev
66ed4014e0
Merge pull request #7337 from pedrobmarin/set-lock-settings-on-meeting-create 
Allow passing of breakout and lock settings on meeting create
 2019-05-03 10:56:11 -04:00
Anton Georgiev
47b90cf0e3
Merge branch 'master' into set-lock-settings-on-meeting-create 2019-05-03 10:46:42 -04:00
Ghazi Triki
1529bb92cd Full Arabic translation for the HTML5 client. 2019-05-03 12:17:31 +01:00
Chad Pilkey
7ff310f41f
Update restart command for tomcat7 2019-05-02 16:23:49 -04:00
Chad Pilkey
d3d967f607
Update the API demo README 2019-05-02 16:22:28 -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
KDSBrowne
f18f4dbdf3 fix fullscreenRef prop error 2019-05-02 17:35:13 +00:00
Chad Pilkey
47c8ff32a2 reuse userAgent constant 2019-05-02 09:47:40 -07: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
Chad Pilkey
0cd79b7c05 move legacy browser versions into settings.yml 2019-05-01 17:33:03 -07:00
Anton Georgiev
7da2164f50
Merge pull request #7333 from antobinary/test-7293 
Adjustment to #7293 youtube video share
 2019-05-01 16:17:58 -04: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
Richard Alam
e3a68f9a97 - cleanup 2019-04-30 13:10:51 -07: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
Richard Alam
bf7898225b - minor cleanup 2019-04-30 12:30:59 -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
Richard Alam
bf0189230e - add redis password to akka-transcode 2019-04-29 13:54:48 -07:00
Richard Alam
56ffb3d708 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into add-redis-password-on-master 2019-04-29 13:00:59 -07:00
Richard Alam
f2165c1783 - cleanup 2019-04-29 12:59:45 -07: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
Anton Georgiev
f225bf4f45
Merge pull request #7313 from antobinary/logcodes-2 
Mitigate flickering error screen on user eject/meeting ended
 2019-04-29 12:20:55 -04:00