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

17352 Commits

Author SHA1 Message Date
Isaac Connor 7650e0bf51 cleanup my totalNotFiltered code. Join Monitors as well as they can be referenced by the filter 2020-11-02 12:43:45 -05:00
Isaac Connor 492e65c2fd Add missing PathToAPI 2020-11-02 12:42:30 -05:00
Isaac Connor ed87ad36b3 missing break 2020-11-02 12:09:25 -05:00
Esteban Flores ea4d3ccd7a
Changed "Purge By Age" filter 
Changed "Purge By Age" filter, the "date" option is not available in v1.34.22. Using "End Date" as the filter parameter works just fine.
 2020-11-02 01:05:57 -06:00
Isaac Connor 4e80c04d23 fix lack of const to match def 2020-11-01 18:48:13 -05:00
Isaac Connor 73e6d5a9d0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-01 18:44:15 -05:00
Isaac Connor 7208260a29
Merge pull request #3066 from ZoneMinder/relative_event_symlinks 
Use relative symlinks for monitor event directories
 2020-11-01 18:01:27 -05:00
Matt N 6e3eb922e0
Use relative symlinks for monitor event directories 
This way the link continues to work from backups and after the user moves ZM data to a new directory.
 2020-11-01 14:55:08 -08:00
Isaac Connor 5b918e69f1 spacing 2020-11-01 17:16:19 -05:00
Isaac Connor 033e749a57 improve code logic/spacing 2020-11-01 17:16:07 -05:00
Isaac Connor 296f6af7fb Remove dirty hack that sets EndTime from monitor. It can get set in event destructor 2020-11-01 17:15:42 -05:00
Isaac Connor 80e54aee66 cppcheck improvements. Add const and override where we can 2020-11-01 17:15:17 -05:00
Isaac Connor 82c3436155 cppcheck improvements. Remove non-const StartTime and EndTime. We will remove the dirty hack use in zm_monitor. 2020-11-01 17:14:44 -05:00
Isaac Connor f79602d638 cppcheck improvements. Use %u instead of %d where appropriate. Move sql def to block where it is used 2020-11-01 17:14:04 -05:00
Andrew Bauer 3d795be864 remove the thumbnail col if WEB_LIST_THUMBS is off 2020-11-01 15:46:43 -06:00
Isaac Connor 1257a7ea37 improvements reported by cppcheck 2020-11-01 16:11:19 -05:00
Isaac Connor 787953559d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-01 16:11:10 -05:00
Andrew Bauer 824f38c746 hide settings buttons rather than disable for non Local monitors 2020-11-01 08:05:53 -06:00
Isaac Connor 30e0e49ee7 Fix total rows when using search 2020-10-31 14:09:47 -04:00
Andrew Bauer 5047c28157 attempt to fix totalnotfiltered 2020-10-31 11:26:29 -05:00
Isaac Connor a04f6df06a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-31 10:47:25 -04:00
Isaac Connor a63600ccef remove dead code 2020-10-30 16:09:24 -04:00
Isaac Connor 5aa34dd916
Merge pull request #3065 from jahegu/patch-1 
Update zm_update-1.35.11.sql
 2020-10-30 13:52:55 -04:00
jahegu f7d23ce23b
Update zm_update-1.35.11.sql 
Missing " ' " simbol that generates a MariaDB problem:
ERROR 1064 (42000) at line 14: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''Adding foreign key for EventId to Frames' at line 1
 2020-10-30 17:57:28 +01:00
Isaac Connor e5097d9466 code style 2020-10-30 11:50:16 -04:00
Isaac Connor 5fadd366e7 Always setup Logging SIG handlers. Implement SIGUSR1 and SIGUSR2 handling to match c++ side behaviour. Fixes #3057 2020-10-30 11:50:03 -04:00
Isaac Connor 65df84ef7e Make ZoneMinder::Event::delete aware of transactions 2020-10-30 11:49:00 -04:00
Isaac Connor e4a585eaa3 improvements to 1.35.11 db updates 2020-10-30 09:18:53 -04:00
Isaac Connor 41e88fad6e translate \n to <br/>. Fixes #3064 2020-10-29 15:08:14 -04:00
Isaac Connor 75ec13871d Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-10-29 09:40:49 -04:00
Isaac Connor 97f4d9e7a2 Make the event count and diskspace in the storage row be a link to events for that storage area. 2020-10-29 09:40:14 -04:00
Isaac Connor 638a05b207 Fix totalrows in pagination. Still figuring this out. 2020-10-29 09:39:48 -04:00
Isaac Connor 368c1649fe Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-10-29 08:47:34 -04:00
Isaac Connor a35c143094 Prevent extra foreign keys from being created and fix we can't delete from Zones. Must be done manually 2020-10-28 15:01:14 -04:00
Isaac Connor 9a9f80c15c show which user we are updating permissions for 2020-10-28 14:07:29 -04:00
Isaac Connor 86bf491fe1 Add Locking to filters, bump db to 1.35.12. 2020-10-28 12:55:32 -04:00
Isaac Connor 858674c0b2 Merge branch 'master' into filter_locking 2020-10-28 12:52:52 -04:00
Isaac Connor 686f793d09 fix truth value for ZM_OPT_USE_GEOLOCATION 2020-10-28 12:49:39 -04:00
Isaac Connor b3a28b2ba2 fix confusion in syslog reporting web_php when the error was actually web_js 2020-10-28 12:49:03 -04:00
Isaac Connor df788f2810 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-28 12:40:00 -04:00
Isaac Connor 4c92c99ba1 bump version for 1.35.11 db updates 2020-10-28 12:39:50 -04:00
Isaac Connor 43b7021f9c ALTER Events.Id to BIGINT. This update got lost at somepoint. Add FOREIGN KEYS to Frames, Stats and Zones tables 2020-10-28 12:38:44 -04:00
Isaac Connor 59884375fa Add references permission so that our zmupdate can add foreign keys 2020-10-28 09:23:46 -04:00
Isaac Connor 3825af8243 Add FOREIGN KEYS for EventId in Frames, Stats. MonitorId, ZoneId in Stats. MonitorId in Zones. 2020-10-28 09:19:54 -04:00
Isaac Connor c67b3c5a1f fix button disabled status. We now have checkboxes that aren't actions so we need to be more explicit 2020-10-26 18:49:41 -04:00
Isaac Connor 1690bcbd38 update auth_relay when we update auth_hash 2020-10-26 18:49:14 -04:00
Isaac Connor a5bb2365b5 update auth_relay when we update auth_hash 2020-10-26 18:49:03 -04:00
Isaac Connor f3f0a6baff remove debug 2020-10-26 18:48:43 -04:00
Isaac Connor cd9b16a467 add LockRows to Filters 2020-10-26 18:48:16 -04:00
Isaac Connor ffc5249a66 add LockRows to Filters 2020-10-26 18:47:55 -04:00