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
|
db0c10fad2
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-08 13:58:46 -05: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
|
dca1de4a13
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-08 13:30:57 -05: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
|
4b6f40dd9f
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_monitor.cpp
|
2018-02-08 12:40:24 -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 |
Isaac Connor
|
8343793c48
|
Fix updating Storage area DiskSpace by using COALESCE
|
2018-02-06 11:34:40 -05:00 |
Isaac Connor
|
d8e4b0abfb
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
scripts/zmwatch.pl.in
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
src/zmc.cpp
|
2018-02-06 10:34:17 -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 |
Isaac Connor
|
86ae1b6598
|
Add missing commas
|
2018-02-05 17:31:34 -05:00 |
Isaac Connor
|
88f8cee9f6
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-05 15:47:05 -05:00 |
Isaac Connor
|
9e000b1112
|
bump version for new triggers
|
2018-02-05 15:46:52 -05:00 |
Isaac Connor
|
6822643d22
|
add update triggers for all the event tables so that diskspace counts work
|
2018-02-05 15:46:39 -05:00 |
Isaac Connor
|
af67e3b686
|
whitespace
|
2018-02-04 11:54:25 -08:00 |
Isaac Connor
|
310193791d
|
add a 10 second sleep before reconneting
|
2018-02-04 11:54:11 -08:00 |
Isaac Connor
|
cfb7987f0f
|
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
|
2018-02-03 14:54:30 -05:00 |
Isaac Connor
|
a7171eccf6
|
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
|
2018-02-03 14:54:01 -05:00 |
Isaac Connor
|
8e547134d5
|
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
|
2018-02-03 14:50:19 -05:00 |
Isaac Connor
|
73f7026643
|
use COALESCE to ensure integer values
|
2018-02-03 11:01:33 -05:00 |
Isaac Connor
|
12c4ab07ea
|
use COALESCE to ensure integer values
|
2018-02-03 11:01:26 -05:00 |
Isaac Connor
|
e25af4b40c
|
cleanup, reset result
|
2018-02-02 16:07:13 -05:00 |
Isaac Connor
|
4b7ddd81bf
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-02 14:24:02 -05:00 |
Isaac Connor
|
a1392bf613
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_mpeg.cpp
src/zmc.cpp
|
2018-02-02 14:23:26 -05:00 |
Isaac Connor
|
058b2be9a7
|
fix chosen sprites
|
2018-02-02 13:26:44 -05:00 |
Isaac Connor
|
93996402d9
|
turn off debug
|
2018-02-02 13:24:07 -05:00 |
Isaac Connor
|
515af57c56
|
Fix some styles on filter edit
|
2018-02-02 13:24:01 -05:00 |