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

1132 Commits (60af7da99b9931f16e8927b804554ed75dd9f6de)

Author SHA1 Message Date
Moe bb3545ba8e Update .gitignore 2020-04-07 08:36:04 -07:00
Moe 82be391855 Merge branch 'dev' into 'master' 
Remove package-lock.json

See merge request Shinobi-Systems/Shinobi!184
 2020-04-07 15:34:04 +00:00
Moe e64e547941 Update .gitignore 2020-04-07 08:33:13 -07:00
Moe 402a0a89d1 Delete package-lock.json 2020-04-07 08:32:33 -07:00
Moe 86e14c9bf6 Merge branch 'dev' into 'master' 
Molotov

See merge request Shinobi-Systems/Shinobi!177
 2020-04-07 04:52:58 +00:00
Moe b1945bad18 add auto cron key generator to ubuntu installers 2020-04-06 21:50:08 -07:00
Moe 41ae60bba7 Revert "make install dir relocatable" 
This reverts commit 1c6f536a5c.
 2020-04-06 21:34:06 -07:00
Moe c409e6a72a Revert "use toupper instead of IGNORECASE to correct cpu usage awk parser" 
This reverts commit fb3a030012.
 2020-04-06 21:33:24 -07:00
Moe 066a5ca0e9 fix CSS on admin page 2020-04-06 21:31:40 -07:00
Moe e132766a28 Merge branch 'revert-0fa2f216' into 'master' 
Revert "Merge branch 'patch-1' into 'master'"

See merge request Shinobi-Systems/Shinobi!183
 2020-04-07 04:19:30 +00:00
Moe 091d162dd4 Revert "Merge branch 'patch-1' into 'master'" 
This reverts merge request !182
 2020-04-07 04:19:19 +00:00
Moe 0fa2f216e1 Merge branch 'patch-1' into 'master' 
Variable typo fix to resolve Issue #111

See merge request Shinobi-Systems/Shinobi!182
 2020-04-07 04:16:38 +00:00
Ben Schofield d2b7f29b3c Variable typo fix to resolve Issue #111 2020-04-07 03:56:37 +00:00
Moe ab63d22678 Create package-lock.json 2020-04-06 18:12:56 -07:00
Moe cca53bde4c update dashboard clock performance 
- remove last bit of jquery
 2020-04-06 18:12:51 -07:00
Moe 79444adf72 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2020-04-06 18:10:54 -07:00
Moe ffb93e8a4a update dashboard clock performance 
- use pure js for all operation except the on click event to change the class for twentyfourhours
 2020-04-06 18:10:52 -07:00
Moe 9f44591dba Merge branch 'nodemon' into 'dev' 
nodemon

See merge request Shinobi-Systems/Shinobi!77
 2020-04-06 20:42:49 +00:00
Moe 3ba908dfed Merge branch 'patch-1' into 'dev' 
Correct document typo

See merge request Shinobi-Systems/Shinobi!139
 2020-04-06 20:42:03 +00:00
Moe 1a8fa925de Merge branch 'filter_streamtype_for_tv_channels' into 'dev' 
Filter streamtype for tv channels

See merge request Shinobi-Systems/Shinobi!178
 2020-04-06 20:41:30 +00:00
Ian Rubado 00a883f127 Simplified even more. 2020-04-06 16:33:38 -04:00
Ian Rubado 2a22db2e55 Fix whitespace. 2020-04-06 16:16:19 -04:00
Ian Rubado 8b95989f97 No need to check req.query.streamtype contents, only need to know it exists and filter accordingly. 2020-04-06 16:14:23 -04:00
Moe acdc40e545 Merge branch 'fix-scrolling' into 'dev' 
Fix scrolling when clicking thumbnail.

See merge request Shinobi-Systems/Shinobi!45
 2020-04-06 17:05:54 +00:00
Moe 453604bec0 Merge branch 'event_monitor_name' into 'dev' 
provide human-readable display name to custom event commands for automation

See merge request Shinobi-Systems/Shinobi!172
 2020-04-06 16:57:51 +00:00
Moe 174448f9b4 manually add #173 
the original MR was done the incorrect branch.
 2020-04-06 09:55:32 -07:00
Moe 692cece4f4 Merge branch 'patch-2' into 'dev' 
Generate $cronKey in a cleaner way

See merge request Shinobi-Systems/Shinobi!142
 2020-04-06 16:51:39 +00:00
Moe b25c0d813f Merge branch 'cpu_ignorecase' into 'master' 
use toupper instead of IGNORECASE to correct cpu usage awk parser

See merge request Shinobi-Systems/Shinobi!173
 2020-04-06 16:48:47 +00:00
Moe 8c5fa34522 Merge branch 'install-fixes' into 'master' 
make install dir relocatable

See merge request Shinobi-Systems/Shinobi!174
 2020-04-06 16:48:10 +00:00
Moe d6ab68059f Update default aduration and probesize 2020-04-05 22:41:29 -07:00
Moe 2260abbda4 clear two factor token on login 2020-04-05 20:31:01 -07:00
Ian Rubado e0284ede1e Fix whitespace 2020-04-05 23:28:00 -04:00
Ian Rubado f90329d015 Filter by streamtype for tv channel listing. 2020-04-05 23:26:03 -04:00
Moe 5308449979 send only essential data on 2FactorAuth 2020-04-05 19:51:12 -07:00
Moe f787c66ad7 Set default Stream Type to HLS 2020-04-05 19:29:53 -07:00
Ian Rubado d3329d52ae Merge remote-tracking branch 'upstream/dev' into dev 2020-04-05 22:15:01 -04:00
Ian Rubado a6b78c0a4e Revert "Merge branch 'always_record_on_motion' into dev" 
This reverts commit 5f804ce396, reversing
changes made to 184bc2fa69.
 2020-04-05 22:12:15 -04:00
Moe a0a3ef2d2a Disable timelapse download auto-rerun 2020-04-05 16:16:22 -07:00
Moe 8252886272 prepare more P2P pathing 2020-04-05 16:14:31 -07:00
Moe 0dc4b7afd2 add inference time to yolo plugin 2020-04-05 16:13:52 -07:00
Ian Rubado 5f804ce396 Merge branch 'always_record_on_motion' into dev 2020-04-05 19:10:06 -04:00
Moe 184bc2fa69 Add tree-kill fix for snap zombies 
- fix found by dieseldude in the community chat
 2020-04-05 19:09:24 -04:00
Moe 885ec82390 add "events" to Traditional Recording insertCompletedVideo request 
- this will allow these kinds of recordings to provide a notification to the Mobile App upon completion
 2020-04-05 19:09:24 -04:00
Svilen Savov 0380d98828 Update freenas.csh, line 15 updated from ehco to echo 2020-04-05 19:09:23 -04:00
Moe 9cd9446800 move segment file creation to separate pipe 2020-04-05 16:00:32 -07:00
Moe ff8523fc30 Merge branch 'dev2' into 'dev' 
Added options for timelapse

See merge request Shinobi-Systems/Shinobi!176
 2020-04-05 22:25:14 +00:00
Moe 45d256cbae fs.unlink as preliminary deletion function 2020-04-04 20:41:39 -07:00
Moe 80b0716536 Update en_CA.json 2020-04-04 18:52:42 -07:00
Moe a49eeece88 change max required frame for timelapse video creation 2020-04-04 17:59:03 -07:00
Moe 51f07ac535 before starting a monitor check that it's admin user exists 2020-04-04 17:58:00 -07:00