Isaac Connor
|
27736fb5d9
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-15 11:04:41 -04:00 |
Andy Bauer
|
b41363fd60
|
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
|
2018-03-06 11:37:49 -06:00 |
habibapp1365
|
aa2134bde4
|
Update zm_create.sql.in
|
2018-03-06 19:59:06 +03:30 |
|
Isaac Connor
|
dc074bd2c0
|
fix path to triggers.sql
|
2018-02-28 07:18:38 -08:00 |
Isaac Connor
|
3aa31fd524
|
Merge branch 'master' into storageareas
|
2018-02-23 10:23:35 -05:00 |
|
Isaac Connor
|
cece2f35f0
|
remove triggers from zm_create.sql.in as they are now contained in triggers.sql
|
2018-02-23 07:50:05 -05:00 |
|
Isaac Connor
|
0a6b463301
|
FIx MontageLayout=>MontageLayouts
|
2018-02-23 07:46:37 -05:00 |
|
Isaac Connor
|
834edafc63
|
install triggers as well
|
2018-02-23 07:46:24 -05:00 |
|
Isaac Connor
|
52bca9d3ae
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-20 22:48:45 -05:00 |
|
Isaac Connor
|
13ef478820
|
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
|
2018-02-20 22:48:34 -05:00 |
|
Isaac Connor
|
0ad01f09bd
|
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
|
2018-02-20 22:48:23 -05:00 |
Isaac Connor
|
1981359d69
|
fixes, use summaries from Events_Day/etc instead of Events table
|
2018-02-19 19:45:21 -05:00 |
|
Isaac Connor
|
678634916f
|
fix event insert trigger
|
2018-02-19 17:29:30 -05:00 |
|
Isaac Connor
|
e4ec1712f4
|
remove the table creation/dropping and a if/elseif fix
|
2018-02-18 11:48:00 -05:00 |
|
Isaac Connor
|
e18a14337f
|
use path to triggers.sql
|
2018-02-18 11:47:03 -05:00 |
|
Isaac Connor
|
fe0ccafae8
|
add missing ;
|
2018-02-18 11:29:22 -05:00 |
|
Isaac Connor
|
d52277b283
|
update monitor counts
|
2018-02-18 11:28:58 -05:00 |
|
Isaac Connor
|
4b04b1ee7c
|
remove unwanted space
|
2018-02-18 11:19:20 -05:00 |
|
Isaac Connor
|
94212eda2f
|
fix triggers
|
2018-02-18 11:01:33 -05:00 |
|
Isaac Connor
|
717d00ac99
|
missing //
|
2018-02-09 16:08:44 -05:00 |
|
Isaac Connor
|
0d5c8f385f
|
fix DiskSpace summing when Nulls are present
|
2018-02-07 08:02:49 -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
|
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 |
flashoftheblades
|
34f6584081
|
Update zm_create.sql.in
|
2018-02-05 18:53:47 -05:00 |
|
Isaac Connor
|
86ae1b6598
|
Add missing commas
|
2018-02-05 17:31:34 -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
|
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
|
868e17a414
|
Allow Method in Monitors to be NULL
|
2018-02-02 10:31:55 -05:00 |
|
Isaac Connor
|
060acffb9d
|
make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails.
|
2018-02-01 11:32:55 -05:00 |
|
Isaac Connor
|
73edd3221a
|
make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails.
|
2018-02-01 11:32:44 -05:00 |
|
Isaac Connor
|
ef51a21df4
|
add new runstate called Connected
|
2018-01-31 14:36:41 -05:00 |
|
Isaac Connor
|
456f29fcba
|
Rename column Id OF Monitor_Statuses to simplify JOINS.
|
2018-01-26 13:39:37 -05:00 |
|
Isaac Connor
|
2d9f9125aa
|
add update_storage_stats procedure
|
2018-01-26 13:08:10 -05:00 |
|
Isaac Connor
|
0bd1ee5992
|
Merge branch 'master' into m
|
2018-01-25 08:43:31 -05:00 |
|
Isaac Connor
|
b821d665bf
|
Fix commas
|
2018-01-24 12:16:18 -05:00 |
|
Isaac Connor
|
50fc4a2d94
|
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
|
2018-01-24 11:51:11 -05:00 |
Isaac
|
fd2d2a0d77
|
ad update to update events_update_trigger to dix totaldiskspace
|
2018-01-23 18:43:59 +01:00 |
Simpler1
|
ce19c65cc9
|
Ipcc (#2040)
* fix(ipcc): Invert up/down to work properly
* fix(ipcc): Change the initial values for ipcc camera
|
2018-01-22 15:33:11 -05:00 |
|
Isaac Connor
|
e59ade5391
|
Only alter MonitorIds if it exists.
|
2018-01-22 14:06:03 -05:00 |
|
Isaac Connor
|
843eee1e13
|
handle case where zmstats and zmstats.pl both exist
|
2018-01-22 14:05:38 -05:00 |
|
Isaac Connor
|
1291835c45
|
do some output to tell use what we are doing during update process
|
2018-01-19 16:32:48 -05:00 |
|
Isaac Connor
|
a03ceec154
|
Fix Day=>Wek
|
2018-01-19 13:29:45 -05:00 |
|
Isaac Connor
|
bc792a8325
|
Use coalesce to handle NULLs
|
2018-01-19 13:09:46 -05:00 |