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

14944 Commits

Author SHA1 Message Date
Isaac Connor c9c4224dd2 Change url used for authentication to magicBox.cgi?action=getDeviceType 2021-04-14 17:19:07 -04:00
Isaac Connor 7489c3850d Store last command for continuous moves so that moveStop can send the correct stop command 2021-04-14 17:19:01 -04:00
Isaac Connor 113e495a7d Fix margin in ptz buttons 2021-04-14 14:00:24 -04:00
Isaac Connor c4c0732eb1 Bump version to 1.34.25 fix ppa issue 2021-04-14 11:26:28 -04:00
Isaac Connor d48b03f40f Update CRUD to 3.2.0. Allow overriding of VERSION for deb 2021-04-12 17:15:14 -04:00
Isaac Connor a341d2ef84 Don't upload orig tarball by adding -sd 2021-04-12 16:02:02 -04:00
Isaac Connor af025db758 Release 1.34.24 2021-04-11 17:33:24 -04:00
Isaac Connor 64ab6dff95 fix missing ) 2021-04-10 18:16:59 -04:00
Isaac Connor cf721ae875 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2021-04-10 18:16:17 -04:00
Isaac Connor 2b1e0df6be FIx auth= not getting updated 2021-04-09 18:46:41 -04:00
Isaac Connor 492a352bed Use updated auth_hash when sending alarm requests 2021-04-09 18:33:32 -04:00
Isaac Connor d9dc61265d Fix DisableAlarms. Use signal when capture fails instead of erroneously using TRIGGER_OFF. Add status to DumpSettings so that we can query it with zmu. 2021-04-09 17:46:11 -04:00
Isaac Connor 9af97c50aa Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2021-03-31 12:40:35 -04:00
Isaac Connor c8e9c3dd83 Spacing, remove redundant public: 2021-03-31 12:40:02 -04:00
Isaac Connor c3ce9913cf Upgrade cakephp to 2.10.24 2021-03-31 12:11:12 -04:00
Isaac Connor c73393579d Handle event creation failing gracefullyish 2021-03-31 12:06:33 -04:00
Isaac Connor eed6a57800 remove unused member sd 2021-03-31 12:06:14 -04:00
Isaac Connor 9b4eee02d8 Make sure id is initialized to 0 so that we can test if event creation worked 2021-03-31 12:06:03 -04:00
Isaac Connor 4fb73505b9 backport change to not initialize db in logger which fixes small memleak. 2021-03-31 12:05:30 -04:00
Isaac Connor 790cdf879a Add D1-PAL resolution 2021-03-31 11:05:17 -04:00
Isaac Connor 4cfe777e93 Fix path to Monitor.php 2021-02-16 11:16:06 -05:00
Isaac Connor e6358290b4 this=>self 2021-02-02 17:30:42 -05:00
Isaac Connor 7dd9188b3b fix eslint 2021-01-26 18:09:19 -05:00
Isaac Connor 86fd86a723 Switch to FriendsOfCake branch 3.0 2021-01-24 12:29:16 -05:00
Isaac Connor 73c1264771 bump version for release 2021-01-23 17:31:19 -05:00
Isaac Connor fd21d47bbb Merge pull request #3113 from pliablepixels/feature-api-daemon-control 
new api to control daemon
 2021-01-23 17:28:30 -05:00
Isaac Connor d3c84a168a Remove the word All from the mark column on console. I think the UX is pretty universal by now. 2021-01-22 15:51:31 -05:00
Isaac Connor cd9f10695d correct colours in links, navbar buttons. sync colours of monitor filter text inputs to match chosen dropdown. make options sidebar black. Remove redundant layout duplicated from base. 2021-01-22 15:51:04 -05:00
Isaac Connor c7ef587d5d Shirnk colMark because I got rid of the word All in the header. Make the monitor filters inline-block which makes them flow with their label when narrow 2021-01-22 15:47:44 -05:00
Isaac Connor 436cd3397b apply a top/bottom margin to buttons of 1px to create a tiny space between buttons and console table. Remove commented out styles 2021-01-22 15:46:48 -05:00
Terry Sanders c21e02e3c7 Fixed issue where mysql_free_result can get called twice when a vaild username with an incorrect password is used. 2021-01-22 12:23:38 -05:00
Isaac Connor f9fc10b394 When not capturing don't try to create mmap. Fixes #3112 2021-01-22 12:23:13 -05:00
Isaac Connor 01ec57f902 remove test for negative pts. Negative pts is ok. Have been running this in master for a while with no negative effects. 2021-01-22 12:07:47 -05:00
Isaac Connor 7183a47a3a split Netcat security header into multiple lines for legibility 2021-01-15 18:45:13 -05:00
Isaac Connor b019a759a3 ffmpeg options doesn't support loglevel setting. SO remove it from help. Fixes #3109 2021-01-15 18:43:49 -05:00
Isaac Connor c9ac5dff62 Use parent printMsg 2020-12-21 12:17:02 -05:00
Isaac Connor a855656b88 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-12-17 09:27:23 -05:00
Isaac Connor 5602b92699 Fix issue with timeline where it only shows first frame 2020-12-17 09:26:59 -05:00
Isaac Connor ea6478b8a0 Escape column names for mysql 8. Fixes #3092 2020-12-05 16:38:53 -05:00
Isaac Connor fdbca4760f dbFetchAll should always return an array. Not null on error 2020-12-05 16:38:25 -05:00
Isaac Connor d781d7169a Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-12-03 14:29:01 -05:00
Isaac Connor b30b4cd66a Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081 2020-12-03 14:28:48 -05:00
Isaac Connor 38d9aaea1f
Merge pull request #3084 from BlueMax/660fix 
Improve group permissions (mode 660)
 2020-12-02 16:00:47 -05:00
Bluemax d8993931da Improve group permissions (mode 660) 
Make /dev/shm files 660.
 2020-12-02 21:27:00 +01:00
Isaac Connor 48775e2230 Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value 2020-12-01 14:24:41 -05:00
Isaac Connor baeb1dbd5b Take an optional debug param in dbQuery 2020-12-01 14:07:23 -05:00
Isaac Connor ae7a706526 Handle minTime and maxTime being specified as either a timstamp or a datetime. Remove duplicated query building code. Reduce ram requirements when exporting logs. 2020-12-01 14:04:51 -05:00
Isaac Connor be27630a85 escape the word Groups 2020-11-23 19:33:53 -05:00
Isaac Connor 4deb3a8d84 escape the word Groups 2020-11-23 19:31:21 -05:00
Isaac Connor 1b5448ede4 Handle there being no services in the response 2020-11-20 16:35:48 -05:00