3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -05:00
6ee72aa2d9
Implement libswresample support as an alternative to libavresample, which is deprecated
2018-12-20 14:06:56 -05:00
3f1e495872
Add libswresample to dependencies
2018-12-20 13:41:09 -05:00
c1f46a9cb0
Update README.httpd
2018-12-15 16:29:44 -06:00
5a6e700c45
rpm packaging - update fcgiwrap socket location
...
I pushed a new fgciwrap package to Fedora and the socket file in the package is in a different location. See: https://bugzilla.redhat.com/show_bug.cgi?id=1655281
2018-12-14 20:27:12 -06:00
af6b709ae1
bump to 1.33.0 development
2018-12-11 09:28:48 -06:00
c3620672b3
1.32.3 release
2018-12-08 08:19:55 -06:00
16318ca3ef
Update zoneminder.spec
2018-12-07 09:59:28 -06:00
76e0782d97
rpm pkg - update nginx config
2018-12-01 09:58:12 -06:00
6ad54aad93
add libswscale5 to depends for ubuntu cosmic
2018-11-30 14:53:31 -05:00
279255d979
rpm pkg - update README
2018-11-30 08:58:42 -06:00
bfff07bb3e
rpm packaging - takes too long to set perms on events
2018-11-30 08:53:58 -06:00
79f804e94b
update rpm README
2018-11-29 10:43:22 -06:00
9f6a603d59
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2018-11-29 10:36:54 -06:00
81f345a9cd
Add dh-systemd and dh-apache2 to build depends
2018-11-28 10:08:27 -05:00
0b02996a3f
Update zoneminder.spec
2018-11-23 17:11:33 -06:00
4e2e0c1393
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2018-11-23 16:28:00 -06:00
7ca5fa2ff8
rpm - update README's again
2018-11-21 07:58:12 -06:00
daf813e877
spelling
2018-11-21 07:44:35 -06:00
fa37da3f1e
rpm - update README
2018-11-20 15:47:23 -06:00
fac9d69801
rpm - update README's
2018-11-20 15:36:34 -06:00
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
71bfd50b2c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2018-11-18 12:49:26 -06:00
f867d75522
rpm pkg - set ownership of events folder
2018-11-18 12:48:41 -06:00
d1219791cc
rpm pkg - fix api support in nginx config
2018-11-18 12:30:24 -06:00
689665cfcc
rpm pkg - fgciwrap service is instantiated
2018-11-18 11:41:20 -06:00
3b2bac0e41
rpm pkg - add missing asterisk
2018-11-18 11:31:04 -06:00
ac7a03233e
rpm pkg - change owership of log files
2018-11-18 11:20:47 -06:00
5e2935b81d
rpm pkg - change ownership of php session files
2018-11-18 11:16:46 -06:00
05c4f586c2
rpm pkg - httpd instead of apache
2018-11-18 10:15:27 -06:00
4144fe3292
rpm pkg - fix php-fpm config
2018-11-17 21:41:25 -06:00
abd178d421
rpm pkg - add nginx to apache group, rather than set folder perms
2018-11-17 19:46:15 -06:00
f9b61114e2
Update zoneminder.apache.tmpfiles.in
2018-11-17 15:33:52 -06:00
d3f45120f1
Update zoneminder.apache.tmpfiles.in
2018-11-17 15:25:51 -06:00
719bdf1270
rpm subpackages - add readme's
2018-11-17 11:52:04 -06:00
f79a7e49a8
rpm subpackages - additional fixes
2018-11-17 11:32:35 -06:00
7f7fc44b03
fix nameing of tmpfiles config
2018-11-17 11:01:12 -06:00
d06e1b075d
fix filename of com.zoneminder.systemctl.rules.nginx
2018-11-17 10:47:53 -06:00
ac0e8c9b0b
initial support for subpackages
2018-11-17 10:45:08 -06:00
b353b625eb
rpm - configure the nginx config file in all cases
2018-11-16 10:40:39 -06:00
8df9e4c1ee
Update zoneminder.logrotate.in
2018-11-15 20:18:56 -06:00
9b46c92ac5
rpm pkg - add note to zm php-fpm config file
2018-11-15 09:19:26 -06:00
2f8c0654d5
rpm pkg - fix for zm php-fpm config path
2018-11-15 08:31:04 -06:00
f2fc234880
rpm pkg - install zm php-fpm config in all cases for future nginx support
2018-11-15 08:26:54 -06:00
0a509561bb
allow libavresample-dev
2018-11-13 20:53:14 -05:00
d3064e4402
Update zoneminder.spec
2018-11-05 07:06:34 -06:00
b8066e66ed
Update zoneminder.spec
2018-11-05 06:51:08 -06:00
720505cbea
spelling
2018-11-04 17:14:46 -06:00
3aee902a96
update nginx support on redhat
2018-11-04 17:11:19 -06:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
5b93b77499
bump verion to 1.32.2
2018-10-13 13:36:15 -05:00
5c6cf88d93
bump version to 1.32.1
2018-10-02 07:37:55 -05:00
dbafffecb8
remove extra \
2018-09-26 16:20:08 -04:00
97e06bb0fd
rpm - update README's
2018-09-24 18:23:40 -05:00
7314926718
Detect mysql when mysql is run by sysv init scripts
2018-09-23 16:53:50 -04:00
4b2d4d3871
fix rpm specfile changelog
2018-09-12 12:44:36 -05:00
014202c41e
bump rpm specfile to 1.32.0
2018-09-12 07:08:58 -05:00
af32d59aa1
add libhuman-bytes-perl and libfile-slurp-file
2018-09-05 10:18:09 -04:00
36322f9129
rpm - use _pkgdocdir instead of _docdir
2018-09-01 12:15:08 -05:00
86f043633a
typo
2018-09-01 12:04:48 -05:00
563e673bee
rpm - rename README.xxx to README for all builds
2018-09-01 11:53:56 -05:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
029c6401af
add libjson-maybexs-perl as a debian package dependency
2018-08-31 09:34:54 -05:00
18c88be550
bump rpm specfile to 1.31.47
2018-08-31 07:59:51 -05:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
63153f05be
bump version in rpm specfile
2018-07-31 12:25:00 -05:00
18c3618e28
Arp tool ( #2155 )
...
* let cmake set path to arp
* declare cameras array
* fix probeV4L function
* typo
* fix another typo - my machine is possessed.
* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
a6b44d2ab5
remove jscalendar from rpm builds
2018-07-11 10:06:45 -05:00
14b83ac36b
Update zoneminder.spec
2018-07-03 16:10:06 -05:00
61fff1cd40
Update zoneminder.spec
2018-07-03 16:08:09 -05:00
5d0719f18d
fixes #2137
2018-07-01 08:16:06 -05:00
27b81bf463
rpm packaging - fedora requires php-json
2018-06-25 12:24:34 -05:00
50f81c50b2
Grant access to the new cache directory in Apache on Ubuntu ( #2130 )
...
This fixes a regression from #2083 and aligns with generate_apache_config.pl and the changes for Debian
2018-06-18 10:18:55 -04:00
2028012d39
Update README.Redhat7
2018-06-14 13:42:07 -05:00
8559dce350
rpm readme - mention changes to apache config file
2018-06-01 08:51:53 -05:00
00ace16b61
bump zoneminder rpm specfile
2018-05-31 13:54:33 -05:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
1907b18ac2
fix libnumber-bytes-human => libnumber-bytes-human-perl
2018-04-25 12:36:18 -04:00
600b66e27c
Update zoneminder.spec
2018-04-23 07:41:36 -05:00
02f8493b39
rpm packaging - remove support for sysvinit aka el6
2018-04-22 07:25:06 -05:00
85ba525496
rpm spec file - use %{_sourcedir} macro
2018-04-19 20:41:11 -05:00
9f74efd18a
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2018-04-19 18:41:16 -05:00
411a831338
rpm packaging - mention the firewall in the README's
2018-04-19 18:40:05 -05:00
2d2c0df8f1
rpm specfile - bump version
2018-04-19 15:39:08 -05:00
ed140426ab
rpm packaging changes and documentation
2018-04-19 15:36:43 -05:00
3c225c9f1c
Migrate Webcache out of webroot ( #2083 )
...
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
2018-04-19 15:01:46 -04:00
8eb4195cb7
rpm specfile - update git submodules
2018-04-18 15:00:55 -05:00
8c0ad8d1f3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-17 22:57:44 -04:00
456b1b59df
rpm specfile - bump crud to 3.1.0
2018-04-17 20:27:28 -05:00
48d5fa00d4
remove libsys-cpuload-perl as a dependency
2018-04-17 21:10:55 -04:00
3a80c60d2e
rpm spefile changes - account for new files
2018-04-17 15:13:38 -05:00
08447de7ca
bump rpm specfile version
2018-04-17 14:53:55 -05:00
279e437545
Put back zmupdate and do more output
2018-04-14 23:07:33 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
e28ecf8e28
add libfile-slurp-perl as a dependency
2018-04-05 10:00:14 -04:00
4d6e5d0ab6
Add libnumber-bytes-human-perl as a dependency
2018-03-28 08:21:17 -07:00
43bdaff0a3
Merge ../ZoneMinder.master into storageareas
2018-03-22 11:32:22 -04:00
Andrew Bauer
Isaac Connor
Andrew Bauer
Isaac Connor
Andrew Bauer
Matt N
Isaac Connor