Commit Graph

3678 Commits

Author SHA1 Message Date
Isaac Connor 121e64a8c6 turn on MOnitors dropdown in filters, an debug 2017-11-22 11:40:07 -08:00
Isaac Connor 92917809b8 add creating /usr/share/zoneminder/www/cache 2017-11-01 12:49:38 -07:00
Isaac Connor 866c875312 Merge branch 'storageareas' into tesla 2017-11-01 12:01:51 -07:00
Isaac Connor 1aea1517bf put back old behaviour for add monitor 2017-11-01 13:09:14 -04:00
Isaac Connor eb2ee76f57 disable and re-enabled onclick action when editing layout/cancelling edit 2017-11-01 13:08:01 -04:00
Isaac Connor 96e0959c35 clear the cookie for zmMontageLayout 2017-11-01 13:07:35 -04:00
Isaac Connor 0af389c984 populate the Id of the layout when inserting it 2017-11-01 13:07:24 -04:00
Isaac Connor d4080dcdbd when saving a new layout, auto-select it 2017-11-01 12:19:27 -04:00
Isaac Connor 8e010b3bd0 get rid of experimental code to fix monitor layout. Apparently draggable does it all for us. 2017-11-01 12:00:48 -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 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 a6c790b374 use a shared include for the filters bar 2017-10-30 07:37:08 -07:00
Isaac Connor 8312bf52a4 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-10-30 08:37:54 -04:00
Isaac Connor c16e101120 rough in add monitors import wizard 2017-10-27 20:52: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 71c8562b46 Rough in a MontageLayout class 2017-10-27 10:01:16 -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 bc150574c7 wip import 2017-10-26 18:56:10 -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 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 e9600bc5d3 add monitors.php 2017-10-24 16:25:11 -07:00
Isaac Connor ea669b4750 increase size of group edit popup 2017-10-24 16:09:12 -07:00
Isaac Connor 6905c6a1fb add CpuLoad t Servers list 2017-10-24 16:08:52 -07:00
Isaac Connor 5ba6cf0fb2 Add DiskSpace to Events listings on console 2017-10-24 14:19:36 -07:00
Isaac Connor 82bf507ee9 Add Status, ram, swap to Servers List 2017-10-24 12:43:32 -07:00
Isaac Connor 59e50bbbef Update DiskSpace when we create jpg's 2017-10-23 17:04:02 -07:00
Isaac Connor 6b2d0aa59b fix popup when clicking on a monitor on montagereview 2017-10-23 17:03:41 -07:00
Isaac Connor 5e98587ff4 add Server and Storage filters to montagereview 2017-10-23 17:03:18 -07:00
Isaac Connor 9cbd33b439 if there is a selected monitor but it isn't in the available monitors, still show the monitors 2017-10-23 17:02:47 -07:00
Isaac Connor 729fdb4fdd add a popup size for monitors 2017-10-23 17:02:21 -07:00
Isaac Connor b5e59efda5 improve updating diskSpace entries 2017-10-23 17:02:04 -07:00
Isaac Connor d2c8a0240a add a monitors view which is for editing function/enabled/server/storage of multiple monitors 2017-10-23 17:01:43 -07:00
Isaac Connor ced5015a83 move zmcControl and zmaControl to the Monitor Object 2017-10-23 17:00:59 -07:00