Commit Graph

9802 Commits

Author SHA1 Message Date
Isaac Connor ac6964b159 add position clearing to other Layouts 2017-11-01 11:56:18 -04:00
Isaac Connor b1cb83c8ff Freeform layout has to clear left,top,bottom,right 2017-11-01 11:53:45 -04:00
Isaac Connor 445fbb06d6 clearFix so that #monitors actually has a height 2017-11-01 11:52:59 -04:00
Isaac Connor a9d4dfac45 fix the file extension so that mime type works better 2017-11-01 11:52:32 -04:00
Isaac Connor 36e13039c7 Switch to LONGTEXT FROM JSON type 2017-11-01 11:05:21 -04:00
Isaac Connor 25210b7ecf Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-11-01 09:41:22 -04:00
Isaac Connor e6918cd1bd implement crude cache busting code for .js and .css files 2017-11-01 09:41:19 -04:00
Isaac Connor 33771f92e9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-31 13:32:47 -07:00
Isaac Connor 9473fbecd8 more debug 2017-10-31 13:32:42 -07:00
Isaac Connor c9d52b47ba add debug 2017-10-31 13:29:49 -07:00
Isaac Connor 3deb8a35bb fixes 2017-10-30 21:38:27 -04:00
Isaac Connor b5491102ef Fix saving MontageLayouts 2017-10-30 20:21:16 -04:00
Isaac Connor ce6cc24de5 turn off debug 2017-10-30 20:20:40 -04:00
Isaac Connor 52110adfa9 update code because we are now including the entire object in the layouts array 2017-10-30 16:32:14 -04:00
Isaac Connor efe8b2db7e update code because we are now including the entire object in the layouts array 2017-10-30 16:32:03 -04:00
Isaac Connor c69e2468b0 add edit and save layout 2017-10-30 16:30:15 -04:00
Isaac Connor 207b66c8fa add Edit Layout 2017-10-30 16:29:46 -04:00
Isaac Connor 1694eeb436 debugging and code simplification 2017-10-30 16:29:27 -04:00
Isaac Connor 97757ba6cd add Inserting when saving 2017-10-30 16:29:13 -04:00
Isaac Connor 01acd154f9 fix adding Layouts 2017-10-30 16:28:55 -04:00
Isaac Connor a6c790b374 use a shared include for the filters bar 2017-10-30 07:37:08 -07:00
Isaac Connor f420dde04d fix quotes 2017-10-30 09:05:08 -04:00
Isaac Connor 8312bf52a4 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-10-30 08:37:54 -04:00
Isaac Connor ae8bfadcf7 use static logging method 2017-10-27 21:13:14 -07:00
Isaac Connor b3d65729da apache style logging function take a logging object 2017-10-27 21:13:01 -07:00
Isaac Connor 2003798e64 copy in start and end transaction 2017-10-27 21:06:11 -07:00
Isaac Connor ad96d29b31 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-27 21:04:00 -07:00
Isaac Connor 2d6998ad25 fix debug_all 2017-10-27 20:54:54 -07:00
Isaac Connor 2d8a4794de add save, set, transform, and some globals pointing to dbh and log 2017-10-27 20:54:29 -07:00
Isaac Connor 8b4468caed add apache log style aliases 2017-10-27 20:54:19 -07:00
Isaac Connor 0683cb28ec make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace 2017-10-27 20:50:25 -07:00
Isaac Connor f89680e648 bump version 2017-10-27 15:39:08 -07:00
Isaac Connor eb48759ff8 wip 2017-10-27 13:37:51 -07:00
Isaac Connor 71222d7f2f rework how montage layouts are done, pull from db now 2017-10-27 12:06:26 -07:00
Isaac Connor b3d420b13b add standard layouts to db creation 2017-10-27 12:06:07 -07:00
Isaac Connor 9942b886f2 conditionally add the standard layouts 2017-10-27 12:04:42 -07:00
Isaac Connor 71c8562b46 Rough in a MontageLayout class 2017-10-27 10:01:16 -07:00
Isaac Connor 60fb654a47 rough in the MontageLayouts table 2017-10-27 09:57:41 -07:00
Isaac Connor 663cc6df87 improve logging of zmfilter 2017-10-27 09:09:12 -07:00
Isaac Connor 82fbec697f add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid 2017-10-27 08:37:53 -07:00
Isaac Connor e27b95c820 make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace 2017-10-27 08:05:35 -07:00
Isaac Connor a107147020 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-27 08:04:41 -07:00
Isaac Connor bc150574c7 wip import 2017-10-26 18:56:10 -07:00
Isaac Connor fc3934c8bb kill off curl and libvlc 2017-10-25 13:20:18 -07:00
Isaac Connor 12b611b9d5 When in live mode say Camera Offline instead of no data 2017-10-25 13:02:28 -07:00
Isaac Connor 653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
Isaac Connor 127608e36a add Indexes to logs 2017-10-25 11:10:56 -07:00
Isaac Connor ea84bd1e69 add a Status Filter 2017-10-25 09:04:54 -07:00
Isaac Connor b6dde354be rename AnalysisFPS to AnalysisFPSLimit 2017-10-24 17:34:32 -07:00
Isaac Connor 0fc6852065 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-24 16:25:49 -07:00