ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,960 Commits
98 Branches
6 Tags
76 MiB
Commit Graph

2960 Commits (83d9a52a9472e5a9824e1a788b986be9be77acde)

Author SHA1 Message Date
Moe 9661f019d0 adjust raw snapshot from detectorStream.m3u8 2022-09-14 19:21:45 -07:00
Moe efe703dfc0 fix #410 2022-09-14 15:35:10 -07:00
Moe 58ad3e9b2c Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-09-14 10:00:47 -07:00
Moe abbb94899c remove loadGroupApps from login 2022-09-14 10:00:38 -07:00
Moe 64b0fdc5ce Adjust placeholders for addStorage Max Storage Amounts 2022-09-14 09:43:24 -07:00
Moe 4f30e04b6f Merge branch 'fix-ci-build-arm32v7' into 'dev' 
fix: Update .gitlab-ci.yml to build Dockerfile.arm32v7 instead of...

See merge request Shinobi-Systems/Shinobi!391
 2022-09-14 16:39:06 +00:00
Moe c894819407 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-09-12 19:56:34 -07:00
Moe 6cf4e332f9 add more specific catches for certain fatal errors 2022-09-12 19:56:25 -07:00
Moe 15ce53065c fix Automatic Full URL Path generator 2022-09-12 19:55:43 -07:00
Moe a9cc892dc7 Merge branch 'dev' into 'dev' 
Update languages/ja.json

See merge request Shinobi-Systems/Shinobi!389
 2022-09-13 02:44:55 +00:00
Moe 34c15a88c7 Merge branch 'dev' into 'dev' 
# Conflicts:
#   languages/ja.json
 2022-09-13 02:36:35 +00:00
Keigo Sato 81c8ecf662 Update languages/ja.json 2022-09-13 01:25:45 +00:00
Moe b34ffd6450 Merge branch 'nocona-fix-event-based-recording' into 'nocona-fix-event-based-recording' 
Update Event based recording fix

See merge request Shinobi-Systems/Shinobi!388
 2022-09-13 01:17:12 +00:00
Moe 7b6922daa0 Merge branch 'dev' into 'dev' 
Update languages/ja.json

See merge request Shinobi-Systems/Shinobi!385
 2022-09-13 00:24:11 +00:00
Moe 752b8cd731 Merge branch 'dev' into 'dev' 
# Conflicts:
#   languages/ja.json
 2022-09-13 00:16:07 +00:00
Katie Roberts 9fb1a602eb Update libs/events/utils.js 2022-09-12 23:42:05 +00:00
Katie Roberts 5d727f0ac0 Update libs/ffmpeg/builders.js 2022-09-12 23:36:24 +00:00
Katie Roberts 2ff97d301d Update libs/basic/utils.js 2022-09-12 23:33:15 +00:00
Katie Roberts b13297bdfb Update libs/ffmpeg/builders.js 2022-09-12 23:29:56 +00:00
Katie Roberts b2981e2500 Update libs/events/utils.js 2022-09-12 23:28:08 +00:00
Katie Roberts def2224544 Update libs/basic/utils.js 2022-09-12 23:23:56 +00:00
Moe cea636b31a fix video links for p2p connections 2022-09-12 16:18:00 -07:00
Tony Bone 36d4b4e11f fix: Update .gitlab-ci.yml to build Dockerfile.arm32v7 instead of Dockerfile.nvidia for the docker-arm32v7-build build. 2022-09-12 15:46:56 -07:00
Moe 8846d84f24 Merge branch 'fix-event-recording' into 'nocona-fix-event-based-recording' 
Fix event based recording

See merge request Shinobi-Systems/Shinobi!387
 2022-09-12 05:11:43 +00:00
Katie Roberts 15fa2e8446 Update libs/events/utils.js 2022-09-12 00:00:08 +00:00
Katie Roberts 8263aa0e8a Update libs/events/utils.js 2022-09-11 23:45:17 +00:00
Katie Roberts b387fc0042 Update libs/ffmpeg/builders.js 2022-09-11 23:36:05 +00:00
Katie Roberts ce224b4a1a Update libs/ffmpeg/builders.js 2022-09-11 23:22:12 +00:00
Katie Roberts 2388b31fd6 Update libs/ffmpeg/builders.js 2022-09-11 23:15:14 +00:00
Katie Roberts 38d8b66e9a Update libs/events/utils.js 2022-09-11 23:13:41 +00:00
Katie Roberts c012a85856 Update libs/ffmpeg/builders.js 2022-09-11 23:12:55 +00:00
Katie Roberts f6adf7738b Update libs/events/utils.js 2022-09-11 23:10:48 +00:00
Katie Roberts ee5a1aee1c Update libs/basic/utils.js 2022-09-11 22:59:28 +00:00
Katie Roberts 91503ff9c5 Update libs/ffmpeg/builders.js 2022-09-11 22:53:54 +00:00
Moe d9ae4e150c Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-09-11 15:52:17 -07:00
Moe be016dee2a add roundNearest5 to basic/utils.js 2022-09-11 15:52:13 -07:00
Katie Roberts 4cbdbfafe1 Update libs/events/utils.js 2022-09-11 21:33:51 +00:00
Katie Roberts 60cddb11fa Update libs/events/utils.js 2022-09-11 21:29:18 +00:00
Katie Roberts 0e0eb4ab46 Update libs/events/utils.js 2022-09-11 21:23:39 +00:00
Katie Roberts 777d56bc3c Update libs/ffmpeg/builders.js, libs/events/utils.js 2022-09-11 04:13:49 +00:00
Moe 2aade4631d Merge branch 'feature-default-storage' into 'dev' 
UI: Default storage style

See merge request Shinobi-Systems/Shinobi!381
 2022-09-10 21:27:12 +00:00
Moe db7bd1fbe6 Added Failed Authorization notice for Monitor and Video Deletion 2022-09-10 09:35:38 -07:00
Moe 73fcb117db Clean up dashboard clock code 2022-09-10 09:22:05 -07:00
Moe 645c7e180a Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-09-09 14:26:54 -07:00
Moe 21302e9ea3 fix opening calendar over p2p 2022-09-09 14:26:41 -07:00
Keigo Sato 155aadcced Update languages/ja.json 2022-09-09 04:38:32 +00:00
Keigo Sato bd13be7a4f Update languages/ja.json 2022-09-09 02:29:18 +00:00
Moe b6adfde25a conform a readme for docs v2 importer+ 2022-09-08 00:57:53 -07:00
Moe 3e41359b56 conform a readme for docs v2 importer 2022-09-07 20:43:20 -07:00
Moe 3b499f2d91 Merge branch 'dev' into 'dev' 
Update languages/ja.json

See merge request Shinobi-Systems/Shinobi!384
 2022-09-06 20:50:37 +00:00