Kyle Johnson
|
e51ff0677f
|
Fix typo in Frames index creation. I hope
|
2015-10-22 12:12:56 -06:00 |
Kyle Johnson
|
356fadbff8
|
Add index to Frames table for people updating
|
2015-10-22 11:36:55 -06:00 |
Kyle Johnson
|
746e695448
|
Add index to Frames table upon new creation
|
2015-10-22 11:25:32 -06:00 |
Andrew Bauer
|
8d2de77f18
|
Merge pull request #1079 from bofhdk/SunEyes_sp-p1802swptz
Added control script for SunEyes SP-P1802SWPTZ
|
2015-09-30 07:35:44 -05:00 |
Bobby Billingsley
|
ef5d62a6c2
|
typo fixed
|
2015-09-30 14:10:13 +02:00 |
Bobby Billingsley
|
a335afb554
|
added missing MonitorPresets values
|
2015-09-30 13:59:41 +02:00 |
Bobby Billingsley
|
6fe69f3d28
|
added missing Controls values
|
2015-09-30 13:55:14 +02:00 |
Kyle Johnson
|
291dfe0f70
|
Add db update script for 1.28.107. Fixes #663
|
2015-09-29 14:38:41 -06:00 |
Kyle Johnson
|
679a663861
|
Change Frame to have a PrimaryKey called ID
|
2015-09-29 14:30:54 -06:00 |
Isaac Connor
|
bfba16b87c
|
Fix message if Exif already exists
|
2015-09-17 15:16:05 -04:00 |
Andy Bauer
|
395e628541
|
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
Conflicts:
CMakeLists.txt
configure.ac
version
|
2015-08-29 07:57:18 -05:00 |
Andy Bauer
|
4fdd32b596
|
bump version to 1.28.106
|
2015-08-29 07:53:08 -05:00 |
Isaac Connor
|
1cf54d2e38
|
Merge pull request #1026 from schrorg/blacken-zones
Add new zone type - privacy zones
|
2015-08-27 09:14:16 -04:00 |
Isaac Connor
|
6093587ff2
|
Merge pull request #1039 from pliablepixels/1038-fixing-state-mgmt-1030-isActive-fix
1038 fixing state mgmt 1030 is active fix
|
2015-08-27 09:08:50 -04:00 |
Pliable Pixels
|
b18ffdc13e
|
States table updated to unique Name column
|
2015-08-26 11:20:22 -04:00 |
Pliable Pixels
|
82fe6c8f0e
|
States table now uses a unique Name column
|
2015-08-26 11:19:58 -04:00 |
Andrew Bauer
|
f5f7363d35
|
add RTSPDescribe column to Monitors table
|
2015-08-21 10:32:04 -05:00 |
Robin Daermann
|
5b465194f8
|
Renamed 'Blacken' zone type to 'Privacy'
|
2015-08-20 17:37:59 +02:00 |
Robin Daermann
|
fbcd6f365b
|
Change database schema (add 'Blacken' zone type) and bump version to 1.28.105
|
2015-08-20 16:17:08 +02:00 |
Andrew Bauer
|
fe3595bfa1
|
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
|
2015-08-18 20:20:53 -05:00 |
Andrew Bauer
|
68adcc9e67
|
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
|
2015-08-18 14:07:38 -05:00 |
Linwood-F
|
99c8af4a17
|
Bring up to date with master (mostly)
|
2015-08-17 22:52:51 -04:00 |
Robin Daermann
|
55eee8d6a4
|
Added SQL changes to zm_create.sql.in
Bumped version to 1.28.103 as requested
|
2015-08-17 15:05:17 +02:00 |
Robin Daermann
|
299c629a20
|
Merge remote-tracking branch 'upstream/master' into large-timestamp
Conflicts:
CMakeLists.txt
configure.ac
version
|
2015-08-17 13:42:36 +02:00 |
Robin Daermann
|
0547a66870
|
Bump version to 1.28.102
|
2015-08-17 13:40:30 +02:00 |
Andrew Bauer
|
3489d0d734
|
add Exif column to sql database
|
2015-08-16 17:43:45 -05:00 |
Andrew Bauer
|
461f81089b
|
change table name from monitors to users
|
2015-08-15 15:42:00 -05:00 |
Andrew Bauer
|
36c7d7f9c2
|
Add Group Edit permission to the default admin account
|
2015-08-15 14:58:41 -05:00 |
Andrew Bauer
|
c828a3df33
|
typo
|
2015-08-15 12:13:35 -05:00 |
Andrew Bauer
|
936aa00a5e
|
add sql bits
|
2015-08-15 12:00:48 -05:00 |
Robin Daermann
|
7f3a07f21b
|
Add label size to monitor options (database and backend part)
This commit bumps version to 1.28.101 because of database schema change
|
2015-08-10 15:35:18 +02:00 |
Emmanuel Papin
|
2ccb378e2d
|
Fix a typo error in sql file
|
2015-07-24 00:25:57 +02:00 |
Emmanuel Papin
|
649a39b372
|
Replace analysis interval parameter by analysis framerate
|
2015-07-23 16:36:30 -04:00 |
Emmanuel Papin
|
d2a3655d51
|
Fix a typo error in db/zm_create.sql.in
|
2015-07-22 22:15:34 +02:00 |
Emmanuel Papin
|
d0d72672a7
|
Fix sql files
|
2015-07-22 21:49:06 +02:00 |
Emmanuel Papin
|
132e0a1798
|
Add analysis fps paramter to monitors
|
2015-07-22 21:38:35 +02:00 |
Emmanuel Papin
|
a6b7c6e99f
|
Add analysis interval parameter to monitors
|
2015-07-21 22:52:52 +02:00 |
Isaac Connor
|
ace8597b8d
|
Merge branch 'master' into multi-server
|
2015-07-14 16:10:51 -04:00 |
Isaac Connor
|
bd84830433
|
fix comment
|
2015-07-14 16:10:09 -04:00 |
Isaac Connor
|
2819585cdb
|
move add ServerId to Monitors to zm_update-1.28.100.sql
|
2015-07-14 16:09:01 -04:00 |
Isaac Connor
|
bc0090f6f7
|
fix PRIMARY KEY update on States
|
2015-07-07 15:46:44 -04:00 |
Isaac Connor
|
1328ba456a
|
fix drop primary key line.
|
2015-07-07 09:43:56 -04:00 |
Isaac Connor
|
6d33da6245
|
Add ServerId to Monitors
|
2015-07-02 14:17:49 -04:00 |
Andrew Bauer
|
a738011c04
|
Update zm_update-1.28.99.sql
typo
|
2015-06-30 10:33:09 -05:00 |
Andy Bauer
|
1aebbec4e8
|
Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States
Conflicts:
db/zm_create.sql.in
db/zm_update-1.28.99.sql
|
2015-06-27 16:32:32 -05:00 |
Isaac Connor
|
09b052010e
|
remove extra comma
|
2015-06-26 10:57:44 -04:00 |
Isaac Connor
|
2fba839e8b
|
Add Servers Table and add Id PRIMARY KEY to States
|
2015-06-26 10:17:07 -04:00 |
Pliable Pixels
|
754091b55d
|
Added isRunning column
|
2015-06-21 09:30:23 -04:00 |
Pliable Pixels
|
d2472f177d
|
Added isRunning column
|
2015-06-21 09:30:14 -04:00 |
Pliable Pixels
|
b41538fe65
|
Added definition for Foscam FI8918W
|
2015-06-19 15:51:07 -04:00 |