Merge branch 'WWBN:master' into master
7fb5f858d1dc
Actions

Description

Merge branch 'WWBN:master' into master

Details

Provenance

Void	Authored on Aug 4 2021, 02:56
GitHub	Committed on Aug 4 2021, 02:56

Parents

R58:440d81938d49: Webcam improvement
R58:a92b915d6ea4: Removing branding for install.php

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R58:7fb5f858d1dc: Merge branch 'WWBN:master' into master (authored by Void).Aug 4 2021, 02:56

Dayum that script is looking hot 🥵

Merged Changes

440d81938d49 Webcam improvement
Author
Daniel
Browse Repository
No Builds
No Audits
f8a719a17fad Webcam improvement
Author
Daniel
Browse Repository
No Builds
No Audits
611fd0e93a23 Webcam improvement
Author
Daniel
Browse Repository
No Builds
No Audits
3feb456dc6eb Webcam improvement
Author
Daniel
Browse Repository
No Builds
No Audits
134d78bbcc1f Webcam improvement
Author
Daniel
Browse Repository
No Builds
No Audits
e6bf3eab78b8 Webcam improvement
Author
Daniel
Browse Repository
No Builds
No Audits
3ac200d051ac Version 11.3 add more info on the video view tracking
Author
Daniel
Browse Repository
No Builds
No Audits
9225d716c8ed Version 11.3 add more info on the video view tracking
Author
Daniel
Browse Repository
No Builds
No Audits
677330f77428 Version 11.3 add more info on the video view tracking
Author
Daniel
Browse Repository
No Builds
No Audits
9821167b29e1 Version 11.3 add more info on the video view tracking
Author
Daniel
Browse Repository
No Builds
No Audits
c69a2169ba12 Version 11.3 add more info on the video view tracking
Author
Daniel
Browse Repository
No Builds
No Audits
194e2422d02b Increase timeout
Author
Daniel
Browse Repository
No Builds
No Audits
a4e2fe12468a Remove -re seems to work better and also add a preset veryfast
Author
Daniel
Browse Repository
No Builds
No Audits
2d3e9981011f Use localhost
Author
Daniel
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

install/

checkConfiguration.php

objects/

plugin/

Live/

on_publish_socket_notification.php

standAloneFiles/

view/

User_Location/

updatedb/

	updateDb.v11.3.sql
	updateDb.v4.91.sql

view/

js/

script.js

videoViewsInfo.json.php

videoViewsInfo.php

R58:7fb5f858d1dc

View Options

install/checkConfiguration.php

View Options

install/database.sql

View Options

objects/Object.php

View Options

objects/user.php

View Options

objects/userCreate.json.php

View Options

objects/userUpdate.json.php

View Options

objects/video_statistic.php

View Options

plugin/Live/on_publish_socket_notification.php

View Options

plugin/Live/standAloneFiles/restreamer.json.php

View Options

plugin/Live/view/onlineLabel.php

View Options

plugin/Live/webRTC.js

View Options

plugin/Live/webcamFullscreen.php

View Options

plugin/User_Location/User_Location.php

View Options

updatedb/updateDb.v11.3.sql

View Options

view/js/script.js

View Options

view/videoViewsInfo.json.php

View Options

Merge branch 'WWBN:master' into master7fb5f858d1dcActions

Description

Details

Event Timeline

Merged Changes

Changes (17)

R58:7fb5f858d1dc

install/checkConfiguration.php

install/database.sql

objects/Object.php

objects/user.php

objects/userCreate.json.php

objects/userUpdate.json.php

objects/video_statistic.php

plugin/Live/on_publish_socket_notification.php

plugin/Live/standAloneFiles/restreamer.json.php

plugin/Live/view/onlineLabel.php

plugin/Live/webRTC.js

plugin/Live/webcamFullscreen.php

plugin/User_Location/User_Location.php

updatedb/updateDb.v11.3.sql

view/js/script.js

view/videoViewsInfo.json.php

view/videoViewsInfo.php

Merge branch 'WWBN:master' into master
7fb5f858d1dc
Actions