c75cd1ecc9
bump version to pick up new ONVIF fields
2020-05-12 18:45:14 -04:00
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
0412f04592
Merge branch 'release-1.34'
2020-05-08 17:25:14 -04:00
f101e58480
Split db user creation and permission granting into two commands, as needed by newer mysql. Also auto-install apache rewrite module for api.
2020-05-08 17:20:41 -04:00
00c9624868
Update postinst for mysql8. Can't set permissions and create user in one line.
2020-05-08 17:17:36 -04:00
05ccdb9bed
libswresample is at version 3. libavresample is 4.
2020-05-08 10:36:07 -04:00
d281d2243c
bump version so that Frames.Id update runs
2020-05-05 18:05:23 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
6e38a820bd
Bump version to 10.34.10 for release
2020-04-23 18:28:26 -04:00
8e06a5698f
Add new cleaned up rules for focal and buster
2020-04-23 15:02:22 -04:00
38f559b34b
deprecate ubuntu trusty and precise
2020-04-23 15:00:28 -04:00
28e21fb0b1
Bump version to 1.34.9
2020-04-04 12:13:07 -04:00
593ea24cc6
add libvnc dependencies for VNC monitor type
2020-03-30 12:42:27 -04:00
dd9c578be6
bumpv ersion to 1.35.2
2020-03-27 14:48:20 -04:00
a555e09cad
Bump version to 1.34.8. Please note that the lack of zm-update-1.34.8.sql is intentional. It is not needed as there are no db updates
2020-03-27 13:15:11 -04:00
c880793fdc
bump version to 1.34.7
2020-03-26 15:34:36 -04:00
6d787fd77e
Bump version for 1.34.6
2020-03-06 14:52:38 -05:00
8300b94382
bump version to 1.35.1
2020-03-05 15:50:02 -05:00
52cb2441f0
Bump version to 1.34.5 for release
2020-02-25 20:46:59 -05:00
e630550d0f
bump version for release 1.34.4
2020-02-24 14:44:19 -05:00
17eca9f495
bump version to 1.35.0 for db upgrade
2020-02-19 14:50:16 -05:00
ea2eba4110
bump version to 1.34.3
2020-02-19 13:50:27 -05:00
4d82a5485a
rpm specfile
...
I have to use my contact info for rpmfusion
2020-02-08 10:46:54 -06:00
b7ad7ab1fc
release 1.34.2
2020-02-04 16:47:39 -05:00
9a71ca9a2f
update specfile changelog
2020-01-31 19:25:35 -06:00
fb5111ffe4
bump version to 1.34.1 for release
2020-01-24 17:01:47 -05:00
0992928089
merge rpm changelog from RPMFusion
2020-01-18 11:00:00 -06:00
d4bc0bf72b
bump version for release to 1.34.0
2020-01-15 17:31:06 -05:00
8dfe7460f3
revert bogus change
2020-01-11 10:21:29 -05:00
80c95d5afe
Merge branch 'master' into wip_axisv2
2020-01-10 17:20:32 -05:00
c3f8d9c364
add php5-json as a dependency
2020-01-07 12:08:08 -05:00
06f846c88b
add php-json to depends
2020-01-02 16:52:09 -05:00
ec76ffe720
update redhat README's
2019-12-30 08:53:34 -06:00
276428be59
el8 needs php-json
2019-12-27 16:39:24 -06:00
34354f5871
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
2019-12-18 12:13:00 -05:00
2aef547f37
add changelog about bump to 1.33.15
2019-12-08 11:01:46 -05:00
86fc852621
bump version in zoneminder.spec
2019-12-08 10:59:50 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
0f1b186eb1
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-10-18 09:29:42 -04:00
0e6e572e45
add libdatetime-perl to depends. Is used in control modules
2019-10-17 16:35:23 -04:00
fd480110d9
Make Isaac the upload/maintainer
2019-10-16 09:16:22 -04:00
61a7c008eb
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-09-25 10:36:52 -04:00
240a355b72
list me as maintainer and uploader
2019-09-21 12:10:33 -04:00
4db931aac8
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-09-15 18:01:52 -04:00
193a71dfbd
add libavresample-dev to depends
2019-09-13 16:10:15 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
f813741730
Add maxage 7 to logrotate config so that it will clear out all the zms_e logs.
2019-08-16 11:31:27 -04:00
d75d64280d
Update zoneminder.spec
2019-08-11 15:03:15 -05:00
255f606ebf
bump rpm specfile
2019-07-07 07:33:50 -05:00
73b5d506b4
Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
2019-06-24 09:33:54 -04:00
645d13c752
bump rpm specfile to 1.33.9
2019-06-23 12:16:15 -05:00
0699b21017
Remove libjson-any-perl as a dependency. Fixes #2630
2019-06-03 09:45:50 -04:00
94f2c76562
fix trailing whitespace
2019-05-27 12:31:53 -04:00
c4d76f03c9
Introduce ZM_PATH_SHUTDOWN to cmake config
2019-05-27 12:09:32 -04:00
3b5b63d9cb
add libx264-155 to possible dependencies. Fixes #2596
2019-05-24 14:09:46 -04:00
4b1284b8ad
fix merge
2019-05-24 13:57:40 -04:00
1ddd5b1f74
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-05-24 13:56:30 -04:00
fc27393a96
Replace MySQL Password() with bcrypt, allow for alternate JWT tokens ( #2598 )
...
* added sha1 and bcrypt submodules
* added bcrypt and sha to src build process
* added test sha1 and bcrypt code to validate working
* bcrypt auth migration in PHP land
* added include path
* add sha source
* added bcrypt to others
* put link_dir ahead of add_executable
* fixed typo
* try add_library instead
* absolute path
* absolute path
* build bcrypt as static
* move to wrapper
* move to fork
* logs tweak
* added lib-ssl/dev for JWT signing
* Moved to openSSL SHA1, initial JWT plugin
* removed vog
* fixed SHA1 algo
* typo
* use php-jwt, use proper way to add PHP modules, via composer
* fixed module path
* first attempt to fix cast error
* own fork
* own fork
* add composer vendor directory
* go back to jwt-cpp as PR merged
* moved to jwt-cpp after PR merge
* New token= query for JWT
* Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading
* JWT integration, validate JWT token via validateToken
* added token validation to zms/zmu/zmuser
* add token to command line for zmu
* move decode inside try/catch
* exception handling for try/catch
* fix db read, forgot to exec query
* remove allowing auth_hash_ip for token
* support refresh tokens as well for increased security
* remove auth_hash_ip
* Error out if used did not create an AUTH_HASH_SECRET
* fixed type conversion
* make sure refresh token login doesn't generate another refresh token
* fix absolute path
* move JWT/Bcrypt inside zm_crypt
* move sha headers out
* move out sha header
* handle case when supplied password is hashed, fix wrong params in AppController
* initial baby step for api tab
* initial plumbing to introduce token expiry and API bans per user
* remove M typo
* display user table in api
* added revoke all tokens code, removed test code
* use strtoul for conversion
* use strtoul for conversion
* use strtoul for conversion
* more fixes
* more fixes
* add mintokenexpiry to DB seek
* typo
* add ability to revoke tokens and enable/disable APIs per user
* moved API enable back to system
* comma
* enable API options only if API enabled
* move user creation to bcrypt
* added password_compat for PHP >=5.3 <5.5
* add Password back so User object indexes don't change
* move token index after adding password
* demote logs
* make old API auth optional, on by default
* make old API auth mechanism optional
* removed stale code
* forgot to checkin update file
* bulk overlay hash mysql encoded passwords
* add back ssl_dev, got deleted
* fix update script
* added token support to index.php
* reworked API document for new changes in 2.0
* Migrate from libdigest to crypt-eks-blowfish due to notice
* merge typo
* css classess for text that disappear
* fixed html typo
* added deps to ubuntu control files
* spaces
* removed extra line
* when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist
* add libssl1.0.0 for ubuntu 16/12
* small API fixes
* clean up of API, remove redundant sections
* moved to ZM fork for bcrypt
* whitespace and google code style
* regenerate auth hash if doing password migration
* dont need AUTH HASH LOGIN to be on
* Add auth hash verification to the user logged in already case
* fix missing ]
* reject requests if per user API disabled
2019-05-24 13:48:40 -04:00
34370e0060
test for error code from db creation and if there is an error, die with an error code. ( #2611 )
2019-05-24 13:47:07 -04:00
2ce2381269
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-19 08:45:42 -04:00
33db7e1e35
add libssl1.0.0 for ubuntu 16/12
2019-05-18 13:47:31 -04:00
304192472d
removed extra line
2019-05-17 12:02:24 -04:00
682d95470d
spaces
2019-05-17 11:47:20 -04:00
88a58243bc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 11:24:40 -04:00
e2dd11fdd4
added deps to ubuntu control files
2019-05-17 11:21:07 -04:00
e9ff1f46f1
Add missing deps to ubuntu versions of control
2019-05-17 11:13:45 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
84b389a2bc
Merge branch 'test_error_db_creation' into storageareas
2019-05-17 10:16:26 -04:00
17e0b4ac4b
test for error code from db creation and if there is an error, die with an error code.
2019-05-17 08:34:19 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
0e72080c4a
Migrate from libdigest to crypt-eks-blowfish due to notice
2019-05-16 09:37:11 -04:00
4a2ac470ee
add back ssl_dev, got deleted
2019-05-13 14:32:48 -04:00
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
87e407aa90
forgot to checkin update file
2019-05-13 10:31:09 -04:00
74095963cc
Merge branch 'master' into storageareas
2019-05-12 19:39:09 -04:00
7603e94e90
added lib-ssl/dev for JWT signing
2019-05-03 16:57:43 -04:00
74bd812632
rpm packaging - buildrequire zlib-devel
2019-05-03 09:07:19 -05:00
8b1565c41d
Change pid path to /run/zm/zm.pid instead of /var/run/zm/zm.pid. systemd now complains about the use of a legacy directory, so this quiets that.
2019-05-02 10:52:19 -04:00
ed02ef39f1
bump rpm specfile
2019-04-30 18:11:38 -05:00
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -04:00
4b2fe5c3c7
Update zoneminder.spec
2019-04-07 18:21:52 -05:00
593f1571e3
add zmrecover.pl to rpm specfile
2019-03-30 08:57:04 -05:00
1d3617c1cf
Rem reference to AUTHORS since it no longer exists
2019-03-30 08:43:46 -05:00
e3caf38a72
Update zoneminder.spec
2019-03-30 08:20:18 -05:00
8556e13504
Update zoneminder.spec
2019-03-30 08:16:46 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
b8bf91bec6
include libswresample-ffmpeg1 in depends
2019-01-07 09:20:58 -05:00
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
Isaac Connor
Isaac Connor
Andrew Bauer
Pliable Pixels
Pliable Pixels
Andrew Bauer
Andrew Bauer