dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
a2d266f8f9
fix floreen ptz control sql
2017-12-09 16:05:42 -06:00
a867c488e0
ned to actually remove the MonitorIds column
2017-12-09 14:05:18 -05:00
e46f75c130
fix db update
2017-12-05 15:22:15 -08:00
4f40b0464c
Don't remove MonitorIds column.. just to support downgrading
2017-12-04 17:11:16 -05:00
1f2f708287
Handle empty strings in MonitorsIds
2017-12-04 17:00:52 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
af1729792f
add AutoMove and AutoMoveTo to Filters
2017-12-03 17:04:11 -05:00
4a884afecb
need the update file
2017-11-26 15:08:12 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
1fe421ed9d
add DiskSpace columns to Monitors
2017-11-22 14:22:12 -08:00
1745c83d2f
add eventcount columns to Monitors
2017-11-22 14:04:07 -08:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
7cdd6b2596
fix crap from merge of Floreen camera ptz
2017-11-21 12:19:47 -05:00
ded6b1864a
2006 support floureon 1080p 18x 30x ( #2007 )
...
* perl control script for Fluoreon 1080p
* DB update for Floureon cameras support
2017-11-18 19:02:23 -05:00
d411ed329b
get rid of mistyped zmaFPS and zmcFPS
2017-11-16 09:14:26 -05:00
bfd28dda71
Update zm_create.sql.in
...
Added missing column `AnalysisFPS`
2017-11-15 17:59:07 -08:00
087a902698
Update zm_create.sql.in
...
The `CaptureFPS` column is missing in the db creation script, causing errors in the Log whenever a monitor is queried.
2017-11-15 17:44:59 -08:00
a7f590a28d
add value for the DiskSpace column
2017-11-01 12:37:08 -04:00
ac6964b159
add position clearing to other Layouts
2017-11-01 11:56:18 -04:00
b1cb83c8ff
Freeform layout has to clear left,top,bottom,right
2017-11-01 11:53:45 -04:00
36e13039c7
Switch to LONGTEXT FROM JSON type
2017-11-01 11:05:21 -04:00
3deb8a35bb
fixes
2017-10-30 21:38:27 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
01acd154f9
fix adding Layouts
2017-10-30 16:28:55 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
f420dde04d
fix quotes
2017-10-30 09:05:08 -04:00
b3d420b13b
add standard layouts to db creation
2017-10-27 12:06:07 -07:00
9942b886f2
conditionally add the standard layouts
2017-10-27 12:04:42 -07:00
60fb654a47
rough in the MontageLayouts table
2017-10-27 09:57:41 -07:00
127608e36a
add Indexes to logs
2017-10-25 11:10:56 -07:00
fdbbc5101e
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-10-24 16:10:20 -07:00
e34ed8898a
Add Index to Logs
2017-10-24 16:10:04 -07:00
cfaf10335b
add Monitor status, capturrFPS and AnalysisFPS to processes
2017-10-24 16:08:31 -07:00
cedad14507
fix Load->CpuLoad
2017-10-24 15:13:02 -07:00
f32103b01d
Add Load, Mem, Swap to Servers
2017-10-24 14:21:25 -07:00
12fd1c151e
add Load and Memory fields to Servers
2017-10-24 11:58:44 -07:00
57bc975454
Rouch in Maps
2017-10-23 10:52:51 -07:00
c8cb00e57e
fix typo
2017-10-16 08:30:28 -07:00
581b7262ce
Fix error when creating DB with zm_create.sql
...
The following command:
`mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql`
Throws the following error:
`ERROR 1136 (21S01) at line 603: Column count doesn't match value count at row 1`
This is due to a missing column when inserting into the Storage table on line 603
2017-10-15 01:24:35 -07:00
b96b2636bb
add the update to add Type to Storage
2017-10-12 07:50:43 -07:00
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
e16d852248
make DiskSpace be a bigint
2017-10-11 14:07:01 -04:00
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
20087e69e6
TEXT cannot have a default value
2017-10-04 22:22:28 -04:00
b2426321b0
increase the length of MonitorIds in Groups
2017-10-04 21:53:47 -04:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
e8cc0d8256
set a default on DefaultVideo
2017-10-02 15:43:15 -04:00
Isaac Connor
Andy Bauer
Isaac Connor
Isaac Connor
Ognyan Bankov
Daniel Hodgson
Isaac Connor
Daniel Hodgson
Isaac Connor
Isaac Connor
APHW2 MFGENG