Commit Graph

371 Commits (91f530c4615984b93e50bbf5326800505e66ccb4)

Author SHA1 Message Date
Moe 14c0d58b5c client side permission checks updated to hide elements 2018-07-07 14:38:27 -07:00
Moe 4e4902b32f Restrict Monitor Addition and Deletion
- cleanup admin.ejs
2018-07-07 14:29:47 -07:00
Moe 0fc33342a3 clear API keys on user update from admin
- additional checks for API access
2018-07-07 14:24:43 -07:00
Moe a6cd2f412e remove extra console log on zip 2018-07-07 10:58:46 -07:00
Moe 7cf57e20bb minor cleanup 2018-07-07 10:42:37 -07:00
Moe 4f5da4ad7a allow multiple zip and download of videos
- and cleanup in main.dash2.js
2018-07-07 10:41:09 -07:00
Moe 08a80f2b7e sql time query cleanup 2018-07-07 10:33:23 -07:00
zero 7c26fa1f87 little tweaks for typographical and formatting consistency 2018-07-06 00:21:24 +09:00
影月 零 0372337e09 catch SIGINT so we can Ctrl+C to close camera.js on the terminal 2018-07-05 18:34:01 +09:00
zero 85b75aca76 Merge remote-tracking branch 'upstream/dev' into developer_documentation 2018-07-05 16:10:45 +09:00
zero da28d1448f add intial developer documenatation 2018-07-05 16:10:32 +09:00
Moe 0b0468652e Merge branch 'dev' into 'master'
Gift of the Sages

See merge request Shinobi-Systems/Shinobi!7
2018-07-04 17:08:45 +00:00
Moe 18460a5e25 re-add changes removed from license
https://gitlab.com/Shinobi-Systems/Shinobi/merge_requests/5 was merged from a fork of master, which did not have the latest changes.
2018-07-04 10:04:47 -07:00
Moe adebd13c14 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2018-07-04 09:56:19 -07:00
Moe 2f5d36c6f4 Updated License to match #2
@Kagetsuki provided a suggest list of changes in Issue #2
https://gitlab.com/Shinobi-Systems/Shinobi/issues/2
2018-07-04 09:56:05 -07:00
Moe fa27a9dd1f Merge branch 'revert-4928c5b0' into 'master'
Revert "Merge branch 'license_to_md' into 'master'"

See merge request Shinobi-Systems/Shinobi!8
2018-07-04 16:29:21 +00:00
Moe b62540dee2 Revert "Merge branch 'license_to_md' into 'master'"
This reverts merge request !5
2018-07-04 16:28:27 +00:00
Moe dbd4a88207 Merge branch 'templates' into 'dev'
add Feature requeest template

See merge request Shinobi-Systems/Shinobi!6
2018-07-04 16:26:33 +00:00
Moe 4928c5b084 Merge branch 'license_to_md' into 'master'
convert LICENSE to MD format, add ,swo and .swp to gitignore

See merge request Shinobi-Systems/Shinobi!5
2018-07-04 16:24:42 +00:00
Moe fe67b6e1e9 Strict database time insert
- some databases are "strict" and do not allow inserting time with a raw Date object.
2018-07-04 09:23:29 -07:00
影月 零 114806e309 add Feature requeest template 2018-07-04 19:56:20 +09:00
zero 5d145a182b convert LICENSE to MD format, add ,swo and .swp to gitignore 2018-07-04 12:05:40 +09:00
Moe a66f219948 fix cosmetic bugs for /admin sub account editor 2018-07-03 10:37:17 -07:00
Moe 876a9e66ae log viewer minor cleanup 2018-07-02 22:07:50 -07:00
Moe 5893313e71 Log Export button 2018-07-02 21:49:52 -07:00
Moe d0c33a5e87 minor visual tweaks 2018-07-02 21:21:40 -07:00
Moe 5a04813557 add Log Stream in Monitor Settings window
- Logging Section moved to bottom because it grows in size when logs are streaming.
2018-07-02 21:21:10 -07:00
Moe 0fdbc9ecf0 log viewer update to allow time frame use 2018-07-02 21:19:12 -07:00
Moe 654c1564fd get logs by api in time frame 2018-07-02 21:17:05 -07:00
Moe cd908a0433 disable Update button
script only works from command line at the moment.
2018-07-01 15:49:26 -07:00
Moe 5b2de4686f update script rebuilt with force nature++ 2018-07-01 15:08:30 -07:00
Moe 34b1183770 update script rebuilt with force nature+ 2018-07-01 14:39:27 -07:00
Moe 5352ae10e3 update script rebuilt with force nature 2018-07-01 14:38:59 -07:00
Moe 3be99d2a69 ffmpeg-static locked to 2.2.1 for ffmpeg 3.4.2 2018-07-01 11:30:57 -07:00
Moe 56c6624de4 extend recording restart check for streamer camera 2018-06-30 22:05:27 -07:00
Moe 1038a4839f Streamer v2 write lock on start to prevent crashing
-also always refresh stream with key frame when main process is restarted
2018-06-30 21:57:15 -07:00
Moe d99be284dd humanize webrtc constraints for dashcam 2018-06-30 17:32:51 -07:00
Moe 61e4b903b5 update whitespacing for streamer v1 2018-06-30 17:06:52 -07:00
Moe a47cefe033 update dashcam (streamer v2) code 2018-06-30 17:06:31 -07:00
Moe 977089dced modify capture function for streamer cameras
- lock for streamer write function
- additional bug fixes added
  - add hwaccel and cust_input in proper places
2018-06-30 17:06:01 -07:00
Moe a850ad638d show real monitor status instead of just mode 2018-06-28 18:36:56 -07:00
namekal 1b3cefd807 Update Indifference definition 2018-06-28 17:43:54 +00:00
Moe 390758b291 remove poseidon auto reinit on error
sometimes the video stream gives off error events even if the stream is still playing. The error events must be filtered before making it auto reinit. For now it is disabled.
2018-06-28 10:25:55 -07:00
Moe bd5bede5d5 fix memory leak with http poseidon++ 2018-06-28 10:10:10 -07:00
Moe 55a5d0da17 fix memory leak with http poseidon 2018-06-28 09:52:27 -07:00
Moe 74ec5fc302 Camera Not Recording Check 2018-06-28 09:06:34 -07:00
Moe f127dea35d fix mp4 http stream black on start 2018-06-27 13:20:44 -07:00
Moe 69d8716f07 fix warning message for invalid configuration 2018-06-26 21:12:11 -07:00
Moe 50cb24fad8 License update
- Added new possible unpaid uses for Shinobi Pro
- Add list of used softwares to create Shinobi
2018-06-26 20:42:21 -07:00
Moe 4147c60f53 minor code cleanup 2018-06-26 17:59:42 -07:00