Isaac Connor
|
9748b9346e
|
bump required version to 3.1 so that we can use a simple statement to turn on c++11 features
|
2017-01-08 16:52:16 -05: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 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
|
Isaac Connor
|
a490d02d1c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-01-02 09:34:08 -05:00 |
|
Isaac Connor
|
da1d801935
|
Merge branch 'path_zms_message' of github.com:ConnorTechnology/ZoneMinder into path_zms_message
|
2017-01-02 09:32:43 -05:00 |
|
Isaac Connor
|
ef71ae248c
|
fix ramSocketFile to remSocketFile
|
2017-01-02 09:31:26 -05:00 |
|
Isaac Connor
|
d97926c478
|
fix ramSocketFile to remSocketFile
|
2017-01-02 09:31:06 -05:00 |
Stefan Lindblom
|
09fae00c13
|
Add MonitorPreset for Qihan IP cameras via RTSP
|
2017-01-02 09:09:53 +01:00 |
|
Isaac Connor
|
e36ae592cb
|
Merge pull request #1724 from kylejohnson/issue-template
Initial commit of github issue template.
|
2016-12-31 21:59:03 -05:00 |
Kyle Johnson
|
bcad334c2b
|
Initial commit of github issue template.
|
2016-12-31 08:50:39 -07:00 |
|
Andrew Bauer
|
67b5444a98
|
Merge pull request #1721 from ka7/spelling
spelling fixes
|
2016-12-29 07:01:33 -06:00 |
klemens
|
0d549f1db3
|
spelling fixes
|
2016-12-29 10:31:05 +01:00 |
|
Andrew Bauer
|
76db2e811d
|
more rpm specfile changes
|
2016-12-28 09:27:30 -06:00 |
|
Andrew Bauer
|
ea0cfad37c
|
update rpm specfile
|
2016-12-27 09:06:50 -06:00 |
|
Andy Bauer
|
25ab1bee18
|
more fixed to gpl license text
|
2016-12-26 10:40:09 -06:00 |
|
Andy Bauer
|
0f15b3ae62
|
update gpl 2 mailing address
|
2016-12-26 10:33:03 -06:00 |
|
Andrew Bauer
|
a008b0ca76
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
|
2016-12-26 10:08:31 -06:00 |