Commit Graph

Select branches

Hide Pull Requests

1.36.12_hevc

RecordStats-State-Timestamp

add_mqtt

angular-ui

command_on_alarm

continuous

feature-plugins

fix_zms_params

gh-pages

master

multistream

osx-port

release-1.30

release-1.30.4

release-1.32

release-1.34

release-1.36

replace_function_concept

strftime_en_gb_format

thumbnail_on_console

1.30.1-rc.1

1.30.2

1.30.2-rc.1

1.30.3

1.30.4

1.30.5

1.32.0

1.32.1

1.32.2

1.32.3

1.34.0

1.34.1

1.34.10

1.34.11

1.34.12

1.34.13

1.34.14

1.34.15

1.34.16

1.34.17

1.34.18

1.34.19

1.34.2

1.34.20

1.34.21

1.34.22

1.34.23

1.34.24

1.34.25

1.34.26

1.34.3

1.34.4

1.34.5

1.34.6

1.34.7

1.34.8

1.34.9

1.36.0

1.36.1

1.36.10

1.36.11

1.36.12

1.36.2

1.36.3

1.36.4

1.36.5

1.36.6

1.36.7

1.36.8

1.36.9

v1.25

v1.26-beta.1

v1.26-beta.2

v1.26-beta.3

v1.26.0

v1.26.1

v1.26.2

v1.26.3

v1.26.4

v1.26.5

v1.27.0

v1.28.0

v1.28.1

v1.29.0

v1.29.0-rc1

v1.29.0-rc2

v1.30.0

v1.30.0-rc1

v1.30.0-rc2

Mono Color

• b05bc211f7 Apparently it is actually the Y channel that we want. Isaac Connor 2022-02-03 10:50:40 -0500
• 7e9c707f92 V plane is actually the 3rd array entry, not the 4th Isaac Connor 2022-02-03 08:19:08 -0500
• fd7f7f851a V plane is actually the 3rd array entry, not the 4th Isaac Connor 2022-02-03 08:19:08 -0500
• 9973b1fbaf Move the version detection down to after we have a repo and hence a commit history on version. Fixes CURRENT builds always being commit 0 Isaac Connor 2022-02-02 20:56:41 -0500
• 89e1c5d53c Move Monitor::MonitorLink to dedicated file Jonathan Bennett 2022-01-26 16:54:27 -0600
• bd68b9e3af Not ready for OutputSource yet Isaac Connor 2022-02-02 17:10:05 -0500
• 10e39b3b13 :wqMerge branch 'master' into replace_function_concept Isaac Connor 2022-02-02 17:08:01 -0500
• a4c91e9a3c Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2022-02-02 14:36:15 -0500
• 339f102196 Implement reboot and ping methods for Trendnet PTZ Control Isaac Connor 2022-02-02 14:34:53 -0500
• 48fc99a0e3 Implement reboot and ping methods for Trendnet PTZ Control Isaac Connor 2022-02-02 14:34:53 -0500
• 606c47ba87 If possible, use the v-channel from the yuv420p image for motion detection instead of the rgba data. Isaac Connor 2022-02-02 14:33:58 -0500
• 70f4a68269 bump version for use_Amcrest_API Isaac Connor 2022-02-02 13:13:00 -0500
• 1f9e654821 Default limit to 0 which means no limit Isaac Connor 2022-02-02 11:02:34 -0500
• faabbabfd5
  Merge pull request #3415 from jp-bennett/master Isaac Connor 2022-02-02 12:28:35 -0500
• 3feb4fcc51
  Merge branch 'master' into master Isaac Connor 2022-02-02 12:28:17 -0500
• df16099463 Default limit to 0 which means no limit Isaac Connor 2022-02-02 11:02:34 -0500
• b28f97c5c3 Implement filter limits. Which go before pagination/advanced search limits Isaac Connor 2022-02-02 10:49:05 -0500
• 31eff49a46 Implement filter limits. Which go before pagination/advanced search limits Isaac Connor 2022-02-02 10:49:05 -0500
• 4874dedc1f Bump version of RtspServer used Isaac Connor 2022-02-02 10:28:18 -0500
• 5b10f6ace6
  Merge pull request #3421 from JedMeister/patch-1 Isaac Connor 2022-02-01 22:47:58 -0500
• 63b3042d37
  fix typo Jeremy Davis 2022-02-02 14:18:26 +1100
• ad0a095886
  Update MariaDB Bullseye info Jeremy Davis 2022-02-02 11:35:36 +1100
• 1c1630e5b4 add require Filter and fix missing $ Isaac Connor 2022-02-01 17:23:16 -0500
• 4d87b49f07 Remove weird cutnpaste User modules stuff from top of Filter.pm Isaac Connor 2022-02-01 17:22:56 -0500
• e69095a9b4 Fix == to = Isaac Connor 2022-02-01 17:22:23 -0500
• 3d5767b326 Merge branch 'master' into multistream Isaac Connor 2022-02-01 16:52:42 -0500
• 18532096c5 Need full commits to get # of commits since last version change Isaac Connor 2022-02-01 16:10:46 -0500
• 4949159b88 Rough in pcm alaw support. Untested. Isaac Connor 2022-02-01 14:06:12 -0500
• 80461cb135 add libcurl4 as a dependency as it was in build-depends. Isaac Connor 2022-02-01 13:36:11 -0500
• bc4884afe5 fix replacement on escape. For some reason needs double bacl slash Isaac Connor 2022-02-01 10:07:04 -0500
• 462ec45a07 Escape newlines in config values. Isaac Connor 2022-02-01 09:46:37 -0500
• 4501a7c2a1 Remove field that ffmpeg 5.0 doesn't have. Isaac Connor 2022-02-01 07:23:12 -0500
• 34d7f192b4 Remove field that ffmpeg 5.0 doesn't have. Isaac Connor 2022-02-01 07:23:12 -0500
• 0eb4d95d0e remove geolocation copies from config to javscript land. Now all of config is brought in my skin.js.php Isaac Connor 2022-01-31 18:32:58 -0500
• ad32466aa4 Remove function, replacing with capturing, analysing, recording. Adjust formatting of list function Isaac Connor 2022-01-31 18:17:31 -0500
• 6b8cc14723 Don't free image data if we added the packet to an event. The lock moves to the event so it's not safe Isaac Connor 2022-01-31 12:07:09 -0500
• b00ca5ce91 upload entire build dir as shell expansions don't seem to work Isaac Connor 2022-01-31 11:47:42 -0500
• 3a2484b874 Try a different ssh implementation Isaac Connor 2022-01-31 11:19:36 -0500
• 46ad8e74e6 Add publish Isaac Connor 2022-01-31 11:01:51 -0500
• 61028a3ae1 Remove travis badge, use Isaac's full name. Fixes #3417 Isaac Connor 2022-01-31 10:09:31 -0500
• 51f6a53b6c Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2022-01-28 15:38:32 -0500
• e5792c21c9 Push locked packets into event packetqueue instead of unlcoked contents. Prevents freeing of data before writing to event, hence crashing. Isaac Connor 2022-01-28 15:38:18 -0500
• a91e7d96f8 Merge fix for VP8 Isaac Connor 2022-01-28 12:42:41 -0500
• d567d8aafc Merge upstream patches to RTSPServer Isaac Connor 2022-01-27 17:06:18 -0500
• c524298f8e Rough in State module Isaac Connor 2022-01-27 13:42:46 -0500
• 86f393565e Remove Function references and swap with appropriate Capturing, Analysing, Recording Isaac Connor 2022-01-27 13:42:31 -0500
• 8e62562afd Move onclick to the surrounding div instead of the img. Fixes clicking on montage Isaac Connor 2022-01-26 21:39:29 -0500
• fe8747e5e7 Make ONVIF inputs 100% Isaac Connor 2022-01-26 11:45:04 -0500
• 42e24614d6 Include filename in debugs when writing out jpegs Isaac Connor 2022-01-26 11:01:09 -0500
• 138bada095 Add libdatetime-perl. Some Control modules need it Isaac Connor 2022-01-26 09:27:29 -0500
• 23bfbcd6ce Merge branch 'master' into multistream Isaac Connor 2022-01-26 10:13:20 -0500
• a2a2f1a781 Move variables out of the ifdef gsoap block, as they are used for Amcrest support, too Jonathan Bennett 2022-01-25 22:46:09 -0600
• 57a697093e Remove redundant JS define Jonathan Bennett 2022-01-25 22:27:48 -0600
• ec9403fb6f Adds Amcrest On-camera Motion Detection Jonathan Bennett 2022-01-25 22:27:11 -0600
• 961256d2e7 terminate when zm_terminate is set. Do a countdown instead of countup. Sleeo for 10000 microseconds instead of 100. This restores the old value Isaac Connor 2022-01-25 16:24:21 -0500
• 17e01cb58f Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2022-01-25 16:23:02 -0500
• 4d90a816f8 Put a lock around jpeg writing. libjpeg is not thread safe Isaac Connor 2022-01-25 16:22:33 -0500
• 38da3b4d52 add some brackets to make logic more clear Isaac Connor 2022-01-25 14:25:27 -0500
• c8c09e560f Fix mTerminate not being initialised. Isaac Connor 2022-01-25 14:25:13 -0500
• cf82d767de Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image. Isaac Connor 2022-01-25 14:24:52 -0500
• 0125efb93e add some brackets to make logic more clear Isaac Connor 2022-01-25 14:25:27 -0500
• 1bdb4f302c Fix mTerminate not being initialised. Isaac Connor 2022-01-25 14:25:13 -0500
• df7e34a51d Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image. Isaac Connor 2022-01-25 14:24:52 -0500
• 988f118ba9 Fix fail to get Sources in RTSP. the string msg although initially reserved to ZM_NETWORK_BUFSIZ, after use it's capacity is changed whatever it's contents are. So need to re-reserve. Isaac Connor 2022-01-25 11:55:21 -0500
• 26ae5052f4 Fix fail to get Sources in RTSP. the string msg although initially reserved to ZM_NETWORK_BUFSIZ, after use it's capacity is changed whatever it's contents are. So need to re-reserve. Isaac Connor 2022-01-25 11:55:21 -0500
• ae17b2316e break out when zm_terminate is true Isaac Connor 2022-01-24 20:07:14 -0500
• 8891feec74 Fix missing text-right align on Port/Path labels. Set step to 1 for Port Isaac Connor 2022-01-24 18:31:31 -0500
• 42d5101f08 Make Remote Host 100% Isaac Connor 2022-01-24 18:31:05 -0500
• 3cc243b9a8 Don't freshing config when doing update. That is it's own command Isaac Connor 2022-01-24 09:23:19 -0500
• 146ea4822d Bump the db queue limit to 30 before we warn. I only have 1 server that gets over 20 and it is still ok. Isaac Connor 2022-01-21 09:44:44 -0500
• f10d0fd3f5
  Merge pull request #3413 from jp-bennett/master Isaac Connor 2022-01-23 12:35:42 -0500
• 5485c04bc6 Rework of the Janus polling loop Jonathan Bennett 2022-01-23 01:07:48 -0600
• d110987935 Fix indentation for ESLint Jonathan Bennett 2022-01-22 13:37:44 -0600
• abbd27d1cb Remove hard-coded config Vars Jonathan Bennett 2022-01-22 13:31:47 -0600
• 07c5b23aa6 Adds Janus streaming checks to polling thread Jonathan Bennett 2022-01-22 11:53:44 -0600
• 9443aaa2d8 Do state changes when in RECORD mode as well as it doesn't do motion detection Fixes #3411 Isaac Connor 2022-01-22 13:33:39 -0500
• 8125aa633b
  Merge branch 'ZoneMinder:master' into master Jonathan Bennett 2022-01-22 12:20:13 -0600
• 90f75dae93 Make config entries const Isaac Connor 2022-01-22 12:33:48 -0500
• 47aa1d1913 Bump version to 1.37.10 Isaac Connor 2022-01-22 12:31:56 -0500
• 3a0b88c013 Don't make private config entries available to js land. Isaac Connor 2022-01-22 12:31:36 -0500
• ce2d605b3d load Private as well as Name,Value from Config Isaac Connor 2022-01-22 12:31:15 -0500
• 35efb111ac Add Private to Config Isaac Connor 2022-01-22 12:30:59 -0500
• 45db266ede Put full config available to javascript Isaac Connor 2022-01-22 12:07:12 -0500
• 4910ec752f Merge branch 'master' into multistream Isaac Connor 2022-01-22 11:52:19 -0500
• 2e9bda1af1 Add firefox specific workaround for Janus streaming Jonathan Bennett 2022-01-21 23:21:41 -0600
• 52e48c02b6 Add janus_path and janus_secret, allowing for more secure and flexible Janus installs Jonathan Bennett 2022-01-21 22:23:41 -0600
• 4eb4e0eb18 ignore ajaxQueue.js Isaac Connor 2022-01-20 12:02:17 -0500
• 5ce701f5cb Use Monitor->getStatusHTML to generate status html Isaac Connor 2022-01-20 11:53:44 -0500
• 91d6ff2029 Use Monitor->getStatusHTML to generate status html Isaac Connor 2022-01-20 11:53:35 -0500
• 57bb91e105 add connKey to monitorData Isaac Connor 2022-01-20 11:53:05 -0500
• 9c3509a620 put an mid in imageFeed id so we can use MOnitorStream.js. Use Monitor->getStatusHTML to generate status html Isaac Connor 2022-01-20 11:52:54 -0500
• e73659843a Rework to use MonitorStream.js Isaac Connor 2022-01-20 11:52:01 -0500
• 7748616992 If rate > 1600, limit it to 1600 to prevent logged errors Isaac Connor 2022-01-20 11:51:08 -0500
• 24a9dcbf47 If rate > 1600, limit it to 1600 to prevent logged errors Isaac Connor 2022-01-20 11:50:53 -0500
• 97f2c0a02b Load ajaxQueue Isaac Connor 2022-01-20 11:50:25 -0500
• 2da9c20c08 Add ajaxQueue Isaac Connor 2022-01-20 11:49:59 -0500
• 22b6337752 Merge code from watch.js. Add an ajaxQueue. Link up buttons from UI Isaac Connor 2022-01-20 11:47:28 -0500
• 4bf55b1af1 Use net zm_setcookie Isaac Connor 2022-01-20 09:48:09 -0500
• 3cd6fbdc12 Use net zm_setcookie Isaac Connor 2022-01-20 09:48:02 -0500
• 9395b7e47c Use net zm_setcookie Isaac Connor 2022-01-20 09:47:53 -0500