Commit Graph

542 Commits

Author SHA1 Message Date
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 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 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 653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
Isaac Connor b6dde354be rename AnalysisFPS to AnalysisFPSLimit 2017-10-24 17:34:32 -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
Isaac Connor df8fbaccea Fixes 2017-10-23 11:50:45 -07:00
Isaac Connor f99e404730 update the total_disk_space function to do and sql sum on the events that already have a space assigned and only update ones that don't. This reduces ram requirements. 2017-10-23 11:02:36 -07:00
Isaac Connor ed9da696b3 Rough in save functionality into Event. 2017-10-23 10:53:58 -07:00
Isaac Connor 6fba9fa65a google code style and quotes 2017-10-20 14:54:28 -04:00
Isaac Connor cf2eace2c7 improve htmlSelect and add Storage and Server filters to console 2017-10-19 09:50:07 -04:00
Isaac Connor 32ba53cf1b turn off database debugging 2017-10-18 16:37:45 -04:00
Isaac Connor ba4e5572d6 add setting of values to anonymouse member function 2017-10-17 10:09:14 -07:00
Isaac Connor 6bf9e28a1e fix use of api when auth not in use and actually specify which monitor to restart 2017-10-16 10:00:41 -07:00
Isaac Connor b96b2636bb add the update to add Type to Storage 2017-10-12 07:50:43 -07:00
Isaac Connor 8abb8a9259 add Type to Storage 2017-10-12 07:32:48 -07:00
Isaac Connor 3f01f887aa only count event size when s3 2017-10-11 14:10:53 -04:00
Isaac Connor e845af94cc include params when blowing up a dbQuery 2017-10-11 14:06:18 -04:00
Isaac Connor a286b60150 use already loaded Storage object when lading events 2017-10-10 12:39:53 -07:00
Isaac Connor 67cb3a7d3c better human_filesize function 2017-10-10 12:39:36 -07:00
Isaac Connor aaffe475d8 turn off debug 2017-10-10 12:39:23 -07:00
Isaac Connor 26699953bb allow setting Storage object in the Event object so as not to go back to db for it. Fix null test in DiskSpace 2017-10-10 12:39:14 -07:00
Isaac Connor 7f50a13074 add Event disk space recalc to zmaudit 2017-10-10 12:11:59 -07:00
Isaac Connor ffc1ac43f5 put back disk space in header, more debug in caching storagea 2017-10-10 14:06:21 -04:00
Isaac Connor a9d3be549f try caching storage 2017-10-10 10:39:17 -07:00
Isaac Connor 76d37d4c95 update db record when we findout the disk space of an event 2017-10-10 13:02:26 -04:00
Isaac Connor 7f73f0bf8c do a backtrace when we ca;; generateAuthHash without open session 2017-10-10 11:51:35 -04:00
Isaac Connor d0f0ab1afe refreshparent when saving group 2017-10-10 11:51:11 -04:00
Isaac Connor 3af795264d add actual disk space as a mouseover in nav bar 2017-10-10 10:38:13 -04:00
Isaac Connor 8da7d845b4 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-10 09:37:23 -04:00
Isaac Connor c654d008f0 add monitor selector to montagereview and montage. 2017-10-10 09:36:56 -04:00
Isaac Connor d0541b0837 Merge pull request #27 from digital-gnome/eventnavFix
Fix nearevents path
2017-10-07 12:49:50 -04:00
digital-gnome e23b4a0d5d Fix event path 2017-10-07 12:42:16 -04:00
Isaac Connor f230aa01ef turn off debug 2017-10-07 11:31:48 -04:00
Isaac Connor 09242d72b3 implement alternate ports for streaming 2017-10-05 16:05:41 -04:00
Isaac Connor 40972383c1 remove debug 2017-10-05 10:48:04 -04:00
Isaac Connor b56a976d7a fixes to montage review and cleanup in group filtering/editing 2017-10-05 10:46:04 -04:00
Isaac Connor 87a49ad009 work on infinite depths of groups 2017-10-04 16:40:09 -04:00
Isaac Connor b5a5f45e04 turn off debug 2017-10-02 10:06:07 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
Isaac Connor 35482ba53c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-09-26 16:13:51 -04:00