Isaac Connor
|
9972a2fd0c
|
wip work on fixing zms mp4 to mjpeg
|
2019-12-02 15:51:08 -05:00 |
|
Isaac Connor
|
3b9b49c44d
|
wip work on fixing zms mp4 to mjpeg
|
2019-12-02 15:51:03 -05:00 |
|
Isaac Connor
|
3af6358314
|
fix & to &
|
2019-12-02 15:49:49 -05:00 |
|
Isaac Connor
|
72cb5bd1bb
|
add missing </select>
|
2019-12-02 15:49:42 -05:00 |
|
Isaac Connor
|
09faa0a731
|
fix & to &
|
2019-12-02 15:49:32 -05:00 |
|
Isaac Connor
|
b686649589
|
fix & instead of &.
|
2019-12-02 15:34:31 -05:00 |
|
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
|
1add3a4bb4
|
Add an update to Storage DiskSpace.
|
2019-12-02 15:04:01 -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
|
0947c3ef24
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-11-30 15:37:09 -05:00 |
|
Isaac Connor
|
927165a934
|
debug the recording_started timestamp and warning when we can't fine a frame before the requested time
|
2019-11-30 15:37:05 -05:00 |
|
Isaac Connor
|
e096e0a7fe
|
improve error logging when running as root as can't chown log file
|
2019-11-30 15:35:09 -05:00 |
|
Isaac Connor
|
00b67ec352
|
Merge pull request #2768 from selvanair/fix-video-start
Correct video buffer length when analysis and capture fps differ
|
2019-11-30 14:53:22 -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
|
aaa570ed68
|
bump version for update
|
2019-11-29 14:23:28 -05:00 |
|
Isaac Connor
|
a49d97a526
|
bump version
|
2019-11-29 14:07:50 -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 |
|
Isaac Connor
|
55dd40ec85
|
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:47:45 -05:00 |
|
Isaac Connor
|
01d61f4f32
|
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:47:25 -05:00 |
|
Isaac Connor
|
585535da30
|
Merge pull request #2765 from ZoneMinder/pliablepixels-patch-2
Update api.rst
|
2019-11-28 10:48:35 -05:00 |
Pliable Pixels
|
b4a8790555
|
Update api.rst
https://github.com/ZoneMinder/zoneminder/issues/2764#issuecomment-559451717
|
2019-11-28 10:39:49 -05:00 |
|
Isaac Connor
|
97d97f3d19
|
Merge pull request #2763 from pliablepixels/auth-fixes
Its not necessary the token is a refresh. Can also be empty
|
2019-11-27 09:01:13 -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
|
d9014bf9e7
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-11-26 16:17:33 -05:00 |