Commit Graph

23791 Commits

Author SHA1 Message Date
Calvin Walton
1e76256ea5 Recording: Fix handling of links in chat messages
At some point, BigBlueButton switched from using `"` to `'` in the link tags in
chat messages, which caused the regular expression that was supposed to remove
the `event:` prefix to not match.

I've replaced the error-prone regular expression with an actual HTML parser,
using the "Loofah" HTML transformation/sanitization library based on Nokogiri.

I've removed the code that detected unlinked URLs, since it was broken - and
not needed: current BigBlueButton versions do the link detection in the client.
If someone reprocesses a really old BBB recording with these scripts, URLs in
chat might not be linked in the result. But they wouldn't have been linked in the
client in the original meeting either, so I figure that's ok.

Fixes #6475
2019-02-20 12:03:24 -05:00
Anton Georgiev
77ca025891
Merge pull request #6807 from jfsiebel/recording-annotations-interval
Prevent subscribing every 10s when recording
2019-02-19 15:06:53 -05:00
Joao Siebel
ccb21a4192 prevent annotation publish every 10 seconds when recording. close #6723 and close #6796 2019-02-19 16:58:06 -03:00
Anton Georgiev
6dbaba16c1
Merge pull request #6774 from jfsiebel/whiteboard-drawing-problem
Prevent drawing problem
2019-02-19 13:58:17 -05:00
Anton Georgiev
e8593f626f
Merge pull request #6780 from BobakOftadeh/fix-clear-chat
Fix clear public chat
2019-02-19 13:48:15 -05:00
Anton Georgiev
40caed3924
Merge pull request #6734 from Tainan404/issue-6666
Allow re-invite user that didn't joined in meeting
2019-02-19 13:39:22 -05:00
Anton Georgiev
f288fa3180
Merge pull request #6790 from vitormateusalmeida/issue-6624
Fix unread message indicator remains active
2019-02-19 13:36:39 -05:00
bobakoftadeh
c2885fdafa Improve GroupChatMsg remove query 2019-02-19 17:51:52 +00:00
Jacob Laboissonniere
21d874b972 In the bbb-lti applicaation, add a way to configure the parameters used for generating the meetingID (#6714)
* Can now configure parameters used to generate meeting_id

* Add back deleted config stuff

* Fix documentation typo

* Fix bad indentation

* Change function name
2019-02-19 11:02:23 -05:00
Tainan Felipe
8c1192c861 Re open join modal when a new join url is received 2019-02-18 09:44:14 -03:00
Anton Georgiev
c866933a9a
Merge pull request #6532 from BobakOftadeh/increase-display-name-area
Increased display name area
2019-02-15 15:07:00 -05:00
Vitor Mateus
6a94db46ca Fix unread message indicator remains active #6624 2019-02-15 14:41:51 -02:00
Anton Georgiev
37fee4ae1d
Merge pull request #6789 from KDSBrowne/update-console-fix
Fix console error
2019-02-15 11:25:38 -05:00
Anton Georgiev
e9e50601ce
Merge pull request #6777 from antobinary/update-packages
Update npm packages versions
2019-02-15 11:22:01 -05:00
Anton Georgiev
3ab70db7da
Merge pull request #6783 from BobakOftadeh/fix-save-chat-firefox
Fix chat save feature on Firefox
2019-02-15 10:36:38 -05:00
KDSBrowne
937e1e01f3 fix console error 2019-02-15 15:32:41 +00:00
Anton Georgiev
c839c7491c
Merge pull request #6788 from KDSBrowne/fix-6785
Fix for console error joining breakout room
2019-02-15 10:29:35 -05:00
KDSBrowne
2d20bae348 fix console error 2019-02-15 14:44:57 +00:00
Anton Georgiev
597ea5f557
Merge branch 'master' into update-packages 2019-02-14 16:58:04 -05:00
Anton Georgiev
18286dd8dd
Merge pull request #6781 from antobinary/css-warnings
Remove explicit dependency to core-js
2019-02-14 16:56:25 -05:00
bobakoftadeh
d63a6b229c Fix chat save feature on Firefox 2019-02-14 21:48:32 +00:00
Anton Georgiev
dcabfe1dc1 meteor seems to find core-js in 1.8 2019-02-14 20:43:16 +00:00
Anton Georgiev
e5ebc33c84
Merge pull request #6775 from antobinary/css-warnings
Remove missing css class references
2019-02-14 15:33:00 -05:00
bobakoftadeh
4044d52fea Improved clear chat fix 2019-02-14 20:18:06 +00:00
bobakoftadeh
3b2e536972 Fix clear chat bug 2019-02-14 19:16:15 +00:00
Anton Georgiev
25cfe9a8b6 remove undefined style reference 2019-02-14 18:53:57 +00:00
Anton Georgiev
abf4a2b149 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into css-warnings 2019-02-14 18:35:38 +00:00
bobakoftadeh
540d909f07 Fix dropdown issue for firefox 2019-02-14 17:40:34 +00:00
Anton Georgiev
7968341f3a
Merge pull request #6776 from antobinary/meteor-version
Update meteor from 1.8.0.1 to 1.8.0.2 (patch)
2019-02-14 12:30:09 -05:00
bobakoftadeh
56d0d142fa Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into increase-display-name-area 2019-02-14 17:09:30 +00:00
Anton Georgiev
20d3a2bd54
Merge pull request #6563 from MaximKhlobystov/mobile-tooltip-target
Fix for the tooltip error on mobile
2019-02-14 11:55:51 -05:00
Anton Georgiev
4b18d50b42 update npm packages versions 2019-02-13 19:44:21 +00:00
Anton Georgiev
627280ac41 update meteor from 1.8.0.1 to 1.8.0.2 (patch) 2019-02-13 18:55:58 +00:00
Anton Georgiev
babc34118d add missed linting in user-notes 2019-02-13 18:46:59 +00:00
Anton Georgiev
7858eb6f4b remove missing css class references 2019-02-13 18:44:05 +00:00
Joao Siebel
9cba56d0f9 fix drawing problem by guaranteeing points order. close #6038 2019-02-13 14:15:09 -02:00
Anton Georgiev
5776e9b432
Merge pull request #6716 from KDSBrowne/2.2-SR-cust-poll-options
Make SR announce poll inputs individually
2019-02-13 09:55:23 -05:00
Fred Dixon
e44365491b
Merge pull request #6768 from kepstin/break-captions
Break captions
2019-02-12 20:21:24 -08:00
Fred Dixon
e04365f84b
Merge pull request #6773 from ffdixon/fix-bbb-conf-20
Ensure default.yml is owned by bigbluebutton
2019-02-12 20:19:19 -08:00
Fred Dixon
6fe5439ae8 Ensure default.yml is owned by bigbluebutton 2019-02-12 22:18:42 -06:00
Maxim Khlobystov
5dc2051bf5 Put the code for finding the text for tooltip label into a recursive function 2019-02-12 17:20:46 -05:00
Richard Alam
9cfec5c229
Merge pull request #6772 from ritzalam/fix-signout-api-exception
- signout api throwing exception when it cannot find the user session
2019-02-12 17:14:21 -05:00
Richard Alam
361776a2fe - signout api throwing exception when it cannot find the user session 2019-02-12 14:12:46 -08:00
Richard Alam
2317457cd1 Merge branch 'riadvice-redis-transaction' 2019-02-12 13:52:34 -08:00
Richard Alam
6657b9bf03 Merge branch 'redis-transaction' of https://github.com/riadvice/bigbluebutton into riadvice-redis-transaction 2019-02-12 13:25:37 -08:00
Anton Georgiev
c3f45bae64
Merge pull request #6769 from MaximKhlobystov/duplication-in-logs
Fix for duplication in logs
2019-02-12 16:01:48 -05:00
Anton Georgiev
101cf6af19
Merge pull request #6699 from pedrobmarin/fixes-6667
Reset to default view if screenshare or sync'ed video is initiated
2019-02-12 15:25:25 -05:00
Maxim Khlobystov
52525194fa Make sure logContents is not duplicated 2019-02-12 15:13:35 -05:00
Anton Georgiev
9a7f18ae6e
Merge pull request #6722 from KDSBrowne/2.2-breakout-SR-timer
Prevent SR seeing timer notifications as alerts
2019-02-12 14:51:39 -05:00
Calvin Walton
d9f6ec7560 Revert "Wait until the media is ready before initializing the acorn player."
This reverts commit 04d31d300f.
2019-02-12 14:36:44 -05:00