Isaac Connor
|
d2ff6701f4
|
test
|
2017-01-10 13:53:02 -05:00 |
|
Isaac Connor
|
b3c5f4622f
|
revert knnniggett's zmMemDetach changes
|
2017-01-10 12:56:19 -05:00 |
|
Isaac Connor
|
3074263e06
|
Merge branch 'control_fixes' into storageareas
|
2017-01-10 12:54:46 -05:00 |
|
Isaac Connor
|
55403219d8
|
fix regexp for direction in control command. Also log if the regexp doesn't match
|
2017-01-10 12:35:38 -05:00 |
|
Isaac Connor
|
fea5fa1b59
|
fix xtell should be -1 for move left
|
2017-01-10 12:35:02 -05:00 |
|
Isaac Connor
|
66cdcd95fa
|
Merge branch 'master' into fix_mmap_leak
|
2017-01-10 08:47:46 -05:00 |
Andrew Bauer
|
03d71695e0
|
Merge pull request #1727 from StefanLindblom/1726-monitor-preset-qihan
Add MonitorPreset for Qihan IP cameras via RTSP
|
2017-01-10 07:36:59 -06:00 |
Stefan Lindblom
|
40d3da3521
|
Merge branch '1726-monitor-preset-qihan' of https://github.com/StefanLindblom/ZoneMinder into 1726-monitor-preset-qihan
|
2017-01-10 12:06:48 +01:00 |
|
Stefan Lindblom
|
fa416ef889
|
Add MonitorPreset for Qihan IP cameras via RTSP
|
2017-01-10 12:02:47 +01:00 |
|
Isaac Connor
|
d8b8d78576
|
Fix storagearea lookup. Default to ZM_EVENTS_DIR
|
2017-01-09 16:35:58 -05:00 |
|
Isaac Connor
|
03fd964518
|
fix parsing StorageID
|
2017-01-09 14:59:14 -05:00 |
|
Isaac Connor
|
7ef0c2c9d3
|
fix deleting filters. We don't need to set fid anymore
|
2017-01-09 14:58:55 -05:00 |
|
Isaac Connor
|
cc724a5542
|
add a question mark to delete confirmation
|
2017-01-09 14:53:13 -05:00 |
Andrew Bauer
|
06fd760a2a
|
rpm specfile- use %{_localstatedir} macro
|
2017-01-09 09:07:05 -06:00 |
Andrew Bauer
|
dc6b2ed114
|
clean up unnessary requires
|
2017-01-08 18:17:28 -06:00 |
|
Andrew Bauer
|
6b7e3a1b61
|
rpm specfile changes
|
2017-01-08 17:37:03 -06:00 |
|
Isaac Connor
|
99e823ef33
|
Merge branch 'zmtelemetry_improvements' into storageareas
|
2017-01-08 11:04:59 -05:00 |
|
Isaac Connor
|
27760ffce2
|
move pod below __END__ and improve it to include options. Add help option.
|
2017-01-08 10:12:25 -05:00 |
|
Isaac Connor
|
b3a07c27b8
|
Add test for lastCheck being in the future. print out a notice when we are sleeping and are being run from a terminal.
|
2017-01-08 09:40:09 -05:00 |
|
Isaac Connor
|
146a772a21
|
move ENDPOINT to hidden category
|
2017-01-06 19:49:03 -05:00 |
|
Isaac Connor
|
03b19bc1fd
|
when run from terminal, output a line that says that we are sleeping
|
2017-01-06 18:40:39 -05:00 |
|
Isaac Connor
|
7f2fcddc03
|
revert print to Info
|
2017-01-06 18:39:08 -05:00 |
Isaac Connor
|
dccd1e9732
|
fix
|
2017-01-05 13:54:34 -05:00 |
|
Isaac Connor
|
2bc47a000c
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 11:31:41 -05:00 |
|
Isaac Connor
|
71ad08613e
|
fix
|
2017-01-05 11:30:01 -05:00 |
|
Isaac Connor
|
426eabb12d
|
if running from a terminal, set termLevel to info
|
2017-01-05 11:24:53 -05:00 |
|
Isaac Connor
|
db1a6f9b3b
|
fix to remove qqq
|
2017-01-05 11:24:27 -05:00 |
|
Isaac Connor
|
d1ed472db0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 10:09:11 -05:00 |
|
Isaac Connor
|
75cd1de7ab
|
show the # of entries loaded and saved
|
2017-01-05 09:42:11 -05:00 |
|
Isaac Connor
|
0c34aa9830
|
Merge branch 'zmtelemetry_improvements' into storageareas
|
2017-01-04 12:25:01 -05:00 |
|
Isaac Connor
|
09783a1a39
|
add some command line options and use the INTERVAL and ENDPOINT from the Config hash
|
2017-01-04 12:22:40 -05:00 |
|
Isaac Connor
|
cf9747054c
|
add ZM_TELEMETRY_INTERVAL AND ENDPOINT
|
2017-01-04 12:22:01 -05:00 |
|
Andrew Bauer
|
0d7e1bcbc5
|
add php as a dependency only when we aren't using nginx
|
2017-01-04 10:49:22 -06:00 |
|
Andrew Bauer
|
8ea4bdca1d
|
explicity set index.php as the only directoryindex
|
2017-01-04 10:45:36 -06:00 |
|
Andy Bauer
|
7e7ef46420
|
rpm packaging - remove rundir from tmpfiles.d
|
2017-01-03 16:42:12 -06:00 |
|
Andy Bauer
|
b4f537c5d3
|
rpm build tweaks based on rpmfusion feedback
|
2017-01-03 13:12:12 -06:00 |
|
Isaac Connor
|
84183c819c
|
Merge branch 'master' into storageareas
|
2017-01-03 09:53:09 -05:00 |
|
Isaac Connor
|
2a1ec2beb1
|
Merge pull request #1719 from knnniggett/hikvisionptz
Add HikVision ptz control sciprt
|
2017-01-03 08:59:56 -05:00 |
|
Isaac Connor
|
b4bddee337
|
Merge branch 'master' into improve_filter
|
2017-01-03 08:49:56 -05:00 |
|
Andrew Bauer
|
cce87dd202
|
Merge pull request #1729 from connortechnology/fix_events_list
Fix events list
|
2017-01-02 20:36:21 -06:00 |
|
Andrew Bauer
|
2e198875f6
|
Merge pull request #1733 from connortechnology/zmcamtool_silence_warnings
When use warnings is on and there is a null value in the monitor data…
|
2017-01-02 14:03:32 -06:00 |
|
Isaac Connor
|
b52e826773
|
add update file to change MonitorIds from tinytext to text
|
2017-01-02 13:03:42 -05:00 |
|
Isaac Connor
|
649b801e91
|
change type of MonitorIds from tinytext to text
|
2017-01-02 13:03:37 -05:00 |
|
Isaac Connor
|
ac88490338
|
When use warnings is on and there is a null value in the monitor data it causes warnings. So add skip if __git_main is not defined.
|
2017-01-02 12:49:37 -05:00 |
|
Andrew Bauer
|
3042b39672
|
Update zoneminder.spec
rpmspecfile don't glob zoneminder's binaries
|
2017-01-02 11:41:14 -06:00 |
|
Andy Bauer
|
c594ad8be7
|
rpmspec - remove quotes from pidfile path
|
2017-01-02 10:37:23 -06:00 |
|
Isaac Connor
|
0a90dbac9f
|
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
|
2017-01-02 10:35:51 -05:00 |
|
Isaac Connor
|
30674919c4
|
always include Storage object, because in the end we will be using it everywhere
|
2017-01-02 10:34:45 -05:00 |
|
Isaac Connor
|
f6ea52280a
|
Update Event object to @iconnor's latest which brings us a createListThumbnail function copied from includes/functions
|
2017-01-02 10:34:15 -05:00 |
|
Andrew Bauer
|
b063d8d6aa
|
Merge pull request #1728 from connortechnology/path_zms_message
Path zms message
|
2017-01-02 08:54:32 -06:00 |