mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-13 09:04:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
18,912 Commits 94 Branches 104 Tags
a4e4ebe3fdf5bfc4a2d7ca74a7d2740d7bd6cdfe
Commit Graph

1704 Commits

Author SHA1 Message Date
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
0b4c35c58e Merge pull request #3241 from connortechnology/fix_3239 
Fix 3239
 2021-05-19 20:39:42 -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
7901950c48 spacing 2021-04-26 09:40:08 -04:00
Isaac Connor
9254c99ab8 Add ModectDuringPTZ 2021-04-23 14:52:29 -04:00
Isaac Connor
37e0f010e3 Require session to be instantiated 2021-04-23 09:08:48 -04:00
Isaac Connor
95249d5eb4 Merge branch 'release-1.34' 2021-04-12 16:32:57 -04:00
Isaac Connor
3335976cba implement remote api Trigger support. 2021-04-12 15:59:31 -04:00
Isaac Connor
1b50314f9e Add DisableAlarms function 2021-04-12 15:59:31 -04:00
Isaac Connor
7e579fd851 Implement Snapshots user permission 2021-04-12 15:59:31 -04:00
Isaac Connor
3dcb71933e Add event summary fields to Monitor Object 2021-04-09 19:46:25 -04:00
Isaac Connor
2e22cd5c3b Mark snapshot events as Archived 2021-04-08 15:20:44 -04:00
Isaac Connor
7e3d6f867e Set the default crf so that encoding works 2021-04-01 11:53:57 -04:00
Isaac Connor
6c4e423a8b Spacing 2021-03-30 18:20:31 -04:00
Isaac Connor
cbd8b22efb Fix setting value when not empty 2021-03-30 14:28:17 -04:00
Isaac Connor
8582c1a652 Once again fix saving string value to '' so that we can empty LabelFormat 2021-03-30 13:31:26 -04:00
Isaac Connor
beb7a75d5a Implement canView for Monitors 2021-03-30 11:52:04 -04:00
Isaac Connor
aeb98ec790 Implement canView for Groups. Implement Monitors() and Children() functions. Use canView when populating Group dropdown 2021-03-30 11:51:52 -04:00
Isaac Connor
8e1b2ccbc7 Add MaxImageBufferCount 2021-03-26 17:02:17 -04:00
Isaac Connor
be0841832e enable reporting saving errors back to web ui. 2021-03-22 12:59:41 -04:00
Isaac Connor
3fdd2bff7f Have to use === because apparently null == NOW() according to php. 2021-03-22 12:59:18 -04:00
Isaac Connor
fa08240a4d Fix set() and __call to use the default value when set value is ''. Fixes issues in monitor view when changing type 2021-03-22 12:06:25 -04:00
Isaac Connor
c347261e19 Change default of ImageBufferCount to 3 2021-03-22 12:05:36 -04:00
Isaac Connor
d0adaeaabe rework user saving action to use User object. Implement a duplicate username check. Deprecate php < 5.3 due to lack of bcrypt password hashing functions. Hence deprecate the use of mysql PASSWORD() 2021-03-21 09:18:12 -04:00
Isaac Connor
68f9c7c9e6 introduce a _last_error member to the object for reporting errors saving. 2021-03-20 19:27:53 -04:00
Isaac Connor
4cb38a119e Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work. 2021-03-18 14:09:15 -04:00
Isaac Connor
28700fd56b Implement saving DecodingEnabled from function view 2021-03-16 12:09:14 -04:00
Isaac Connor
5eae1c0a9f spacing, add code comment 2021-03-13 12:10:55 -05:00
Isaac Connor
b50916e02a Allow unknown columns in filters. Allow specifying the table name in FilterTerm. 2021-03-12 10:52:10 -05:00
Isaac Connor
11c2318a05 Rough in the ui for Snapshots 2021-03-12 09:28:05 -05:00
Isaac Connor
6682ec7da5 Add Snapshots and Snapshot_Events Tables. Add HomeView to Users. 2021-03-12 09:26:23 -05:00
Isaac Connor
de0bbf7e04 Instead of fatal error triggering, turn off file logging and log the error elsewhere 2021-03-03 14:31:43 -05:00
Isaac Connor
ce4e133c94 Add loading SecondPath in monitor 2021-03-03 09:56:33 -05:00
Isaac Connor
4cfe777e93 Fix path to Monitor.php 2021-02-16 11:16:06 -05:00
Isaac Connor
bb747bfc6d Add RTSPStreamName fields 2021-03-01 16:46:48 -05:00
Isaac Connor
5d826fd558 Don't try to addup/update DIskSpace used by incomplete events. 2021-02-20 17:11:20 -05:00
Isaac Connor
4d739f35ef Fix parseTree when using iS or ISNOT. Add strtoupper comparisons for NULL values. 2021-02-20 17:07:07 -05:00
Isaac Connor
0fc4b00ac1 Allow null as well as NULL infilter values 2021-02-20 12:32:38 -05:00
Isaac Connor
c99f43205d add parenthesis for safety 2021-02-18 13:47:27 -05:00
Isaac Connor
c608af4df7 Correct timeline when using Weekday 2021-02-17 13:11:02 -05:00
Isaac Connor
b58ecca040 Allow RTSPServer to be unselected 2021-02-17 12:07:55 -05:00
Peter Keresztes Schmidt
687ba03eb4 Drop relicts of zma 2021-02-10 13:26:25 +01:00
Isaac Connor
c2ac171811 truncate file when logging to 255 chars so it gets into the db 2021-02-09 14:23:15 -05:00
Isaac Connor
c8af90fd24 Add RTSP Server checkbox 2021-02-02 23:19:52 -05:00
Isaac Connor
105eff7a21 Remove references to zma 2021-02-01 17:29:16 -05:00
Isaac Connor
0dc6b60985 Use new insert function to allow re-use of monitor Ids 2021-02-01 16:44:41 -05:00
Isaac Connor
50e5f84df2 introduce insert function to be used when we want specifically to insert a db record instead of being smart about update/insert. 2021-02-01 16:44:04 -05:00
Isaac Connor
da7d9c3756 Add default for Monitor Name 2021-02-01 16:43:24 -05:00
Isaac Connor
e4c6709eca ensure options always has width and height set 2021-01-27 13:07:31 -05:00
Isaac Connor
973533c809 Use method to handle case where Event wasn't found 2021-01-25 18:39:57 -05:00