ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,925 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

7890 Commits

Author SHA1 Message Date
Isaac Connor 6e70eb5963
Merge pull request #3259 from gerazo/master 
Updated Hungarian translation
 2021-05-25 13:08:00 -04:00
Zoltan Gera 714dd0aa9f Updated Hungarian translation 2021-05-25 18:15:40 +02:00
Isaac Connor cf03bb9548 Merge branch 'release-1.36' 2021-05-25 11:34:11 -04:00
Isaac Connor 9e64b912a8 Add samesite when setting cookie for skin and css 2021-05-25 11:33:28 -04:00
Isaac Connor d59118fc47 Add redirect so that Yes I'd like to donate now goes to the zoneminder /donate website. This used to happen in javascript but got removed when it was turned into a modal. 2021-05-25 11:33:12 -04:00
Isaac Connor 6a9ed9c457 Use data-onclick instead of data-on-click-this. 2021-05-25 11:22:43 -04:00
Isaac Connor f6fcc2144f jquery.js doesn't exist, so link jquery.min.js instead 2021-05-22 13:59:32 -04:00
Isaac Connor 4c99baf725 Use data-onclick instead of data-on-click-this. Load form by id instead of passed in element. Fixes #3250 2021-05-22 13:59:10 -04:00
Isaac Connor 1caeb67a3e fix behaviour of reverse and fast forward buttons. Fixes #3251 2021-05-22 13:39:42 -04:00
Isaac Connor e16d71b9c6 spacing, code style, code comments 2021-05-22 13:39:42 -04:00
Isaac Connor 317ce7692e fix behaviour of reverse and fast forward buttons. Fixes #3251 2021-05-22 13:38:52 -04:00
Isaac Connor bc384d6fbe spacing, code style, code comments 2021-05-22 11:34:09 -04:00
Andrew Bauer cb0a421d25 use latest rtspserver commit 2021-05-21 15:10:42 -05:00
Andrew Bauer eb387b5453 use latest rtspserver commit 2021-05-21 15:08:40 -05:00
Isaac Connor 0b4c35c58e Merge pull request #3241 from connortechnology/fix_3239 
Fix 3239
 2021-05-19 20:39:42 -04:00
Isaac Connor 1abbc187e9 Merge pull request #3242 from connortechnology/fix_3232_api_monitor_event_summaries 
Add Event_Summary model so that it is included in monitor listing
 2021-05-19 20:32:50 -04:00
Isaac Connor a4df8df5e5 Fix status of delete button when archived. Change title to say that you can't delete due to archived 2021-05-19 20:32:26 -04:00
Isaac Connor f6a271c90d Merge pull request #3240 from connortechnology/fix_3237 
fix warnings not being displayed
 2021-05-19 20:32:11 -04:00
Isaac Connor e246083be5 Add StartDateTime Attr in sort dropdown 2021-05-12 10:32:03 -04:00
Isaac Connor 363b017977 If error was unauthorized, do a reload. 2021-05-12 10:32:03 -04:00
Isaac Connor f3b4ccf758 Fix scaling when scale to fit 2021-05-10 11:08:16 -04:00
Isaac Connor b1ac0e61a9 put back upstream version 3.2.0 of Crud 2021-05-09 18:18:03 -04:00
Isaac Connor 2cf6ad8089 Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers. 2021-05-08 21:14:20 -04:00
Isaac Connor bc11e6a95b Include pre event count in min estimated ram use 2021-05-08 15:47:29 -04:00
Isaac Connor ff0d6e8e0f remove duplicated getModal and pass fid=fid to getModal 2021-05-07 15:34:08 -04:00
Isaac Connor ea3bffb402 make getModal take additional query parameters 2021-05-07 15:33:49 -04:00
Isaac Connor 9e6367c7c3 look for 264 instead of x264 2021-05-06 17:33:04 -04:00
Isaac Connor 373fae2511 BadEncoder Params and PathNotEncoded are warnings, not errors 2021-05-06 11:05:05 -04:00
Isaac Connor b8f0d90000 Put back Estimated Ram Use. Rework it to provide min/max 2021-05-06 10:17:46 -04:00
Isaac Connor 0adc2d96d6 Revert "remove estimated ram use stuff as it is no longer possible" 
This reverts commit 2e675a338b.
 2021-05-06 09:54:06 -04:00
Isaac Connor f4bbacb3f4 add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc 2021-05-05 16:48:49 -04:00
Isaac Connor ed97ff495b Unhide Codec, hide OutputContainer 2021-05-05 16:48:01 -04:00
Isaac Connor 09e5c47f3e Hide COntainer and OutputCodec options. I don't want people playing with them righ tnow. 2021-05-05 14:03:38 -04:00
Isaac Connor 2dfe66663d Remove mjpeg and mpeg options. They don't make sense. Add classes so we can hide Encoder and OutputContainer options 2021-05-05 14:03:02 -04:00
Isaac Connor 6d07c7ce9f specify the invalid characters 2021-05-04 15:56:47 -04:00
Isaac Connor 0b6e414998 Enable/Disable Snapshots based on ZM_FEATURES_SNAPSHOTS config setting 2021-05-04 13:19:40 -04:00
Isaac Connor 24d9bfa257 Add a test for invalid characters in Path for Ffmpeg monitors 2021-05-04 10:45:27 -04:00
Isaac Connor b10b2932ee Code spacing and doc 2021-05-03 15:20:11 -04:00
Isaac Connor d92c95a420 if analysis frame doesn't exist revert back to capt 2021-05-03 15:18:35 -04:00
Isaac Connor 44e8107cac Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead 2021-05-02 13:38:06 -04:00
Isaac Connor b70cd053d6 spacing and quotes 2021-05-02 12:43:17 -04:00
Isaac Connor b84efac0e5 left align Server head 2021-04-28 19:00:15 -04:00
Isaac Connor f754b82f3b When we do not have permission to edit monitors, return empty string instead of nothing so that we don't generate an error 2021-04-28 12:03:44 -04:00
Isaac Connor 953882a6da Dirty hack to fix up/down arrows on pagination number input 2021-04-27 16:31:25 -04:00
Isaac Connor 0213c67236 add MinSectionLength 2021-04-27 15:25:09 -04:00
Isaac Connor 7901950c48 spacing 2021-04-26 09:40:08 -04:00
Isaac Connor 4385076e66 Fix encrypting password when saving User 2021-04-26 09:40:08 -04:00
Isaac Connor 02a1ecee6f Remove dbeug 2021-04-26 09:40:08 -04:00
Peter Keresztes Schmidt 1dbfa0790a web: fix eslint errors 2021-04-24 01:42:13 +02:00
Isaac Connor 9254c99ab8 Add ModectDuringPTZ 2021-04-23 14:52:29 -04:00