Commit Graph

11377 Commits

Author SHA1 Message Date
Isaac Connor 2c85e5e4c6 remove unneccessary type tags. 2018-04-06 11:43:19 -04:00
Mike Brown c4a00e0657 changing the querySep in Event.php to allow gapless playback 2018-04-05 20:42:15 -05:00
Isaac Connor 7a12589a83 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-05 13:41:47 -07:00
Isaac Connor f1a8d5f1ff start of work on .41. Adding foreign keysy 2018-04-05 13:41:24 -07:00
Isaac Connor 9ecbba0947 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-05 14:22:23 -04:00
Isaac Connor 632ab143fe error when can't set session in cake 2018-04-05 14:21:56 -04:00
Isaac Connor 140f11fd58 fix clearing groups 2018-04-05 13:10:25 -04:00
Isaac Connor 2a000cb5f8 fix clearing groups 2018-04-05 13:09:14 -04:00
Isaac Connor 4adebfce1d Add Monitor Status breakdown to console 2018-04-05 09:53:53 -07:00
Isaac Connor 87f5204c46 rename process_configfile to remove namesspace colision 2018-04-05 11:44:21 -04:00
Isaac Connor fb392b2765 put back process_configfile 2018-04-05 11:33:24 -04:00
Isaac Connor b9da309904 remove spaces 2018-04-05 11:33:09 -04:00
Isaac Connor ec5f955d26 more db locking 2018-04-05 11:30:14 -04:00
Isaac Connor fc38fdcc56 remove extra spaces 2018-04-05 11:30:01 -04:00
Isaac Connor 6faf9b5c35 fix including auth on remote restart 2018-04-05 11:24:47 -04:00
Isaac Connor 8fee795fb4 don't duplicate declaration of process_configfile, because we include our version from ZM 2018-04-05 11:24:17 -04:00
Isaac Connor e28ecf8e28 add libfile-slurp-perl as a dependency 2018-04-05 10:00:14 -04:00
Isaac Connor 70c7eaef0e fix using wrong array. Should use StorageById 2018-04-04 20:29:01 -04:00
Isaac Connor 2f6adff1b2 handle when storage area is gone 2018-04-04 20:27:21 -04:00
Isaac Connor 1033755dc8 add missing { 2018-04-04 16:46:38 -04:00
Isaac Connor 6ebedff2e1 If using MIN_STREAMING_PORT then use ['SERVER_NAME'] instead of HTTP_HOST because HTTP_HOST may contain a custom port 2018-04-04 16:45:25 -04:00
Isaac Connor 489f11bd07 empty contents of zone.css because it is no different from base. 2018-04-03 21:18:29 -04:00
Isaac Connor a493fd4dd7 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-03 17:41:49 -04:00
Isaac Connor 9fde052d39 merge 2018-04-03 14:41:32 -07:00
Isaac Connor 053322c2c3 add NextFrameId to Frames 2018-04-03 12:32:14 -07:00
Isaac Connor 66920eb5b8 fix status colour when not capturing 2018-04-03 12:31:54 -07:00
Isaac Connor 7a5d4d3b19 adjust frame_id for bulk frames 2018-04-03 12:31:39 -07:00
Isaac Connor 6a8084652e add min width to Status Filter 2018-04-03 12:31:12 -07:00
Isaac Connor 85bb26668e translate Statuses beter 2018-04-03 12:30:57 -07:00
Isaac Connor a1def1dfe9 whitespace 2018-04-03 12:23:54 -07:00
Isaac Connor 5a08fcc1db whitespace, handle file not found 2018-04-03 12:23:38 -07:00
Isaac Connor 49aeb4b467 whitespace 2018-04-03 10:38:38 -07:00
Isaac Connor 1f29fc601e add Function Filter min width 2018-04-03 10:38:22 -07:00
Isaac Connor 09e05b1313 Clean up date stuff, use moment for formatting in secs2dbstr etc 2018-04-03 10:38:03 -07:00
Isaac Connor 7346a8c733 add select button 2018-04-03 10:36:58 -07:00
Isaac Connor e91729692e add Function filter 2018-04-03 10:36:44 -07:00
Isaac Connor 48ff480907 whitespace 2018-04-03 10:36:14 -07:00
Isaac Connor b26707b647 fix resetting DiskSpace 2018-04-03 09:57:14 -07:00
Isaac Connor dfc35721f9 ensure that sections are always > section_length 2018-04-03 07:03:12 -07:00
Isaac Connor 614170c181 Add EndTime to event list 2018-04-03 06:57:22 -07:00
Isaac Connor ceb12cdd81 undo a debug thing that shouldn't have been committed 2018-04-03 09:12:18 -04:00
Isaac Connor 793f630ee0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-02 10:43:07 -07:00
Isaac Connor 1ff17c97b8 Add DoDelete to Storage and Locked to Events 2018-04-02 09:04:09 -07:00
Isaac Connor df3a5b7d58 must reopen the session before destorying it 2018-03-29 19:19:08 -04:00
Isaac Connor a5b77a59d3 allow 0 pre_event_count 2018-03-29 12:35:03 -04:00
Isaac Connor 8c52c7feef Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-03-29 12:24:34 -04:00
Isaac Connor 82c44da9be remove some space 2018-03-29 12:24:21 -04:00
Isaac Connor 0053404553 remove some spaces 2018-03-29 12:24:12 -04:00
Isaac Connor a56eafe796 when deleting Logger object, need to reset zmInitialized because we clear all the codes 2018-03-29 12:24:00 -04:00
Isaac Connor ce1499d70f
Merge pull request #93 from pliablepixels/92-opt-eventnotification
92 opt eventnotification
2018-03-29 11:31:02 -04:00