Commit Graph

4249 Commits

Author SHA1 Message Date
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 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 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 614170c181 Add EndTime to event list 2018-04-03 06:57:22 -07:00
Isaac Connor 793f630ee0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-02 10:43:07 -07:00
Isaac Connor df3a5b7d58 must reopen the session before destorying it 2018-03-29 19:19:08 -04:00
Isaac Connor 3fe5bb6fe2 open and close the session around user login 2018-03-29 11:30:20 -04:00
Isaac Connor f8457e04e2 clean out commented out code 2018-03-29 11:30:09 -04:00
Isaac Connor d1dd16b81c fix event_id to EventId 2018-03-28 13:07:53 -07:00
Isaac Connor 842a42bcd5 test for existence of mp4 before trying to grab images from it 2018-03-28 13:01:58 -07:00
Isaac Connor a2452db3de Add Url to storage for S3 support 2018-03-28 08:23:36 -07:00
Isaac Connor 4d68f9a757 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-03-27 13:24:57 -07:00
Isaac Connor 62a0890383
Merge pull request #89 from pliablepixels/ui-tweaks
Ui tweaks for storage areas
2018-03-27 11:00:25 -04:00
Pliable Pixels d3350919de Reintroduced empty check rule, closed paranthesis 2018-03-27 10:55:36 -04:00
Pliable Pixels caffe5f7c9 dot should be red when either fclass or source_class is red 2018-03-27 08:55:15 -04:00
Pliable Pixels 1b5d802890 dot should be red when either fclass or source_class is red 2018-03-27 08:43:58 -04:00
Pliable Pixels 5b7011c61b commented out incomplete definition - please complete it if you need it 2018-03-27 03:58:28 -04:00
Pliable Pixels b077cc8900 table header - keep consistent 2018-03-26 11:50:14 -04:00
Pliable Pixels dfcee7c6c1 table header - keep consistent 2018-03-26 11:14:46 -04:00
Pliable Pixels 411e1d05f2 used chosen for log filters 2018-03-26 11:09:35 -04:00
Pliable Pixels f790306990 added account icon 2018-03-25 16:18:50 -04:00
Pliable Pixels 980684a2f0 adjusted h1 size 2018-03-25 16:09:31 -04:00
Pliable Pixels cc2f285408 log view tweaks, cleaned up header issues 2018-03-25 16:01:04 -04:00
Pliable Pixels 1179b6ddc4 rounded top for tables and highlights 2018-03-25 11:43:34 -04:00
Pliable Pixels bf57b65ebb reduced 2nd row of navbar text 2018-03-25 09:56:41 -04:00
Pliable Pixels 809e58fae6 acct icon to material 2018-03-25 09:44:30 -04:00
Pliable Pixels 14f638e009 replaced ionic fonts with material design icons 2018-03-25 09:28:00 -04:00
Pliable Pixels acdc076b84 padding to navbutton 2018-03-24 18:36:10 -04:00
Pliable Pixels 10aedb51a6 reduced size of totals 2nd row 2018-03-24 18:30:50 -04:00
Pliable Pixels a68cc79437 using MIT licensed ion-icons, its smaller than FA, replaced some text with icons 2018-03-24 18:25:39 -04:00
Pliable Pixels 0b31cc4d3d 2nd level header tweak 2018-03-24 17:34:46 -04:00
Pliable Pixels b8f6c2277f clone icons 2018-03-24 10:21:59 -04:00
Pliable Pixels 140217bef6 icons, muted colors, text tightening 2018-03-24 09:59:39 -04:00
Pliable Pixels a9d6bd22bc shortened monitor add 2018-03-24 09:59:08 -04:00
Isaac Connor 0bb1c5ce71 load groups when duping a monitor 2018-03-23 13:35:45 -07:00
Isaac Connor 85c757d2b1 Include group in parents list display 2018-03-23 13:35:02 -07:00