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

1105 Commits (91bd1f3b5eac0f7112ecc7cbfb99d134c6ee4b16)

Author SHA1 Message Date
Moe c43497cc56 fix responess for faceManager 2020-04-22 20:22:44 -07:00
Moe 051c7abf99 Add Face Plugin's Face Manager customAutoLib framework 
- currently API methods only, no UI yet
 2020-04-22 20:04:51 -07:00
Moe cd9b8a2e5e Allow extensions on camera Initiation for pluginBase+ 2020-04-21 15:32:39 -07:00
Moe 55e6c97f72 Allow extensions on camera Initiation for pluginBase 2020-04-21 15:07:22 -07:00
Moe 39090fb9b4 dont allow sub user to modify addStorage 2020-04-19 07:57:39 -07:00
Moe 1502d0a200 Allow disabling Wallclock Timestamps with conf.json parameter 
- add `"wallClockTimestampAsDefault":false` to disable it.
 2020-04-19 07:56:56 -07:00
Moe b3cfcc1b4a Update super.configEditor.css 2020-04-18 23:22:01 -07:00
Moe d32f07def5 Update super.configEditor.js 2020-04-18 23:19:47 -07:00
Moe c470d801de basic update script (git only) 2020-04-18 23:12:19 -07:00
Moe fa96bd7043 Finalize Configuration Editor, refactor some super panel js/ejs 2020-04-18 23:11:55 -07:00
Moe 605f227897 Base framework for JSON Editor on Configuration in Super panel 2020-04-18 22:00:50 -07:00
Moe 7a81679803 Add "useOldPowerVideo" option to config, Add Events chart to each monitor 
- setting this parameter to "true" will result swapping the new power video viewer with the old one.
+ some bug fixes to new one
 2020-04-18 17:38:26 -07:00
Moe d76edce8ad Delete main.dash2.js 2020-04-16 23:15:38 -07:00
Moe 3c849f73d5 refactor for region editor js 2020-04-16 23:15:31 -07:00
Moe e67cd8be29 Add ARM support for Face plugin (tensorflow) 2020-04-10 22:21:36 -07:00
Moe c2722641fd Move "Face Training" section in README to below basic install 2020-04-10 09:31:40 -07:00
Moe 273a38d9d2 Update Face Recognition plugin, add CPU/GPU selection in Installer 2020-04-10 09:31:12 -07:00
Moe 39b8337b1c fix concatted detector event response 2020-04-10 08:59:48 -07:00
Moe 4d819932b7 Face plugin installer ask for GPU or CPU setup 2020-04-09 20:55:07 -07:00
Moe b14cf34629 Update package.json 2020-04-07 21:05:26 -07:00
Moe 99227558e0 Merge branch 'patch-1' into 'dev' 
Fix bugs in INSTALL/ubuntu.sh

See merge request Shinobi-Systems/Shinobi!186
 2020-04-08 02:59:20 +00:00
Kevin Abraham e25918a9cb Fix bugs in INSTALL/ubuntu.sh 2020-04-08 00:40:10 +00:00
Moe 4d8a3f3d0a Merge branch 'dev' into 'master' 
Update .gitignore

See merge request Shinobi-Systems/Shinobi!185
 2020-04-07 15:36:30 +00:00
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