Isaac Connor
|
9f57c819cd
|
Merge branch 'tesla' into zma_to_thread
|
2017-11-27 14:57:38 -05:00 |
|
Isaac Connor
|
d1886b5536
|
wip
|
2017-11-27 14:57:24 -05:00 |
Isaac Connor
|
00c5590a71
|
add Monitor count to servers
|
2017-11-27 11:56:48 -08:00 |
|
Isaac Connor
|
c2ff010d27
|
Support NULL in date/time values
|
2017-11-27 10:04:08 -08:00 |
|
Isaac Connor
|
106351a9f3
|
don't get zma status
|
2017-11-27 11:57:42 -05:00 |
|
Isaac Connor
|
81c46073a7
|
remove some brackets
|
2017-11-27 11:57:08 -05:00 |
|
Isaac Connor
|
99968dfa2a
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-27 11:28:36 -05:00 |
Isaac Connor
|
03c9f88d55
|
fix build on trusty
|
2017-11-27 08:24:14 -05:00 |
|
Isaac Connor
|
7c491bf62e
|
make compile on trusty
|
2017-11-26 18:06:12 -05:00 |
|
Isaac Connor
|
fc27674d76
|
can't do init in the if statement
|
2017-11-26 17:50:57 -05:00 |
|
Isaac Connor
|
428d923874
|
make StatusFIlter do something
|
2017-11-26 17:39:49 -05:00 |
|
Isaac Connor
|
39e490e5e5
|
fix monitor dropdown
|
2017-11-26 17:32:41 -05:00 |
|
Isaac Connor
|
4fbdacef05
|
fix event counts
|
2017-11-26 17:03:36 -05:00 |
|
Isaac Connor
|
dd3f9492ba
|
fix dulicate logic
|
2017-11-26 15:12:35 -05:00 |
|
Isaac Connor
|
4a884afecb
|
need the update file
|
2017-11-26 15:08:12 -05:00 |
|
Isaac Connor
|
d6bc727c9c
|
use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array
|
2017-11-26 11:12:00 -05:00 |
|
Isaac Connor
|
b1bb0020d3
|
turn off database debug
|
2017-11-24 15:42:44 -05:00 |
|
Isaac Connor
|
8a40a613bf
|
bump version
|
2017-11-24 15:42:20 -05:00 |
|
Isaac Connor
|
c0e49b65ef
|
stop writing env to /tmp/env
|
2017-11-24 15:38:07 -05:00 |
|
Isaac Connor
|
4b92a788f7
|
fix filter execute
|
2017-11-24 15:37:50 -05:00 |
|
Isaac Connor
|
7e3328fbb8
|
add styles to the html5 button element
|
2017-11-24 09:36:45 -05:00 |
|
Isaac Connor
|
a9f0f3813a
|
Merge branch 'tesla' into storageareas
|
2017-11-24 09:31:00 -05:00 |
|
Isaac Connor
|
07907b5c1c
|
Change from Warning to Debug
|
2017-11-24 09:28:24 -05:00 |
|
Isaac Connor
|
900fbe1e0f
|
update save to a button tag, and add a saveas functionality
|
2017-11-23 08:26:55 -08:00 |
|
Isaac Connor
|
485567349d
|
Don't calc DiskSpace if it is already defined
|
2017-11-23 07:29:05 -08:00 |
|
Isaac Connor
|
47b60e4215
|
bump up to 1.31.14
|
2017-11-23 09:02:09 -05:00 |
|
Isaac Connor
|
2a669896c2
|
Merge branch 'tesla' into storageareas
|
2017-11-23 08:42:53 -05:00 |
|
Isaac Connor
|
8e494ef431
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-23 08:40:49 -05:00 |
|
Isaac Connor
|
9d6b417b60
|
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
|
2017-11-22 17:03:37 -08:00 |
|
Isaac Connor
|
1fe421ed9d
|
add DiskSpace columns to Monitors
|
2017-11-22 14:22:12 -08:00 |
|
Isaac Connor
|
1745c83d2f
|
add eventcount columns to Monitors
|
2017-11-22 14:04:07 -08:00 |
|
Isaac Connor
|
02ec4bdebb
|
use StartDateTime instead of DateTime in filters, and get rid of Filters button at bottom
|
2017-11-22 13:49:46 -08:00 |
|
Isaac Connor
|
1392c1dfc2
|
put back missing test for if db is local
|
2017-11-22 12:36:04 -08:00 |
|
Isaac Connor
|
0eb2ae60f3
|
only try to write timecodes if the open was successful
|
2017-11-22 12:13:28 -08:00 |
|
Isaac Connor
|
3c55daaf36
|
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
|
2017-11-22 12:10:54 -08:00 |
|
Isaac Connor
|
9dd0f29e88
|
Merge branch 'storageareas' into tesla
|
2017-11-22 11:41:11 -08:00 |
|
Isaac Connor
|
121e64a8c6
|
turn on MOnitors dropdown in filters, an debug
|
2017-11-22 11:40:07 -08:00 |
|
Isaac Connor
|
b565125df9
|
montage layout improvements
|
2017-11-22 12:33:34 -05:00 |
|
Isaac Connor
|
11449b77a9
|
add debugging. increase concurrency of request queue
|
2017-11-22 11:46:24 -05:00 |
|
Isaac Connor
|
c284078db6
|
upgrade mootools to 1.6.0
|
2017-11-22 11:46:02 -05:00 |
|
Isaac Connor
|
fe42eed1ea
|
cannot unlink the lock file, it has to stick around.
|
2017-11-22 11:43:13 -05:00 |
|
Isaac Connor
|
cd1d2e1721
|
lots more debugging. re-add status update command on failure
|
2017-11-22 01:18:07 -05:00 |
|
Isaac Connor
|
d35edf29c6
|
bump version
|
2017-11-22 00:00:30 -05:00 |
|
Isaac Connor
|
095e1ecadb
|
remove extra ), add AnalysisFPS and CaptureFPS
|
2017-11-21 23:58:13 -05:00 |
|
Isaac Connor
|
e2aa278d78
|
add SaveJPEGs
|
2017-11-21 23:57:44 -05:00 |
|
Isaac Connor
|
3af52256b8
|
turn down debug
|
2017-11-21 23:57:34 -05:00 |
|
Isaac Connor
|
4d758b7ce9
|
debugging
|
2017-11-21 23:57:13 -05:00 |
|
Isaac Connor
|
ebe3073c59
|
only update fps if we have an image capture
|
2017-11-21 23:57:01 -05:00 |
|
Isaac Connor
|
a1fe0c4de3
|
store the value of saveJpegs in the event
|
2017-11-21 23:56:22 -05:00 |
|
Isaac Connor
|
bf6312a8ec
|
put back zma
|
2017-11-21 23:56:05 -05:00 |