Commit Graph

1192 Commits

Author SHA1 Message Date
Andrew Bauer c55b80beab rpmspecfile - generate ssl cert for both apache and nginx 2021-01-31 16:14:39 -06:00
Isaac Connor be95bd2fa7 deprecate python-sphinx in favour of python3-sphinx. Remove mp4v2 and libx264 2021-01-28 16:17:15 -05:00
Isaac Connor 4dcce4ac95 Merge branch 'rtsp_server' 2021-01-26 14:22:10 -05:00
Isaac Connor 671d58f0d0 bump version and put back ZM_MIN_RTSP_PORT setting 2021-01-26 12:35:17 -05:00
Andrew Bauer 0b35a6f09a remove mootools from debian packaging 2021-01-18 07:59:54 -06:00
Andrew Bauer b9c0823774 don't install tools folder 2021-01-18 07:41:08 -06:00
Isaac Connor a1917d83d0 Merge branch 'master' into zma_to_thread 2020-12-22 19:52:09 -05:00
Andrew Bauer 24d558b31a
spelling 2020-12-19 12:14:56 -06:00
Andrew Bauer 96ade2f9d0 update rpm nginx readme 2020-12-19 10:09:12 -06:00
Andrew Bauer 80afbbd9ce fixup rpmspecfile cert generation 2020-12-19 08:11:20 -06:00
Isaac Connor 2936d64b91 Always take ownership of dirs in /var/cache/zoneminder. The previous behaviour would have only done it on a new install. Fixes #3096 2020-12-18 10:54:08 -05:00
Isaac Connor 0702b64cc4 Merge branch 'master' into zma_to_thread 2020-12-15 10:51:40 -05:00
Isaac Connor 5c1135b2a7 Merge branch 'master' into no_decode 2020-12-10 15:15:32 -05:00
Isaac Connor b261fbb397 Merge branch 'master' into zma_to_thread 2020-12-07 16:26:26 -05:00
Isaac Connor 7ef34bce7b Include new fonts dir in install 2020-12-03 13:30:51 -05:00
Isaac Connor 1c45019eeb Bump version to 1.35.15 2020-12-03 13:16:42 -05:00
Isaac Connor bbc2c2a607 Crud has more than 1 friend 2020-11-12 13:27:10 -05:00
Isaac Connor df783f4835 Merge branch 'master' into zma_to_thread 2020-11-12 12:53:55 -05:00
Isaac Connor 7faf774cd0 Use FriendsOfCake crud 3.2.0 2020-11-12 09:15:02 -05:00
Isaac Connor a3a6d94b6f bump version to 1.15.14 2020-11-06 14:16:34 -05:00
Isaac Connor 3e5f87cb41 Bump version to 1.35.13 2020-11-04 14:42:01 -05:00
Isaac Connor 9a9f80c15c show which user we are updating permissions for 2020-10-28 14:07:29 -04:00
Isaac Connor 86bf491fe1 Add Locking to filters, bump db to 1.35.12. 2020-10-28 12:55:32 -04:00
Isaac Connor 4c92c99ba1 bump version for 1.35.11 db updates 2020-10-28 12:39:50 -04:00
Isaac Connor 59884375fa Add references permission so that our zmupdate can add foreign keys 2020-10-28 09:23:46 -04:00
Isaac Connor 2eda49333f Merge branch 'master' into zma_to_thread 2020-10-20 16:20:29 -04:00
Isaac Connor 8227de8642 bump version to 1.35.10 to pick up Filter AutoUnarchive column 2020-10-12 11:04:16 -04:00
Isaac Connor faade3ea15 Enable dependencies for vnc monitor type in buster/focal and newer 2020-10-07 10:52:59 -04:00
Isaac Connor 7261a7b1dd Merge branch 'sessions_in_db' 2020-10-02 15:57:11 -04:00
Isaac Connor a58e5e96d7 bump version 2020-10-02 15:57:05 -04:00
Isaac Connor fb0fae7b20 buster only has libjpeg62-turbo-dev 2020-10-02 15:22:43 -04:00
Isaac Connor 4b10d22ea8 correct the version on libjpeg-turbo 2020-10-02 12:55:44 -04:00
Isaac Connor d139dc010b prefer libjpegturbo to libjpeg8 or 9 2020-10-01 13:47:39 -04:00
Isaac Connor 63e42ca651 Still need libjpeg 2020-10-01 12:57:46 -04:00
Isaac Connor 3eae356ed7 Bump to 1.35.8. Change table engine to InnoDb for Monitor_Status. 2020-09-30 09:39:31 -04:00
Isaac Connor 02d4785e71 Split out user creation/updating into it's own function 2020-09-29 17:26:55 -04:00
Isaac Connor a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Isaac Connor 37b0fc4bbd bump version to pickup geolocation updates 2020-09-28 09:34:08 -04:00
Isaac Connor f7ec83323d Fix conditional 2020-09-23 16:16:30 -04:00
Isaac Connor ab513689f4 Don't auto-start zoneminder. DEBHELPER appears to add lines that already do it and they conflict. 2020-09-23 16:12:21 -04:00
Isaac Connor a68c95ba73 fix logic on systemd and mysql/mariadb existence 2020-09-23 16:07:46 -04:00
Isaac Connor 5410fcf18c Detect systemd and fall back to sysV. We do this for beowulf and WSL 2020-09-23 14:41:26 -04:00
Isaac Connor 04aab54044 Detect systemd and use sysV style commands if it isn't 2020-09-23 11:31:16 -04:00
Isaac Connor 45cc4dd531 put back sysV init script for beowulf/wsl 2020-09-23 11:30:40 -04:00
Andrew Bauer f7cbc2f5e0 remove uneeded setconfig options in redhat specfil 2020-09-19 09:10:16 -05:00
Andrew Bauer b3c5a985ed use BindsTo in redhat systemd service file 2020-09-17 09:16:28 -05:00
Isaac Connor b4fbe84f6b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-26 13:31:36 -04:00
Isaac Connor abebc74e1e sphinx-build is in python3-sphinx 2020-08-26 13:31:32 -04:00
Andrew Bauer f003dd7782 remove zoneinder-upload folder from cmakelists 2020-08-25 16:57:06 -05:00
Isaac Connor 3d3dde22c4 Use zm_session_start 2020-08-25 11:31:06 -04:00