Isaac Connor
|
22e957ba46
|
clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100%
|
2017-07-12 12:49:01 -04:00 |
|
Isaac Connor
|
0adc14da4e
|
fix links to Filter and Devices
|
2017-07-12 11:17:07 -04:00 |
|
Isaac Connor
|
c9689aa010
|
fix braces,spacing,quotes. Change form method to post
|
2017-07-12 10:58:20 -04:00 |
|
Isaac Connor
|
bd681de955
|
fix braces
|
2017-07-12 10:57:45 -04:00 |
|
Isaac Connor
|
220588a1c9
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-11 20:39:57 -04:00 |
|
Isaac Connor
|
4a90980fbe
|
add Id to Filters
|
2017-07-11 20:35:56 -04:00 |
|
Isaac Connor
|
046acbc05b
|
fix some field
|
2017-07-11 20:34:06 -04:00 |
|
Isaac Connor
|
6c68ca40e4
|
add some indexes
|
2017-07-11 20:33:09 -04:00 |
|
Isaac Connor
|
fed4dae7e5
|
fix width and height in options
|
2017-07-11 19:13:29 -04:00 |
|
Isaac Connor
|
148d7066f9
|
Merge branch 'master' into storageareas
|
2017-07-11 16:15:02 -04:00 |
|
Isaac Connor
|
a9e72288f6
|
add -safe 0 to ffmpeg command line option so that it will generate the concat file
|
2017-07-11 16:11:52 -04:00 |
|
Isaac Connor
|
888aa11ae3
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-11 15:02:29 -04:00 |
|
Isaac Connor
|
8497e4c24d
|
remove tilde
|
2017-07-11 14:59:55 -04:00 |
|
Isaac Connor
|
4d130b8595
|
updates to do_debian_package
|
2017-07-11 14:42:26 -04:00 |
|
Isaac Connor
|
64d990a65f
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-11 14:33:04 -04:00 |
|
Isaac Connor
|
786dcb0dc1
|
Add orientation to Events
|
2017-07-11 14:31:41 -04:00 |
|
Isaac Connor
|
d612a3fb99
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-11 14:29:03 -04:00 |
|
Isaac Connor
|
cb98e3faea
|
bump version to 1.31.3
|
2017-07-11 14:11:15 -04:00 |
|
Isaac Connor
|
dfd1c2844a
|
remove storageId
|
2017-07-11 11:28:15 -04:00 |
|
Isaac Connor
|
cfcf7363ea
|
Don't test the symlinks anymore
|
2017-07-11 11:18:47 -04:00 |
Joe Alamo
|
0faeef58c0
|
Update filterevents.rst (#1944)
State where filters are actually saved
|
2017-07-10 17:16:01 -04:00 |
|
Isaac Connor
|
0eb7bfabf2
|
put the ajax query back to a post
|
2017-07-07 12:15:09 -04:00 |
|
Isaac Connor
|
90882edc31
|
make montage images be display: block; This makes the layout not jump around when a camera feed dies
|
2017-07-07 10:05:20 -04:00 |
|
Isaac Connor
|
2dd8b5df1f
|
in dark and flat, the buttons use a larger font. The fixed size is not appropriate
|
2017-07-07 09:59:41 -04:00 |
|
Isaac Connor
|
39745e49d4
|
I think we switch to border-box model or something, anyways, the box that the pantilt buttons go in needs to be 100px not 96px
|
2017-07-07 09:51:51 -04:00 |
Andrew Bauer
|
e2810a858e
|
Merge pull request #1941 from connortechnology/logger_fix
add some comments and one change that may fix effectiveLevel use
|
2017-07-07 08:35:35 -05:00 |
|
Andrew Bauer
|
4128f5861f
|
Merge pull request #1940 from connortechnology/montagereview_rework
Montagereview rework
|
2017-07-07 08:34:01 -05:00 |
|
Isaac Connor
|
21881235f9
|
merge changeWidth and changeHeight
|
2017-07-07 09:31:53 -04:00 |
|
Andrew Bauer
|
5dcfa2f2d2
|
Merge pull request #1942 from connortechnology/strip_badchars_from_log
Strip non 7-bit ascii chars from log message
|
2017-07-07 08:31:41 -05:00 |
|
Isaac Connor
|
1f6aea0454
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-06 17:46:00 -04:00 |
|
Isaac Connor
|
d3ec50aa69
|
various fixes plus use global db functions in logger
|
2017-07-06 17:45:23 -04:00 |
|
Isaac Connor
|
323aedde4e
|
fix merge
|
2017-07-06 12:41:15 -04:00 |
|
Isaac Connor
|
2a71b0f170
|
Merge branch 'storageareas' into work_on_zms
|
2017-07-06 12:39:44 -04:00 |
|
Isaac Connor
|
f9be7f0fa0
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-06 11:58:57 -04:00 |
|
Isaac Connor
|
c2d21289e1
|
always offer to upload to zmrepo
|
2017-07-06 11:57:56 -04:00 |
|
Isaac Connor
|
50adec45c5
|
Strip non 7-bit ascii chars from log message
|
2017-07-06 11:45:17 -04:00 |
|
Isaac Connor
|
7533d09631
|
increase log query time minimum to 2 seconds. 1 is too frequent.
|
2017-07-06 11:42:35 -04:00 |
|
Isaac Connor
|
c2a042c0e7
|
replace with $)REQUEST so that logs can be query using a GET. Strip non-asci8bit chars from log message
|
2017-07-06 11:42:04 -04:00 |
|
Isaac Connor
|
c372787882
|
fix typo
|
2017-07-06 10:50:56 -04:00 |
|
Isaac Connor
|
4aba4178da
|
fix spacing
|
2017-07-06 10:50:07 -04:00 |
|
Isaac Connor
|
e892841d7e
|
Fix typo
|
2017-07-06 10:49:54 -04:00 |
|
Isaac Connor
|
cf0944f0ad
|
spacing and quotes
|
2017-07-06 10:49:36 -04:00 |
|
Isaac Connor
|
48d1174dd6
|
hide buttons when using videojs
|
2017-07-06 10:49:27 -04:00 |
|
Isaac Connor
|
48373f0d8b
|
fix filters on console. filter object now has terms under a Query array
|
2017-07-06 10:49:10 -04:00 |
|
Isaac Connor
|
5f03faa77e
|
view=frame needs more vertical space
|
2017-07-06 10:48:52 -04:00 |
|
Isaac Connor
|
874dc79948
|
tell eventdetail popup to close on save
|
2017-07-06 10:48:33 -04:00 |
|
Isaac Connor
|
3233105d2c
|
implement a way to tell a popup to close
|
2017-07-06 10:48:06 -04:00 |
|
Isaac Connor
|
9b4fb05d5b
|
Fix parseFilter because terms is now under Query
|
2017-07-06 10:47:47 -04:00 |
|
Isaac Connor
|
d892b94819
|
spacing
|
2017-07-06 09:38:30 -04:00 |
|
Isaac Connor
|
6d0dad38e0
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-05 15:34:35 -04:00 |