Isaac Connor
|
33ce55584f
|
Merge branch 'master' into storageareas
|
2017-07-26 10:48:42 -04:00 |
|
Isaac Connor
|
30057ddffe
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-07-26 10:38:25 -04:00 |
|
Isaac Connor
|
1cfd657168
|
put back the preg_replace that strips usernames and passwords from monitor source
|
2017-07-26 10:22:57 -04:00 |
|
Isaac Connor
|
cfbfc0dd44
|
Merge branch 'master' into storageareas
|
2017-07-21 11:04:32 -04:00 |
|
Isaac Connor
|
3bd9d96027
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-07-21 10:54:57 -04:00 |
|
Isaac Connor
|
efb02f3368
|
fix indent
|
2017-07-21 10:54:48 -04:00 |
|
Isaac Connor
|
457d909c88
|
fix quotes
|
2017-07-21 10:54:33 -04:00 |
Andrew Bauer
|
5cf2be528a
|
Merge pull request #1950 from connortechnology/fix_api_logs
fix path to logs for api
|
2017-07-14 13:19:12 -05:00 |
|
Andrew Bauer
|
c98255dd75
|
Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column
Fix empty monitor source column
|
2017-07-14 13:10:52 -05:00 |
|
Isaac Connor
|
b030fee429
|
don't do csrf checks for control commands
|
2017-07-14 12:29:24 -04:00 |
|
Isaac Connor
|
240a990c7f
|
fix writing to config
|
2017-07-14 12:19:43 -04:00 |
|
Isaac Connor
|
e203064bf7
|
updates bootstrap.php.in to match config.php's conf.d loading
|
2017-07-14 12:03:00 -04:00 |
|
Isaac Connor
|
13a72b7a99
|
fix path to logs for api
|
2017-07-14 11:58:15 -04:00 |
|
Isaac Connor
|
1a8638f3dd
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
|
2017-07-14 11:50:01 -04:00 |
|
Isaac Connor
|
9824049c0c
|
fix conf.d loading in api
|
2017-07-14 11:46:36 -04:00 |
|
Andrew Bauer
|
89bcfc4e28
|
fix incorrect gpl license text mailing address
|
2017-07-14 10:39:50 -05:00 |
|
Isaac Connor
|
d13d7e9050
|
recode the bit that outputs the link under source so that it defaults to Monitor # under all situations
|
2017-07-14 09:57:25 -04:00 |
|
Isaac Connor
|
0e54d4e69a
|
imposing a height on the textpanel causes the text to overflow
|
2017-07-14 09:26:56 -04:00 |
|
Isaac Connor
|
df0497b3a7
|
always use onmouseover, as we can now pull images fairly quickly from the mp4
|
2017-07-14 09:25:53 -04:00 |
|
Isaac Connor
|
8bbad9adf8
|
braces, spaces
|
2017-07-13 17:35:06 -04:00 |
|
Isaac Connor
|
a16d01a931
|
use less ram loading events
|
2017-07-13 17:34:45 -04:00 |
|
Isaac Connor
|
63e974192c
|
handle case when no filter is specified
|
2017-07-13 14:57:27 -04:00 |
|
Isaac Connor
|
37003aebcf
|
Merge branch 'master' into storageareas
|
2017-07-13 11:07:06 -04:00 |
|
Isaac Connor
|
f7a99a1106
|
make montagereview not load all events and frames at once, so that it doesn't use up all memory
|
2017-07-13 11:06:08 -04:00 |
|
Isaac Connor
|
0df6ac2895
|
Merge branch 'master' into storageareas
|
2017-07-13 11:04:51 -04:00 |
|
Isaac Connor
|
403dca78fb
|
break up a long line
|
2017-07-13 10:26:24 -04:00 |
|
Isaac Connor
|
a5f9c01298
|
fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected
|
2017-07-13 10:26:09 -04:00 |
|
Isaac Connor
|
cb88952a77
|
braces and spacing
|
2017-07-13 10:25:14 -04:00 |
|
Isaac Connor
|
aff7e94725
|
default to TCP for Method
|
2017-07-13 10:23:30 -04:00 |
|
Isaac Connor
|
363303efa9
|
use isset instead of empty to get rid of warning
|
2017-07-13 10:08:36 -04:00 |
|
Isaac Connor
|
f294acde92
|
add global and for including the state view
|
2017-07-13 10:07:23 -04:00 |
|
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
|
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
|
dfd1c2844a
|
remove storageId
|
2017-07-11 11:28:15 -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
|
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 |
|
Isaac Connor
|
d3ec50aa69
|
various fixes plus use global db functions in logger
|
2017-07-06 17:45:23 -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 |