Commit Graph

1423 Commits

Author SHA1 Message Date
Gustavo Trott
14815184e6
Merge pull request #14911 from GuiLeme/issue-9789 2022-05-10 13:24:11 -03:00
Anton Georgiev
f3080b9ad1
Merge pull request #14930 from GuiLeme/issue-14819
fix(recording): Override configuration `properties` file
2022-05-10 11:30:48 -04:00
Guilherme Pereira Leme
be6184c9e9
Changes in review
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2022-05-05 09:53:38 -03:00
Guilherme Leme
d438367e36 [issue-14819] - Changes in review 2022-05-02 16:41:02 -03:00
Guilherme Leme
ab9d4fa9d4 [issue-14819] - implemented features. 2022-05-02 16:04:37 -03:00
Calvin Walton
2d4976cf72 record-and-playback: Don't seek past end of video input
In some cases with incomplete/partially corrupt files, the input video
file can be shorter than the displayed time. If there is a badly timed
cut, this can result in a seek being generated to a point where ffmpeg
is unable to start at.

Add a detection for this situation, and replace with a blank video.
2022-05-02 14:30:32 -04:00
Guilherme Leme
5763595d66 [issue-9789] - Changes in review. 2022-05-02 09:42:00 -03:00
Guilherme Leme
2c3c10115e [issue-9789] - change property showModeratorViewpoint's file 2022-04-29 16:43:24 -03:00
Guilherme Leme
6741232b3f [issue-9789] - Included the option to show the moderator's view. 2022-04-29 16:06:14 -03:00
Guilherme Leme
fe9585a004 [issue-9789] - Refactored webcamsOnlyForModerator to enhance computer processing. 2022-04-29 13:04:43 -03:00
Guilherme Leme
de344dbb81 [issue-9789] - Refactor userInfo List and its logics. 2022-04-29 11:56:26 -03:00
Guilherme Leme
7a513e0f06 [issue-9789] - process EDL differently (recording component) in order to include the webcmasOnlyForModerator property. 2022-04-28 14:58:47 -03:00
Guilherme Leme
a6f9bc6e9a [fix-PR-14628] - Include Return of the props in the read_props method. 2022-04-20 10:00:07 -03:00
Anton Georgiev
dd97ed5b5b
Merge pull request #14628 from GuiLeme/issue-14304
Implementation to read files from `/etc/bigbluebutton/` and override default configs.
2022-04-13 14:20:51 -04:00
Guilherme Leme
0319ecf371 [nokogiri-update] - Update of nokogiri to version 1.13.4+ 2022-04-12 11:07:59 -03:00
Guilherme Leme
021200a800 [Update to nokogiri] - Gemfile.lock 2022-04-05 14:41:03 -03:00
Guilherme Leme
a5601c0c8f [Update to nokogiri] - Change in the Gemfile to run in the new version. 2022-04-05 14:23:17 -03:00
Guilherme Leme
71e1ed8494 [issue-14304] - Resolving merging conflicts 2022-03-31 16:50:34 -03:00
Guilherme Leme
5d6401828c [issue-14304] - Changes in review. 2022-03-31 16:37:46 -03:00
Calvin Walton
97c0f51964 bbb-record-core: Restore systemd unit cwd to 'scripts' dir
The rap scripts might load or run some scripts using relative paths from
the scripts directory, so restore that.

Bundler automatically looks up in parent dirs to find the Gemfile, so
loading gems will work correctly.
2022-03-29 12:57:16 -04:00
Calvin Walton
db2d8efa0d bbb-record-core: Update systemd units to use bundler
Several scripts internally run bundler setup, so no explicit bundler
command is needed. For the others, start up using /usr/bin/bundle
(installed by ruby-bundler) to load the environment.
2022-03-29 12:41:27 -04:00
Daniel Molkentin
dc012a2548 fix(bbb-record-core): make package install again on focal
Now uses Ubuntu's bundler version to install all dependencies at build time
rather than install time. Gems are also now vendored, and no longer pollute the
operating system.
2022-03-23 22:55:04 +01:00
Calvin Walton
6f4a3fdf0b publish/presentation.rb: clean up some assignments in if statements 2022-03-23 09:55:42 -04:00
Daniel Petri Rocha
f9b022c7e4 Don't show slides after meeting ends 2022-03-22 18:02:07 +01:00
Daniel Petri Rocha
8a8a03fab5 Resolve merge conflict; update README 2022-03-22 16:11:44 +01:00
Guilherme Leme
b3320c2414 [issue-14304] - changes in review. 2022-03-21 10:47:01 -03:00
Guilherme Leme
c798eee1f7 [issue-14304] - Implemented reading of /etc/bigbluebutton/recording.yml and /etc/bigbluebutton/presentation.yml 2022-03-18 12:16:27 -03:00
Guilherme Leme
b080e889f6 Merge remote-tracking branch 'upstream/v2.5.x-release' into issue-14243 2022-03-14 16:05:44 -03:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00:00
Guilherme Leme
55f8d9266e [issue-14243] - Fix to accept the chatEmphasizedText in recording and akka components. 2022-02-22 12:00:36 -03:00
Guilherme Leme
f6e144d71c [issue-14243] - Changes in Akka, to save the events in redis, and changes in rap to process these changes. 2022-02-17 17:23:28 -03:00
Guilherme Leme
58223e416c Removed comments. 2022-02-17 08:24:37 -03:00
Daniel Petri Rocha
a280959f91 Remove comment 2022-01-31 17:09:15 +01:00
Daniel Petri Rocha
e02788545b Merge branch 'bigbluebutton:develop' into faster-publish 2022-01-31 16:29:31 +01:00
Daniel Petri Rocha
b5a52b8e89 Second round of stylistic changes; search for previous shape in DRAW_END 2022-01-31 16:26:22 +01:00
Daniel Petri Rocha
61bc318211
Merge branch 'bigbluebutton:develop' into faster-publish 2022-01-31 16:23:00 +01:00
Guilherme Leme
21e79373f6 Refactored record-and-playback's deploy script to work properly 2022-01-28 11:16:55 -03:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Anton Georgiev
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea 2022-01-24 16:05:57 -05:00
Pedro Beschorner Marin
810deb907b refactor(etherpad): access control et al.
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.

- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads)
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
germanocaumo
74210787ba fix(recording): fix publish crash when poll has no options/answers 2022-01-21 13:23:23 +00:00
Anton Georgiev
e463993d01
Merge pull request #9837 from hiroshisuga/fix-thumbnails
fix(recording): Generate thumbnails from uploaded file
2022-01-20 13:39:38 -05:00
Daniel Petri Rocha
e6476a9b72 Style changes; enable NewCops in Rubocop 2022-01-20 13:57:53 +01:00
Julien Gribonvald
0ea11c9581 fix(recording): not processed screenshare
fix issue #13356
2022-01-18 21:49:28 +00:00
Julien Gribonvald
7a68c002cd
fix(recording): not processed screenshare
fix issue #13356
2022-01-07 12:06:17 +01:00
Fred Dixon
5743b29eba
Merge pull request #11805 from sebastianberm/patch-2
Updated usage section of analytics script to match actual syntax
2022-01-03 16:38:19 -04:00
Daniel Petri Rocha
824274e91c Remove nil checks 2021-12-23 23:39:37 +01:00
Daniel Petri Rocha
39a9a6a791 Shorten with &., ||=, parallel assignments 2021-12-23 13:30:05 +01:00
Daniel Petri Rocha
67900c25b9 Shorten with &., ||=, parallel assignments 2021-12-22 18:28:10 +01:00
Daniel Petri Rocha
1db6894599 Remove translate_timestamp_helper, unused comments 2021-12-22 16:37:37 +01:00