Isaac Connor
|
ef72e585b9
|
Include id in the user object
|
2018-02-13 05:28:00 -05:00 |
Isaac Connor
|
9fa28106e5
|
return proper hostname when not using multiple servers
|
2018-02-12 14:44:58 -05:00 |
|
Isaac Connor
|
62b0a1ecdc
|
Add some debugging to tell what we are doing
|
2018-02-12 13:25:11 -05:00 |
|
Isaac Connor
|
4f57a40cb6
|
Update Monitor_Status after connection lost and when exiting
|
2018-02-12 13:24:19 -05:00 |
|
Isaac Connor
|
ad1b9699f1
|
Remove CssFileExtra
|
2018-02-11 14:18:40 -05:00 |
|
Isaac Connor
|
7abe7d6fe3
|
fix centering in buttons
|
2018-02-11 14:18:26 -05:00 |
|
Isaac Connor
|
c0eb0011f0
|
Make some errors just errors instead of fatal. Add a check for plural days in log cleaning
|
2018-02-11 14:18:10 -05:00 |
|
Isaac Connor
|
956f9ee193
|
if there is a custom term handler in place, call it when Fatal
|
2018-02-11 14:17:44 -05:00 |
|
Isaac Connor
|
498c4e625d
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-09 16:08:55 -05:00 |
|
Isaac Connor
|
717d00ac99
|
missing //
|
2018-02-09 16:08:44 -05:00 |
Isaac Connor
|
a35ba812b7
|
fix merging conditions
|
2018-02-09 07:57:52 -08:00 |
|
Isaac Connor
|
0052d1b02e
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-02-09 07:32:34 -08:00 |
|
Isaac Connor
|
08c359fdbc
|
add some margin to minTime and maxtime
|
2018-02-09 07:31:30 -08:00 |
|
Isaac Connor
|
63a214869e
|
rework montagereview to be more performant.
|
2018-02-09 07:31:19 -08:00 |
|
Isaac Connor
|
6518311022
|
Use Status and CaptureFPS and AnalysisFPS to do status coloration
|
2018-02-09 07:31:03 -08:00 |
|
Isaac Connor
|
4b51fed500
|
Rework order of filters. Put Monitors at the end. recalc selected_monitor_ids
|
2018-02-09 07:30:53 -08:00 |
|
Isaac Connor
|
6ee133bf6b
|
give some left margin on labels
|
2018-02-09 07:30:43 -08:00 |
|
Isaac Connor
|
c454d5355d
|
adjust column width on console
|
2018-02-09 07:30:32 -08:00 |
|
Isaac Connor
|
cb9eef8563
|
show No streams found if none were found
|
2018-02-09 07:30:12 -08:00 |
|
Isaac Connor
|
6b6fdc7cee
|
Log the sql before running it
|
2018-02-09 07:29:10 -08:00 |
Isaac
|
208d563e11
|
fix Event => __git_main[0]
|
2018-02-09 02:09:00 +01:00 |
|
Isaac Connor
|
6e240f669c
|
fix filtering
|
2018-02-08 14:25:58 -08:00 |
|
Isaac Connor
|
894467cdef
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-02-08 10:51:49 -08:00 |
|
Isaac Connor
|
b8b2edf847
|
close the datetime inputs
|
2018-02-08 10:50:33 -08:00 |
|
Isaac Connor
|
2a00cf852a
|
Set a type on the buttons so that they act right
|
2018-02-08 10:50:22 -08:00 |
|
Isaac Connor
|
1ed8af8aac
|
upgrade jquery-ui to 1.12.1
|
2018-02-08 13:19:16 -05:00 |
|
Isaac Connor
|
4777808cf0
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-08 13:15:41 -05:00 |
|
Isaac Connor
|
95cfdb327d
|
further separate addBtn and cloneBtn, fixes
|
2018-02-08 13:15:27 -05:00 |
|
Isaac Connor
|
cdfc7f1808
|
give the buttons div an id and move the styling into the css
|
2018-02-08 09:30:48 -08:00 |
|
Isaac Connor
|
4240dc4bde
|
spacing, add a test for minTime being after maxTime
|
2018-02-08 09:30:26 -08:00 |
|
Isaac Connor
|
d857c2c98a
|
increase download popup height
|
2018-02-08 09:29:54 -08:00 |
|
Isaac Connor
|
c47c81b810
|
title is translated, so we can't use it to determine which page we are on, so use view
|
2018-02-08 09:29:42 -08:00 |
|
Isaac Connor
|
16604e3ee4
|
fix including jquery in export
|
2018-02-08 09:29:12 -08:00 |
|
Isaac Connor
|
f987bde6df
|
fix styles on montagereview. Mostly remove borders and make timelineDiv 100%
|
2018-02-08 09:28:52 -08:00 |
|
Isaac Connor
|
cfe53c0ffe
|
Explicitly set the danger class on each line because they can get out of sync when using the All toggle
|
2018-02-08 09:57:11 -05:00 |
|
Isaac Connor
|
babae4629a
|
Update and fix console buttons. Use a separate button for clone
|
2018-02-08 09:47:16 -05:00 |
Isaac Connor
|
f6bb3017ef
|
Use absolute patch to point-g.png. Makes the assumption that /zm always works.
|
2018-02-08 07:49:52 -05:00 |
|
Isaac Connor
|
a4c59e3e50
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-02-07 09:07:57 -05:00 |
|
Isaac Connor
|
dec82ecf5c
|
Fix for when specifying page 1 and no pages
|
2018-02-07 09:07:51 -05:00 |
|
Isaac Connor
|
b119f7d731
|
bump version
|
2018-02-07 08:03:19 -05:00 |
|
Isaac Connor
|
cd606dbab8
|
whitespace
|
2018-02-07 08:03:01 -05:00 |
|
Isaac Connor
|
0d5c8f385f
|
fix DiskSpace summing when Nulls are present
|
2018-02-07 08:02:49 -05:00 |
|
Isaac Connor
|
069d53a9a0
|
Add the object debug when path to event does not exist in DiskSpace
|
2018-02-07 08:02:37 -05:00 |
|
Isaac Connor
|
4c5e47b050
|
fix DiskSpace summing when Nulls are present
|
2018-02-07 08:02:05 -05:00 |
Andrew Bauer
|
a177d8e9dc
|
Merge pull request #2041 from flashoftheblades/master
Added control script for Reolink cameras
|
2018-02-06 14:02:36 -06:00 |
|
Isaac Connor
|
8343793c48
|
Fix updating Storage area DiskSpace by using COALESCE
|
2018-02-06 11:34:40 -05:00 |
|
Isaac Connor
|
0f83dfc769
|
Correct events_day, etc update trigger
|
2018-02-06 08:43:09 -05:00 |
|
Isaac Connor
|
4bd92a3b94
|
fixes
|
2018-02-05 23:01:04 -05:00 |
|
Isaac Connor
|
c767d79aef
|
fix typo
|
2018-02-05 22:59:37 -05:00 |
|
Isaac Connor
|
a4c956da7d
|
Only update db entry when value changes
|
2018-02-05 22:59:22 -05:00 |