Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
a4ea629
Ajout lien community
JEALG Jan 13, 2024
741d2cd
Modale santé remplacement icône de l'équipement par image du device
JEALG Jan 13, 2024
4e2ecea
mise a jour config Freebox-freeboxcam
JEALG Jan 13, 2024
a4109bc
[Jenkins] Updated translation
Jan 25, 2024
0bd6cac
Update camera.class.php
zoic21 Jan 26, 2024
1a86c2e
Suppression lien community
JEALG Feb 4, 2024
473d4cd
Merge pull request #80 from JEALG/beta
zoic21 Feb 6, 2024
8e368a4
Update camera.displayVideo.php
Phpvarious Feb 21, 2024
11ec0a3
Merge pull request #82 from Phpvarious/patch-4
zoic21 Feb 22, 2024
5ffa86c
Update changelog.md
zoic21 Feb 22, 2024
a92ea4e
[Jenkins] Updated translation
Feb 23, 2024
6f6994d
Add files via upload
Flobul Apr 30, 2024
1a7203b
Update snapshot.php
Flobul Apr 30, 2024
e6d6f29
Update camera.class.php
Flobul Apr 30, 2024
b06e044
Update snapshot.php
Flobul Apr 30, 2024
e589583
Update snapshot.php
Flobul Apr 30, 2024
38cf02c
Merge pull request #84 from Flobul/beta
zoic21 May 7, 2024
6ab0aba
[Jenkins] Updated translation
May 7, 2024
7b5f263
update camera.class.php
Spine34 Jun 22, 2024
035c766
Merge pull request #85 from Spine34/beta
zoic21 Jun 24, 2024
0cd3607
Update changelog.md
zoic21 Jun 24, 2024
e092aef
[Jenkins] Updated translation
Jun 24, 2024
11b298d
Add backupExclude
sagitaz Jul 29, 2024
9099346
Update camera.class.php
zoic21 Aug 5, 2024
0ce1325
Update camera.html
Phpvarious Aug 15, 2024
ec230c5
Merge pull request #87 from Phpvarious/patch-5
Sekiro-kost Aug 15, 2024
62c4494
Merge pull request #86 from sagitaz/patch-1
zoic21 Aug 16, 2024
15c419d
Update camera.history.php
Phpvarious Jan 7, 2025
3e5f0b4
Update camera.ajax.php
Phpvarious Jan 7, 2025
73bee48
Merge pull request #89 from Phpvarious/beta
zoic21 Jan 21, 2025
f16ef47
Update info.json
Phpvarious Jan 28, 2025
c99819d
Update camera.history.php
Phpvarious Jan 28, 2025
75fc1cd
Update camera.displayImage.php
Phpvarious Jan 28, 2025
239f630
Update camera.displayVideo.php
Phpvarious Jan 28, 2025
f4538fb
Merge pull request #90 from Phpvarious/userRestrict
zoic21 Jan 29, 2025
65463f9
Add files via upload
Phpvarious Jan 29, 2025
f23d266
[Jenkins] Updated translation
Jan 30, 2025
a7f468a
add Ubiquiti G5 Turret Ultra
Mips2648 Jun 28, 2026
53dc375
[Jenkins] Updated translation
Jun 28, 2026
c0ee83a
Update camera.class.php
Phpvarious Jul 23, 2026
8bdf1a2
Merge pull request #94 from Phpvarious/patch-6
Salvialf Jul 23, 2026
35c86de
Merge pull request #91 from Phpvarious/ReolinkTrackMix
Salvialf Jul 23, 2026
24e064f
chore(camera.class): code formatting
Salvialf Jul 23, 2026
18cec00
fix(cameraCmd): correct undefined $logicalId (ONVIF ptzzoomout) and h…
Salvialf Jul 23, 2026
bf024bc
fix(info.json): require minimal Jeedom core 4.3.1 for backupExclude s…
Salvialf Jul 23, 2026
2e1f2ad
docs(changelog): update changelog for stable version
Salvialf Jul 23, 2026
ce518ac
chore(workflows): adopt jeedom/workflows canonical CI, adding PHP 8.0…
Salvialf Jul 23, 2026
f259e71
chore(workflows): add prettier CI wrapper
Salvialf Jul 23, 2026
70bc175
[Jenkins] Updated translation
Jul 23, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions .github/workflows/codeLintGlobal.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/lint_Php73.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/lint_Php74.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/php.yml

This file was deleted.

50 changes: 4 additions & 46 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,14 @@
on:
# Trigger the workflow on push or pull request,
# but only for the main branch
# Create branch > prettier / this workflows create commit on branch prettier.
push:
branches:
- prettier
pull_request:
branches:
- prettier

name : 'Prettier'
name : 'Prettier Plugin Jeedom'

jobs:
run-linters:
name: Test Linters
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: "7.4"
coverage: none
tools: phpcs

- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8

- name: Set up Node.js
uses: actions/setup-node@v1
with:
node-version: 14

# ESLint and Prettier must be in `package.json`
- name: Install Node.js dependencies
run: npm i prettier

- name: Install Python dependencies
run: pip install black

- name: Run linters
uses: wearerequired/lint-action@v2
with:
prettier: true
prettier_extensions: css,html,js,json,jsx,md,sass,scss,ts,tsx,vue,yaml
auto_fix: true
prettier_auto_fix: true
git_email: commit@jeedom.com
git_name: 'JeedomBot lint Pretty'
black: true
black_auto_fix: true
prettier:
uses: jeedom/workflows/.github/workflows/prettier.yml@main
15 changes: 15 additions & 0 deletions .github/workflows/work.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
on:
# Workflows check plugin Jeedom
push:
branches:
- beta
pull_request:
branches:
- beta
- master

name : 'Full Workflows Plugin Jeedom'

jobs:
plugin:
uses: jeedom/workflows/.github/workflows/plugin.yml@main
25 changes: 25 additions & 0 deletions 3rdparty/rtsp-to-hls-copy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/sh

#[ $# -eq 0 ] && { echo "Usage: $0 rtsp://... <name>"; exit 1; }

BASEDIR=$(dirname "$0")
SOURCE="$1"
DEST="$2"
NAME=${2:-cctv}
#ARCHIVE=${ARCHIVE:-archive}

HLS_TIME=${HLS_TIME:-5}
HLS_LIST_SIZE=${HLS_LIST_SIZE:-5}

ffmpeg -rtsp_transport tcp -i "$SOURCE" \
-f hls \
-vsync 0 -copyts -vcodec copy -acodec copy \
-tune zerolatency \
-movflags frag_keyframe+empty_moov \
-hls_flags delete_segments+append_list \
-hls_init_time 1 \
-hls_time $HLS_TIME \
-hls_list_size $HLS_LIST_SIZE \
-hls_base_url "segments/" \
-hls_segment_filename ${BASEDIR}"/../data/segments/$NAME-%d.ts" \
${BASEDIR}"/../data/$NAME.m3u8"
25 changes: 25 additions & 0 deletions 3rdparty/rtsp-to-hls-x264.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/sh

#[ $# -eq 0 ] && { echo "Usage: $0 rtsp://... <name>"; exit 1; }

BASEDIR=$(dirname "$0")
SOURCE="$1"
DEST="$2"
NAME=${2:-cctv}
#ARCHIVE=${ARCHIVE:-archive}

HLS_TIME=${HLS_TIME:-5}
HLS_LIST_SIZE=${HLS_LIST_SIZE:-5}

ffmpeg -rtsp_transport tcp -i "$SOURCE" \
-f hls \
-vsync 0 -copyts -c:v libx264 -preset ultrafast -tune zerolatency -profile:v main \
-c:a copy \
-movflags frag_keyframe+empty_moov \
-hls_flags delete_segments+append_list \
-hls_init_time 1 \
-hls_time $HLS_TIME \
-hls_list_size $HLS_LIST_SIZE \
-hls_base_url "segments/" \
-hls_segment_filename ${BASEDIR}"/../data/segments/$NAME-%d.ts" \
${BASEDIR}"/../data/$NAME.m3u8"
Loading
Loading