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

16524 Commits

Author SHA1 Message Date
Isaac Connor 787953559d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-01 16:11:10 -05: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 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 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 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
Isaac Connor 7a65a64644 add LockRows to Filters 2020-10-26 18:47:40 -04:00
Isaac Connor a2596505e9 add LockRows to Filters 2020-10-26 18:47:17 -04:00
Isaac Connor 1fde123ebc add LockRows to Filters 2020-10-26 18:47:03 -04:00
Andrew Bauer 7b106e2522 don't use wildcards in advanced search 2020-10-26 12:20:26 -05:00
Andrew Bauer fad4339713 no need for full page reload with server pagination 2020-10-26 12:12:50 -05:00
Isaac Connor 5ed168bccd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-26 13:07:18 -04:00
Isaac Connor 1f64a263eb give better log when jqxhr is empty 2020-10-26 13:06:41 -04:00
Isaac Connor 59cf5c33c2 reset search on events load 2020-10-26 13:06:22 -04:00
Isaac Connor da87b5b475 Make invalid sort field non-fatal. Fix column specification in search and advscearch and fix resulting sql due to = instead of .= 2020-10-26 13:06:05 -04:00
Andrew Bauer 97573122bc fix EndTime 2020-10-26 09:33:11 -05:00
Andrew Bauer 27b39a0258
comment out warning used for debug 2020-10-26 09:19:08 -05:00
Isaac Connor 4abfa61bbc Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-26 10:03:12 -04:00
Isaac Connor 4c791b390f fix warning due to undefined vars being used 2020-10-26 09:59:15 -04:00
Isaac Connor 706bf085f4 Add pre and post sql conditions and pre-populate the return 2020-10-26 09:58:47 -04:00
Andrew Bauer e5563dc901 remove unwanted # 2020-10-25 16:06:37 -05:00
Andrew Bauer 6d00924c9b deploy server pagination for events view 2020-10-25 12:11:34 -05:00
Andrew Bauer 8cf899efc5 remove commented line 2020-10-25 10:58:27 -05:00
Andrew Bauer e9b71b4ce1 events view server pagination - fix sorting name & monitor 2020-10-25 10:40:29 -05:00
Andrew Bauer cb073950b9 events view server pagination WIP 2020-10-25 10:28:22 -05:00
Andrew Bauer f87be2d289 specify the table name when we sort in events view 2020-10-25 08:24:56 -05:00