Andrew Bauer
|
5833196a84
|
packpack - change error code handling
|
2017-01-16 08:36:46 -06:00 |
Andrew Bauer
|
000ba2300a
|
packpack - initial support for debian distros
|
2017-01-15 20:43:03 -06:00 |
Andy Bauer
|
3882b74766
|
rpm specfile - el6 buildrequires epel-rpm-macros
|
2017-01-15 16:39:38 -06:00 |
Andy Bauer
|
4325e8f7ea
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
|
2017-01-15 15:49:46 -06:00 |
Andy Bauer
|
49c35d5733
|
packpack - f24,f25,el7 confirmed working
|
2017-01-15 15:48:57 -06:00 |
Andrew Bauer
|
418995df84
|
rpm specfile changes
need to put this back in to maintain compatibility with packpack
|
2017-01-15 09:59:17 -06:00 |
Andrew Bauer
|
b3ee97ad11
|
Merge pull request #1753 from jbehrends/docker_apache_fix
Docker - Fixed broken cgi-bin path in apache site conf.
|
2017-01-14 20:38:33 -06:00 |
Josh Behrends
|
41f5ee5032
|
Fixed broken cgi-bin path
|
2017-01-14 16:35:46 -08:00 |
Andy Bauer
|
08d4d0c5c2
|
packpack - auto retrieve zmrepo rpm
|
2017-01-14 16:35:56 -06:00 |
Andy Bauer
|
7d91b4cdc7
|
minor changes to packpack patch
|
2017-01-14 16:24:55 -06:00 |
Isaac Connor
|
80c948b61e
|
Merge pull request #1751 from knnniggett/pp_files
initial commit for packpack support
|
2017-01-14 16:44:05 -05:00 |
Andrew Bauer
|
3ae7038e3b
|
make the build script executable
|
2017-01-14 14:15:54 -06:00 |
Andrew Bauer
|
105e43fafd
|
initial commit for packpack support
|
2017-01-14 14:14:41 -06:00 |
Andrew Bauer
|
c50cbc2b9e
|
Merge pull request #1749 from jbehrends/1747-docker-apache-config-fix
Fixed apache documentroot, and fixed permissions for "/" in the project's Dockerfile
|
2017-01-12 07:58:15 -06:00 |
Josh Behrends
|
2104561eca
|
Fixed apache documentroot, and fixed permissions for "/"
|
2017-01-11 19:49:29 -08:00 |
Andrew Bauer
|
2e730f0426
|
Merge pull request #1746 from connortechnology/fix_else
fix else behaviour by adding braces
|
2017-01-11 19:38:59 -06:00 |
Isaac Connor
|
7f059b750f
|
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
|
2017-01-11 14:25:46 -05:00 |
Isaac Connor
|
87daba346b
|
fix else behaviour by adding braces
|
2017-01-11 14:18:56 -05:00 |
Kyle Johnson
|
132249e96d
|
Merge pull request #1744 from connortechnology/fix_1743_Edimax
change regexp to handle quotes in the content-type line.
|
2017-01-11 07:42:28 -07:00 |
Isaac Connor
|
bc04cb2620
|
Merge pull request #1742 from knnniggett/controlcap_fix
fix conditional logic in controlcap.js
|
2017-01-11 09:13:43 -05:00 |
Isaac Connor
|
c0e929f136
|
change regexp to handle quotes in the content-type line. This is needed for edimax cameras
|
2017-01-11 09:11:27 -05:00 |
Andy Bauer
|
7ef7a36f39
|
fix conditional logic in controlcap.js
|
2017-01-10 17:53:05 -06:00 |
Andrew Bauer
|
01743b1fd9
|
Merge pull request #1741 from connortechnology/control_fixes
Control fixes
|
2017-01-10 17:33:09 -06: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 |
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 |
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 |
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
|
2a1ec2beb1
|
Merge pull request #1719 from knnniggett/hikvisionptz
Add HikVision ptz control sciprt
|
2017-01-03 08:59: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
|
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
|
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 |
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 |