967368ce07
testing
2017-11-30 22:18:33 -05:00
f2efc80f22
works?
2017-11-30 14:37:36 -05:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
1e50df741f
fix some memleaks
2017-11-28 09:50:09 -05:00
dfb69a2c5b
Merge branch 'tesla' into storageareas
2017-11-28 06:29:42 -05:00
9f57c819cd
Merge branch 'tesla' into zma_to_thread
2017-11-27 14:57:38 -05:00
00c5590a71
add Monitor count to servers
2017-11-27 11:56:48 -08:00
106351a9f3
don't get zma status
2017-11-27 11:57:42 -05:00
81c46073a7
remove some brackets
2017-11-27 11:57:08 -05:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
03c9f88d55
fix build on trusty
2017-11-27 08:24:14 -05:00
428d923874
make StatusFIlter do something
2017-11-26 17:39:49 -05:00
39e490e5e5
fix monitor dropdown
2017-11-26 17:32:41 -05:00
4fbdacef05
fix event counts
2017-11-26 17:03:36 -05:00
dd3f9492ba
fix dulicate logic
2017-11-26 15:12:35 -05:00
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
b1bb0020d3
turn off database debug
2017-11-24 15:42:44 -05:00
c0e49b65ef
stop writing env to /tmp/env
2017-11-24 15:38:07 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
7e3328fbb8
add styles to the html5 button element
2017-11-24 09:36:45 -05:00
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -08:00
2a669896c2
Merge branch 'tesla' into storageareas
2017-11-23 08:42:53 -05:00
8e494ef431
Merge branch 'storageareas' into zma_to_thread
2017-11-23 08:40:49 -05:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
02ec4bdebb
use StartDateTime instead of DateTime in filters, and get rid of Filters button at bottom
2017-11-22 13:49:46 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
121e64a8c6
turn on MOnitors dropdown in filters, an debug
2017-11-22 11:40:07 -08:00
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
11449b77a9
add debugging. increase concurrency of request queue
2017-11-22 11:46:24 -05:00
c284078db6
upgrade mootools to 1.6.0
2017-11-22 11:46:02 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
095e1ecadb
remove extra ), add AnalysisFPS and CaptureFPS
2017-11-21 23:58:13 -05:00
e2aa278d78
add SaveJPEGs
2017-11-21 23:57:44 -05:00
e617ffca2d
can't use BASE_URL since it will be empty. Have to construct a full URL when using MIN_STREAMING_PORT
2017-11-21 21:00:27 -05:00
8b49a475d4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-21 19:55:48 -05:00
c6515b7564
Merge branch 'storageareas' into zma_to_thread
2017-11-21 12:28:41 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
e14c21fdbe
Fix dark theme archive highlight
...
Another bad copy
2017-11-21 10:37:09 -05:00
5f0d1b4720
Fix bad copy
2017-11-21 10:28:27 -05:00
ff7e104f1b
Merge fix
...
This editor is fun!
2017-11-20 20:42:28 -05:00
6eb542f0e2
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:19:27 -05:00
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
43b71fc49b
rework
2017-11-20 15:32:40 -05:00
b655689f47
Fix cache_bust
...
Cache busting was preventing changing css due to leaving symlinks behind. Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
b58efe6a36
Fix classic/dark dvr buttons centering
2017-11-20 09:45:14 -05:00
73d6b0e198
Fix sidebar in dark theme
...
Sidebar in dark theme had a scrollbar when main content was shorter than menu content
2017-11-19 09:14:19 -05:00
d8af654338
Fix dvrControls on watch view
2017-11-18 14:05:11 -05:00
Isaac Connor
Isaac Connor
Isaac Connor
digital-gnome