Commit Graph

5766 Commits

Author SHA1 Message Date
Isaac Connor 8bf74d2f35 fix & instead of &. 2019-12-02 15:34:23 -05:00
Isaac Connor 24022d157d use & instead of &. Put inputs out of table where they belong 2019-12-02 15:33:58 -05:00
Isaac Connor 9f49e4f367 make Mark column text-align left so that checkboxes line up 2019-12-02 15:07:35 -05:00
Isaac Connor f7e01aa999 switch to material icon for dot 2019-12-02 14:31:05 -05:00
Isaac Connor cf35db120d change to material icons, fix missing div 2019-12-02 14:21:51 -05:00
Isaac Connor 8e645e45e1 fix selecting Monitors by passing MonitorId as MonitorId[] 2019-12-02 14:21:25 -05:00
Isaac Connor b70b75421b quotes and spacing 2019-12-02 14:18:27 -05:00
Isaac Connor 16698b8a82 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-12-02 13:42:07 -05:00
Isaac Connor 9d0a416311 remove debugging code 2019-12-02 13:41:42 -05:00
Isaac Connor c9a324b7b3 improve the configureExportButton to look at specific inputs instead of just counting checkboxes 2019-12-02 13:40:02 -05:00
Isaac Connor 09a6e06132 change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already 2019-12-02 13:38:23 -05:00
Isaac Connor 2713565c84 using bootstrap layout instead of a table, so text-align: right 2019-12-02 13:34:53 -05:00
Isaac Connor 80d0d037b5 add a style for inline form not supported by bootstrap 3 2019-12-02 13:34:11 -05:00
Isaac Connor d39193cb6b convert flip to material icons 2019-12-02 12:33:13 -05:00
Isaac Connor 576dd23907 test for existence of filter in query 2019-12-02 12:30:15 -05:00
Isaac Connor 355fceccb4 test for existence of default 2019-12-02 12:30:03 -05:00
Isaac Connor caefcc2f7a increase size of export popup 2019-12-02 12:17:33 -05:00
Isaac Connor 03d7bcdd11 better debug logging when on-click-this function isn't defined 2019-12-02 12:17:18 -05:00
Isaac Connor c19632e114
Merge pull request #2769 from connortechnology/fix_api_alarm_auth
Fix api alarm auth
2019-12-02 07:53:50 -05:00
Isaac Connor 76d795f413 add rendering of enums for Events Controller 2019-12-01 12:32:14 -05:00
Isaac Connor 0b2853095e cleanup auth in monitors alarm method 2019-12-01 12:30:27 -05:00
Isaac Connor eedb31730e fix saving Monitor values that don't get passed when empty, like Enabled 2019-11-29 14:49:43 -05:00
Isaac Connor cab1056328 improve debugging in recursive_array_diff 2019-11-29 14:49:10 -05:00
Isaac Connor 393c25b4f2 fix array keys 2019-11-29 14:26:03 -05:00
Isaac Connor d6a414a1a4
Merge pull request #2767 from connortechnology/fix_2692
Fix 2692
2019-11-29 14:24:00 -05:00
Isaac Connor 29572abef2 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:56:02 -05:00
Isaac Connor a9d8e73f68 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:53:46 -05:00
Isaac Connor 7e92900542 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:50:02 -05:00
Isaac Connor 4817efe17c Add enum support for Orientation and Scheme to Events 2019-11-29 13:48:20 -05:00
Isaac Connor d02e30ceca Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:48:02 -05:00
Pliable Pixels 7b99c89541
its not necessary the token is a refresh. Can also be empty 2019-11-26 20:57:25 -05:00
Isaac Connor 54a15573ad Make 32bit the default for COlours 2019-11-26 15:06:24 -05:00
Isaac Connor 5ebf929598 Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area. 2019-11-26 14:36:39 -05:00
Isaac Connor ab9f99bdbb Fix Width & Height rotation when scaling. Fixes #2760 2019-11-22 12:18:30 -05:00
Isaac Connor 1dc83700c0 Do a better job of handling the non-server, non-multiport case. Put the code in Url so that it works for other functions that call Url() 2019-11-21 13:32:27 -05:00
Isaac Connor 606c89962f eliminate an extra db call 2019-11-20 16:30:26 -05:00
Isaac Connor 9d4c802b48 netEmpty is deprecated. Use notBlank instead 2019-11-20 09:32:19 -05:00
Isaac Connor 5feeedf7f4 Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor 2019-11-20 09:31:58 -05:00
Isaac Connor 5494fdb087 When upgrading from a version that doesn't do DiskSpace storage, there can be a lot of events to update. Can't load them all or we run out of ram. Batch them in 1000's 2019-11-20 09:31:16 -05:00
Isaac Connor ac96a19371 Fix filtering monitors by user's MonitorId restriction 2019-11-19 17:21:01 -05:00
Isaac Connor 207e5918c8 fix lint, remove debug 2019-11-19 11:37:45 -05:00
Isaac Connor 59b9220ddd if doing multiport still call Url(), as it requires a hostname 2019-11-11 13:33:54 -05:00
Isaac Connor 56618aac32 Handle buttons not existing 2019-11-10 15:49:39 -05:00
Isaac Connor 1c54f22627 Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to. 2019-11-08 15:18:08 -05:00
Isaac Connor 014ce0afe8 improve error message regarding timezone differences 2019-11-05 12:40:11 -05:00
Isaac Connor 5b02bc76f4 Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly 2019-11-05 10:07:42 -05:00
Isaac Connor 5603fd70f8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-04 12:04:37 -05:00
Isaac Connor d218d2ee9f If the default server case, don't add the Url component. So this will return just the path, using whatever servername/port combo is currently in use. Fixes #2750 2019-11-04 12:04:23 -05:00
Isaac Connor 4e16e9052a
Merge pull request #2749 from pliablepixels/monitor_add_validation
add model validation so that we don't create empty monitors
2019-11-02 10:16:41 -04:00
Isaac Connor 9d8a230252 Prevent deletion of entire events directory when monitor has empty name 2019-11-02 10:12:43 -04:00