Isaac Connor
|
49aeb4b467
|
whitespace
|
2018-04-03 10:38:38 -07:00 |
|
Isaac Connor
|
1f29fc601e
|
add Function Filter min width
|
2018-04-03 10:38:22 -07:00 |
|
Isaac Connor
|
09e05b1313
|
Clean up date stuff, use moment for formatting in secs2dbstr etc
|
2018-04-03 10:38:03 -07:00 |
|
Isaac Connor
|
7346a8c733
|
add select button
|
2018-04-03 10:36:58 -07:00 |
|
Isaac Connor
|
e91729692e
|
add Function filter
|
2018-04-03 10:36:44 -07:00 |
|
Isaac Connor
|
48ff480907
|
whitespace
|
2018-04-03 10:36:14 -07:00 |
|
Isaac Connor
|
b26707b647
|
fix resetting DiskSpace
|
2018-04-03 09:57:14 -07:00 |
|
Isaac Connor
|
dfc35721f9
|
ensure that sections are always > section_length
|
2018-04-03 07:03:12 -07:00 |
|
Isaac Connor
|
614170c181
|
Add EndTime to event list
|
2018-04-03 06:57:22 -07:00 |
|
Isaac Connor
|
793f630ee0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-02 10:43:07 -07:00 |
|
Isaac Connor
|
1ff17c97b8
|
Add DoDelete to Storage and Locked to Events
|
2018-04-02 09:04:09 -07:00 |
Isaac Connor
|
df3a5b7d58
|
must reopen the session before destorying it
|
2018-03-29 19:19:08 -04:00 |
Isaac Connor
|
a5b77a59d3
|
allow 0 pre_event_count
|
2018-03-29 12:35:03 -04:00 |
|
Isaac Connor
|
8c52c7feef
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-03-29 12:24:34 -04:00 |
|
Isaac Connor
|
82c44da9be
|
remove some space
|
2018-03-29 12:24:21 -04:00 |
|
Isaac Connor
|
0053404553
|
remove some spaces
|
2018-03-29 12:24:12 -04:00 |
|
Isaac Connor
|
a56eafe796
|
when deleting Logger object, need to reset zmInitialized because we clear all the codes
|
2018-03-29 12:24:00 -04:00 |
|
Isaac Connor
|
ce1499d70f
|
Merge pull request #93 from pliablepixels/92-opt-eventnotification
92 opt eventnotification
|
2018-03-29 11:31:02 -04:00 |
|
Isaac Connor
|
3fe5bb6fe2
|
open and close the session around user login
|
2018-03-29 11:30:20 -04:00 |
|
Isaac Connor
|
f8457e04e2
|
clean out commented out code
|
2018-03-29 11:30:09 -04:00 |
Pliable Pixels
|
e5505de1d1
|
fixed brace styling
|
2018-03-29 11:27:31 -04:00 |
|
Pliable Pixels
|
d64e58e374
|
silly mistake - wrong names
|
2018-03-29 11:23:35 -04:00 |
|
Pliable Pixels
|
95eb1d3045
|
merged master storage areas, resolved conflicts
|
2018-03-29 08:51:35 -04:00 |
|
Pliable Pixels
|
990d60926e
|
#92 new key
|
2018-03-29 08:47:55 -04:00 |
|
Isaac Connor
|
31963dcd16
|
say how big the file was
|
2018-03-28 13:41:16 -07:00 |
|
Isaac Connor
|
d1dd16b81c
|
fix event_id to EventId
|
2018-03-28 13:07:53 -07:00 |
|
Isaac Connor
|
842a42bcd5
|
test for existence of mp4 before trying to grab images from it
|
2018-03-28 13:01:58 -07:00 |
|
Isaac Connor
|
5494e1bf7a
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-28 11:54:13 -07:00 |
|
Isaac Connor
|
b22911f554
|
wait to closeEvent on monitor shutdown
|
2018-03-28 14:03:56 -04:00 |
|
Isaac Connor
|
9d5dcd7b0c
|
return to indicate success of load
|
2018-03-28 08:56:03 -07:00 |
|
Isaac Connor
|
a2452db3de
|
Add Url to storage for S3 support
|
2018-03-28 08:23:36 -07:00 |
|
Isaac Connor
|
3056dd240d
|
bump version to get Url in Storage
|
2018-03-28 08:23:13 -07:00 |
|
Isaac Connor
|
2748f47fb7
|
add Url to Storage for S3 support
|
2018-03-28 08:23:03 -07:00 |
|
Isaac Connor
|
3e7bc46bf9
|
Add Amazon S3 file deletion. Add bandwidth use in file move.
|
2018-03-28 08:21:57 -07:00 |
|
Isaac Connor
|
4d6e5d0ab6
|
Add libnumber-bytes-human-perl as a dependency
|
2018-03-28 08:21:17 -07:00 |
|
Isaac Connor
|
4be64152e8
|
put mutex around inserting event stats
|
2018-03-28 09:12:38 -04:00 |
|
Isaac Connor
|
4d68f9a757
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-27 13:24:57 -07:00 |
|
Isaac Connor
|
a5e389fc29
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-03-27 11:04:46 -04:00 |
|
Isaac Connor
|
b8a792cfb7
|
whitespace google code style
|
2018-03-27 11:04:40 -04:00 |
|
Isaac Connor
|
62a0890383
|
Merge pull request #89 from pliablepixels/ui-tweaks
Ui tweaks for storage areas
|
2018-03-27 11:00:25 -04:00 |
|
Isaac Connor
|
d5319dd046
|
Merge pull request #91 from pliablepixels/90-group-incomplete
Fix for Event details apis (anything that needs groups to be loaded)
|
2018-03-27 11:00:03 -04:00 |
|
Pliable Pixels
|
d3350919de
|
Reintroduced empty check rule, closed paranthesis
|
2018-03-27 10:55:36 -04:00 |
|
Isaac Connor
|
3a5ff289d0
|
perfect the whitespace
|
2018-03-27 10:04:32 -04:00 |
|
Isaac Connor
|
bcc7011871
|
update sql loading code in Reload, which will automatically do the db locking
|
2018-03-27 10:04:19 -04:00 |
|
Pliable Pixels
|
caffe5f7c9
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:55:15 -04:00 |
|
Pliable Pixels
|
1b5d802890
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:43:58 -04:00 |
|
Pliable Pixels
|
5b7011c61b
|
commented out incomplete definition - please complete it if you need it
|
2018-03-27 03:58:28 -04:00 |
|
Pliable Pixels
|
b077cc8900
|
table header - keep consistent
|
2018-03-26 11:50:14 -04:00 |
|
Pliable Pixels
|
dfcee7c6c1
|
table header - keep consistent
|
2018-03-26 11:14:46 -04:00 |
|
Pliable Pixels
|
411e1d05f2
|
used chosen for log filters
|
2018-03-26 11:09:35 -04:00 |