b6c8364e16
update configuration editor with addToConfig option.
...
passing addToConfig parameter allows you to define a complete JSON to merge instead of adding each variable as its own parameter.
2018-07-11 14:09:04 -07:00
80260b0798
Merge branch 'dev' into 'master'
...
fix syntax for video email attachment on event
See merge request Shinobi-Systems/Shinobi!15
2018-07-11 19:15:32 +00:00
7c35dfa6f6
Merge branch 'dev' into 'master'
...
Shiny Pikachu
See merge request Shinobi-Systems/Shinobi!14
2018-07-11 02:38:47 +00:00
7f9aa5b705
fix syntax for video email attachment on event
2018-07-09 13:02:26 -07:00
cb83daeab8
Discord bot as account option instead of system configuration
...
- each "admin" account can login their own discord bot for notifications
2018-07-09 11:29:20 -07:00
939c0d4e5e
Event on Trigger gets Discord notifications and video clip attachments
...
- Traditional Recording must be enabled to get a video clip and JPEG API must be enabled to get a JPEG snapshot (for now)
- Email also gets the attachments
2018-07-08 23:32:52 -07:00
21c8bc47d6
syntax fix for kill allowStdinWrite
2018-07-08 09:38:22 -07:00
52b79e14b3
firefox live view in power video viewer fix
2018-07-07 20:59:16 -07:00
92ed6fd819
remove some whitespace
2018-07-07 19:56:36 -07:00
caddbfc4f5
Monitor stream audio toggle (video element) added to menu
2018-07-07 19:56:18 -07:00
c5a49a005e
embed video element stretch image
2018-07-07 19:17:10 -07:00
bd7d84306d
Option to Restrict Sub-Account viewing logs
2018-07-07 16:06:16 -07:00
1fad2f319f
Option to Restrict Sub-Account changing their user settings
2018-07-07 16:00:23 -07:00
14c0d58b5c
client side permission checks updated to hide elements
2018-07-07 14:38:27 -07:00
4e4902b32f
Restrict Monitor Addition and Deletion
...
- cleanup admin.ejs
2018-07-07 14:29:47 -07:00
0fc33342a3
clear API keys on user update from admin
...
- additional checks for API access
2018-07-07 14:24:43 -07:00
a6cd2f412e
remove extra console log on zip
2018-07-07 10:58:46 -07:00
7cf57e20bb
minor cleanup
2018-07-07 10:42:37 -07:00
4f5da4ad7a
allow multiple zip and download of videos
...
- and cleanup in main.dash2.js
2018-07-07 10:41:09 -07:00
08a80f2b7e
sql time query cleanup
2018-07-07 10:33:23 -07:00
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
85b75aca76
Merge remote-tracking branch 'upstream/dev' into developer_documentation
2018-07-05 16:10:45 +09:00
da28d1448f
add intial developer documenatation
2018-07-05 16:10:32 +09:00
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
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
adebd13c14
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2018-07-04 09:56:19 -07:00
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
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
b62540dee2
Revert "Merge branch 'license_to_md' into 'master'"
...
This reverts merge request !5
2018-07-04 16:28:27 +00:00
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
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
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
5d145a182b
convert LICENSE to MD format, add ,swo and .swp to gitignore
2018-07-04 12:05:40 +09:00
a66f219948
fix cosmetic bugs for /admin sub account editor
2018-07-03 10:37:17 -07:00
876a9e66ae
log viewer minor cleanup
2018-07-02 22:07:50 -07:00
5893313e71
Log Export button
2018-07-02 21:49:52 -07:00
d0c33a5e87
minor visual tweaks
2018-07-02 21:21:40 -07:00
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
0fdbc9ecf0
log viewer update to allow time frame use
2018-07-02 21:19:12 -07:00
654c1564fd
get logs by api in time frame
2018-07-02 21:17:05 -07:00
cd908a0433
disable Update button
...
script only works from command line at the moment.
2018-07-01 15:49:26 -07:00
5b2de4686f
update script rebuilt with force nature++
2018-07-01 15:08:30 -07:00
34b1183770
update script rebuilt with force nature+
2018-07-01 14:39:27 -07:00
5352ae10e3
update script rebuilt with force nature
2018-07-01 14:38:59 -07:00
3be99d2a69
ffmpeg-static locked to 2.2.1 for ffmpeg 3.4.2
2018-07-01 11:30:57 -07:00
56c6624de4
extend recording restart check for streamer camera
2018-06-30 22:05:27 -07:00
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
d99be284dd
humanize webrtc constraints for dashcam
2018-06-30 17:32:51 -07:00
Moe
zero