5fac0903b1
We include jquery ourselves
2021-02-06 20:11:38 -05:00
3d20183020
Remove mp4v2
2021-02-04 17:32:53 -05:00
8f9637f21a
Merge pull request #3129 from Carbenium/cmake-reformat
...
Build: Reindent the CMakeLists
2021-02-04 17:20:34 -05:00
6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
dd527f0888
Consolidate __STDC_FORMAT_MACROS and __STDC_CONSTANT_MACROS definition
...
Move the definitions to zm_define.h and include the header at the appropriate locations.
These macros have not been adopted by the C++11 standard.
However glibc 2.17 (CentOS 7) still depends on them to provide the macros which are guarded by these defines.
2021-02-04 19:58:29 +01:00
3fd98ee9c1
Bump version to add RTSPServer column to Monitors
2021-02-03 08:33:10 -05:00
fdbab5adc3
rpmspecfile README - update zmuser creation on newer sql's
2021-02-02 15:18:54 -06:00
c55b80beab
rpmspecfile - generate ssl cert for both apache and nginx
2021-01-31 16:14:39 -06:00
be95bd2fa7
deprecate python-sphinx in favour of python3-sphinx. Remove mp4v2 and libx264
2021-01-28 16:17:15 -05:00
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
0b35a6f09a
remove mootools from debian packaging
2021-01-18 07:59:54 -06:00
b9c0823774
don't install tools folder
2021-01-18 07:41:08 -06:00
a1917d83d0
Merge branch 'master' into zma_to_thread
2020-12-22 19:52:09 -05:00
24d558b31a
spelling
2020-12-19 12:14:56 -06:00
96ade2f9d0
update rpm nginx readme
2020-12-19 10:09:12 -06:00
80afbbd9ce
fixup rpmspecfile cert generation
2020-12-19 08:11:20 -06:00
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
0702b64cc4
Merge branch 'master' into zma_to_thread
2020-12-15 10:51:40 -05:00
5c1135b2a7
Merge branch 'master' into no_decode
2020-12-10 15:15:32 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
7ef34bce7b
Include new fonts dir in install
2020-12-03 13:30:51 -05:00
1c45019eeb
Bump version to 1.35.15
2020-12-03 13:16:42 -05:00
bbc2c2a607
Crud has more than 1 friend
2020-11-12 13:27:10 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
7faf774cd0
Use FriendsOfCake crud 3.2.0
2020-11-12 09:15:02 -05:00
a3a6d94b6f
bump version to 1.15.14
2020-11-06 14:16:34 -05:00
3e5f87cb41
Bump version to 1.35.13
2020-11-04 14:42:01 -05:00
9a9f80c15c
show which user we are updating permissions for
2020-10-28 14:07:29 -04:00
86bf491fe1
Add Locking to filters, bump db to 1.35.12.
2020-10-28 12:55:32 -04:00
4c92c99ba1
bump version for 1.35.11 db updates
2020-10-28 12:39:50 -04:00
59884375fa
Add references permission so that our zmupdate can add foreign keys
2020-10-28 09:23:46 -04:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
8227de8642
bump version to 1.35.10 to pick up Filter AutoUnarchive column
2020-10-12 11:04:16 -04:00
faade3ea15
Enable dependencies for vnc monitor type in buster/focal and newer
2020-10-07 10:52:59 -04:00
7261a7b1dd
Merge branch 'sessions_in_db'
2020-10-02 15:57:11 -04:00
a58e5e96d7
bump version
2020-10-02 15:57:05 -04:00
fb0fae7b20
buster only has libjpeg62-turbo-dev
2020-10-02 15:22:43 -04:00
4b10d22ea8
correct the version on libjpeg-turbo
2020-10-02 12:55:44 -04:00
d139dc010b
prefer libjpegturbo to libjpeg8 or 9
2020-10-01 13:47:39 -04:00
63e42ca651
Still need libjpeg
2020-10-01 12:57:46 -04:00
3eae356ed7
Bump to 1.35.8. Change table engine to InnoDb for Monitor_Status.
2020-09-30 09:39:31 -04:00
02d4785e71
Split out user creation/updating into it's own function
2020-09-29 17:26:55 -04:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
37b0fc4bbd
bump version to pickup geolocation updates
2020-09-28 09:34:08 -04:00
f7ec83323d
Fix conditional
2020-09-23 16:16:30 -04:00
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
a68c95ba73
fix logic on systemd and mysql/mariadb existence
2020-09-23 16:07:46 -04:00
5410fcf18c
Detect systemd and fall back to sysV. We do this for beowulf and WSL
2020-09-23 14:41:26 -04:00
04aab54044
Detect systemd and use sysV style commands if it isn't
2020-09-23 11:31:16 -04:00
45cc4dd531
put back sysV init script for beowulf/wsl
2020-09-23 11:30:40 -04:00
f7cbc2f5e0
remove uneeded setconfig options in redhat specfil
2020-09-19 09:10:16 -05:00
b3c5a985ed
use BindsTo in redhat systemd service file
2020-09-17 09:16:28 -05:00
b4fbe84f6b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-26 13:31:36 -04:00
abebc74e1e
sphinx-build is in python3-sphinx
2020-08-26 13:31:32 -04:00
f003dd7782
remove zoneinder-upload folder from cmakelists
2020-08-25 16:57:06 -05:00
3d3dde22c4
Use zm_session_start
2020-08-25 11:31:06 -04:00
41c1774e4a
remove ftp upload folder from specfile
2020-08-24 12:33:22 -05:00
e111edbb72
bump version to 1.35.6 to pick a db fix from 1.34.20
2020-08-23 11:53:43 -04:00
e189e99353
Update zoneminder.spec
2020-08-18 15:37:37 -05:00
87175ccd49
Use ZM_DB_HOST when altering user permissions
2020-08-17 09:55:09 -04:00
f0fbf77726
Change TMP back to /var/tmp. This is used mostly for exports so it needs to not be ram-based.
2020-08-17 09:51:23 -04:00
c2dfaa1b65
create a distro build dir for devuan beowulf
2020-08-10 17:30:59 -04:00
c0ab8bf90d
Merge branch 'master' into zma_to_thread
2020-08-07 17:53:32 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
f43003a98b
need epel-rpm-macros on rhel for new cmake macros
2020-08-07 13:44:20 -05:00
10a4929f75
disable LTO on redhat builds
2020-08-06 14:36:54 -05:00
cc9413b44b
replace python=sphinx with sphinx-doc in depends for ubuntu 2004
2020-08-05 20:00:25 -04:00
9e03827fea
rpm specfile - use new cmake macros for f33 compat
2020-08-04 09:38:52 -05:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
a747cd70d4
Use /run/zm instead of /var/run/zm
2020-07-11 10:44:28 -04:00
973450425d
Use /run/zm instead of /var/run/zm
2020-07-11 10:44:06 -04:00
d0eb00474c
fix typo in rpm specfile
2020-07-07 07:39:44 -05:00
5e4c189a3d
Update zoneminder.spec
...
Account for new zmonvif-zmtrigger.pl in rpm specfile
2020-07-06 12:34:10 -05:00
1b9402239a
Add libvncclient0 as an option for jessie
2020-06-15 14:59:33 -04:00
65d7c9e51d
bump version 1.35.5
2020-06-05 17:51:06 -04:00
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
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Andrew Bauer
Isaac Connor
Pliable Pixels
Pliable Pixels