ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,631 Commits
72 Branches
6 Tags
92 MiB
Commit Graph

3631 Commits (master)

Author SHA1 Message Date
Moe 0a6a676167 Update ONVIF scanner to see /onvif/media2_service devices 2024-05-15 12:15:36 -07:00
Moe e614e0b59c fix webhook invalid GET and broken POST 2024-05-11 10:21:42 -07:00
Moe eb87056922 initialHeartBeat only if not useSubstream 2024-05-09 17:16:04 -07:00
Moe e0aa025cf1 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2024-05-09 17:10:39 -07:00
Moe e77323552e do a stream check on monitor process start even if no first frame arrives 2024-05-09 17:10:29 -07:00
Moe 2578e13f50 Merge branch 'more-onvif-events' into 'dev' 
more onvif events e.g. person detection trigger recording

See merge request Shinobi-Systems/Shinobi!496
 2024-05-09 21:00:09 +00:00
Harry Martland e217493b30
more onvif events e.g. person detection trigger recording 2024-05-09 20:57:54 +01:00
Moe 8e061eeb3a Disable auto builds of old docker image 2024-05-08 10:27:55 -07:00
Moe a0e5711a0a Update README.md 2024-05-08 10:06:45 -07:00
Moe e72e482fa0 Add tool to mass change bitrate of cameras by json 2024-05-06 18:39:51 -07:00
Moe a57cd4fc85 #513 fix 2024-04-30 17:52:13 -07:00
Moe 33b3e73e43 add redAlertNotify function to bs5.monitorUtils 2024-04-30 10:52:01 -07:00
Moe 00cbed6070 change stimeout to timeout 2024-04-30 10:37:57 -07:00
Moe 0cec22d634 some language use fix 2024-04-30 10:23:23 -07:00
Moe 1fba3ffc85 undo Doomsdayrs-master-patch-84456 2024-04-30 09:19:28 -07:00
Moe 74f9d54273 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2024-04-01 16:46:58 -07:00
Moe 6a3f77f9d8 Update .gitlab-ci.yml 2024-04-01 16:46:46 -07:00
Moe 065bfe5b87 Merge branch 'master' into 'dev' 
# Conflicts:
#   .gitlab-ci.yml
#   Docker/install_nodejs.sh
#   Dockerfile
#   web/assets/js/bs5.timeline.js
 2024-04-01 22:58:15 +00:00
Moe bac9c55620 part of Doomsdayrs-master-patch-84456 2024-04-01 15:18:16 -07:00
Moe 30753c0732 Merge branch 'Doomsdayrs-master-patch-84456' into 'dev' 
Use localhost instead of 127.0.0.1 in user.sql

See merge request Shinobi-Systems/Shinobi!494
 2024-04-01 18:46:25 +00:00
Moe c742b552a7 remove xz-utils from docker image (non-active version) 2024-03-29 19:05:46 -07:00
Moe ed1f7b9862 fix matrix-info spacing in liveGrid 2024-03-29 19:02:40 -07:00
Moe 8e2232a4bd allow multiple red alerts 2024-03-29 19:02:12 -07:00
Moe 3d4eee201c Add vitormicillo fix to s.getRawSnapshotFromMonitor 2024-03-22 16:43:51 -07:00
Moe 9a831653e9 fix absolute link for videos 2024-03-22 15:48:51 -07:00
Moe 7471bf150a add more possibilities for event draw on liveGrid 2024-03-22 15:47:27 -07:00
Doomsdayrs 5c9f5c6ac6
Use localhost instead of 127.0.0.1 
It doesn't work otherwise.
 2024-03-17 12:22:13 -04:00
Moe 4972d485c6 update object tracker version and update branding defaults 2024-03-12 13:38:00 -07:00
Moe 2cdf93ba1d Revert "Merge branch 'master' into 'master'" 
This reverts merge request !471
 2024-03-11 20:19:59 +00:00
Moe c25df1505f Merge branch 'master' into 'master' 
Update G++ and GCC from 8 to 9

See merge request Shinobi-Systems/Shinobi!471
 2024-03-11 20:19:50 +00:00
Raphael Matheus 507abe0b5a Update G++ and GCC from 8 to 9 2024-03-11 20:19:50 +00:00
Moe f32924de3b Merge branch 'shenqihui-dev-patch-27837' into 'dev' 
Update preQueries.js

See merge request Shinobi-Systems/Shinobi!480
 2024-03-11 20:19:24 +00:00
Moe ccfe1cafd6 Merge branch 'shermdog-dev-patch-95742' into 'dev' 
Minor typo in Recent Videos drop down (6,6 -> 6,9)

See merge request Shinobi-Systems/Shinobi!491
 2024-03-11 20:18:53 +00:00
Moe 0ffa9c05a2 Merge branch 'rejectUnauthorized' into 'dev' 
Add rejectUnauthorized support to emailByUser

See merge request Shinobi-Systems/Shinobi!490
 2024-03-11 20:18:36 +00:00
Moe 87290abc92 UI JPEG Mode disabled until refactor of this feature 
- currently it is broken and causes a lot of confusion among users. For now it is disabled.
 2024-03-08 11:19:52 -08:00
Moe a80680acdf Event Filter enable notice 2024-03-08 10:57:25 -08:00
Moe 1259edbd09 Update HLS.js library 2024-03-08 10:55:59 -08:00
Moe 24d5501a54 show more in matrix live grid 2024-02-29 17:50:51 -08:00
Moe aa09ce48a9 Update bs5.zoomGlass.css 2024-02-29 14:16:16 -08:00
Moe d8b97c499d Fix Live Stream Zoom on UI (Magnify) 2024-02-29 14:09:24 -08:00
Moe abd97d3754 Update createMonitorsJsonFromTxt.js 2024-02-27 13:50:09 -08:00
Moe 8af3d4c820 ejs upgrade 3.1.9 
Changes done by @shermdog

commit b0bb0227131eeb54a7b75663338c13b96b76c32a
Author: Moe <github@m03.ca>
Date:   Sun Jan 7 15:26:39 2024 -0800

    add latest dev changes to ejs-upgrade

    commit b45c902cf7
    Author: Moe <github@m03.ca>
    Date:   Sun Jan 7 11:01:59 2024 -0800

        Update install_nodejs.sh

    commit 2f283f6d48
    Author: Moe <github@m03.ca>
    Date:   Sun Jan 7 11:01:53 2024 -0800

        make backblaze errors not return file buffer with error

    commit 5446948880
    Author: Moe <github@m03.ca>
    Date:   Sun Jan 7 11:01:18 2024 -0800

        attempt fixing docker pipeline for arm64v8

    commit 0aa0bb7777
    Author: Moe <github@m03.ca>
    Date:   Fri Jan 5 11:38:54 2024 -0800

        discord bot reconnect when network reconnect

    commit c4749c8c3b
    Author: Moe <github@m03.ca>
    Date:   Tue Jan 2 10:04:58 2024 -0800

        fix syntax error in childUtils.js+

    commit 5fc5d32dff
    Author: Moe <github@m03.ca>
    Date:   Mon Jan 1 10:38:40 2024 -0800

        fix syntax error in childUtils.js

commit 56d1d22499
Merge: 0b6fe3c5 ba80ac8d
Author: Moe <github@m03.ca>
Date:   Mon Jan 1 18:30:31 2024 +0000

    Merge branch 'ejs_upgrade' into 'ejs-upgrade-shermdog'

    ejs upgrade 3.1.9

    See merge request Shinobi-Systems/Shinobi!492

commit ba80ac8d2a
Author: Rick Sherman <rick@shermdog.com>
Date:   Thu Dec 28 15:52:33 2023 -0600

    ejs upgrade 3.1.9
    This commit upgrades ejs to the 3.x series
 2024-02-26 19:16:51 -08:00
Moe 48a0d6be27 Revert "Fix Global Webhook notify request method" 
This reverts commit 8dbc250b5f.
 2024-02-18 09:27:48 -08:00
Moe 2808485b7a Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2024-02-16 20:14:09 -08:00
Moe 8dbc250b5f Fix Global Webhook notify request method 2024-02-16 20:14:07 -08:00
Moe 606ead01c1 Merge branch 'Gamertech2-dev-patch-54202' into 'dev' 
Update en_CA.json to make setMaxStorageAmountText clearer as to how to remove the alert.

See merge request Shinobi-Systems/Shinobi!493
 2024-02-08 17:22:39 +00:00
Gamertech 36bb0a3a84 Update en_CA.json to make setMaxStorageAmountText clearer as to how to remove the alert. 2024-02-08 11:13:03 +00:00
Moe 5a1afab20a add additional tracker functions 
these functions are currently not used in the public build but are included for future official use or custom use cases.
 2024-02-06 10:59:06 -08:00
Moe 6b77c42cae add more info display for highly detailed matrices on liveGrid 2024-02-06 10:56:43 -08:00
Moe 1bfa895a80 allow custom footer in discord notify 2024-02-06 10:55:22 -08:00