Isaac Connor
|
eb5f0b370e
|
fix type of Config.DefaultValue and add NOT NULL to Message
|
2016-12-12 22:23:56 -05:00 |
Isaac Connor
|
593fbf0022
|
Merge branch 'message_column_to_text' into storageareas
|
2016-12-12 21:59:00 -05:00 |
Isaac Connor
|
e058217a4b
|
add a db update script to update the Messages column to a TEXT type.
|
2016-12-12 21:55:32 -05:00 |
Andy Bauer
|
4be668f838
|
Add HikVision ptz control sciprt
|
2016-11-06 08:03:43 -06:00 |
Isaac Connor
|
ea27e07276
|
add indexes for Monitors(ServerId) and Servers(Name)
|
2016-10-20 13:19:41 -04:00 |
Isaac Connor
|
4fc85fd89c
|
add indexes for Monitors(ServerId) and Servers(Name)
|
2016-10-20 13:18:33 -04:00 |
Isaac Connor
|
5a842f34cf
|
fix extra ,
|
2016-10-12 16:17:43 -04:00 |
Isaac Connor
|
1862611b94
|
add Orientation to Events table
|
2016-10-12 09:11:50 -04:00 |
Jon Gerdes
|
ee720c4561
|
Control script for Keekoon cameras. Tested with KK002.
|
2016-07-25 11:20:49 +01:00 |
Andy Bauer
|
6950e3385a
|
bump project to 1.30.0
|
2016-05-31 19:41:17 -05:00 |
Isaac Connor
|
f0a9820096
|
need to convert NULL values before saying not null
|
2016-09-20 17:53:35 -04:00 |
Isaac Connor
|
bc0b499697
|
update zm_create.sql.in to match the update scripts
|
2016-09-20 14:10:37 -04:00 |
Isaac Connor
|
18ae1298c4
|
need this update that converts StorageId to NOT NULL default 0
|
2016-09-16 09:00:34 -04:00 |
Isaac Connor
|
85b2ba73ab
|
change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH
|
2016-09-14 09:31:57 -04:00 |
Isaac Connor
|
6994a76488
|
cleanup, update version #'s on db update scripts that need to move because we released 1.30
|
2016-08-30 12:27:45 -04:00 |
Isaac Connor
|
714c551359
|
Add some more fields relating to ptz controls that should be able to be NULL
|
2016-08-17 09:39:55 -04:00 |
Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -04:00 |
Isaac Connor
|
a089f11014
|
add more NULL columns
|
2016-07-19 17:17:11 -04:00 |
Isaac Connor
|
be1083e007
|
add more fields that can be NULL
|
2016-07-14 10:28:00 -04:00 |
Isaac Connor
|
71f2ac423d
|
Add NULL For Id column in Filters when adding PurgeWhenFull
|
2016-06-22 09:44:14 -04:00 |
Isaac Connor
|
c3d3514e51
|
fix update script to add Id column to Filters
|
2016-06-15 11:35:11 -04:00 |
Isaac Connor
|
ea87d9a305
|
fix merge problem
|
2016-06-14 21:16:38 -04:00 |
Isaac Connor
|
b8c406f969
|
Merge branch 'master' into storageareas
|
2016-06-03 09:32:55 -04:00 |
Isaac Connor
|
f86c7735e3
|
Merge branch 'filter_id' into storageareas
|
2016-05-30 10:28:40 -04:00 |
Isaac Connor
|
06e14c63c2
|
Add Id column as Primary key to Filters
|
2016-05-30 10:25:30 -04:00 |
Isaac Connor
|
654d4d2bee
|
Merge branch 'api_fixes' into storageareas
|
2016-05-07 10:56:47 -04:00 |
Isaac Connor
|
e101aed2d5
|
Remove IGNORE keyword, it is invalid
|
2016-05-05 15:10:30 -04:00 |
Isaac Connor
|
e1cbaed2a3
|
Merge branch 'icon_video' into storageareas
|
2016-04-06 12:50:46 -04:00 |
Isaac Connor
|
709fc35167
|
Merge branch 'master' into icon_video
|
2016-04-06 11:49:40 -04:00 |
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
Andy Bauer
|
4e9a925933
|
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
|
2016-04-04 20:52:49 -05:00 |
Isaac Connor
|
397eb1a01b
|
increase the size of the Pid field in Logs to accomodate FreeBSD
|
2016-04-04 15:14:42 -04:00 |
Isaac Connor
|
ed74168710
|
increase the size of the Pid field in Logs to accomodate FreeBSD
|
2016-04-04 15:14:14 -04:00 |
Isaac Connor
|
b3fed1767b
|
Add Concurrent value to the PurgeWhenFull Filter. Default to false
|
2016-04-04 11:57:11 -04:00 |
Isaac Connor
|
2a892c5b9a
|
Merge branch 'iconnor_video' into storageareas
|
2016-03-31 15:34:52 -04:00 |
Isaac Connor
|
742fab2ea4
|
Add db updates for Video and recordAudio
|
2016-03-31 15:32:24 -04:00 |
SteveGilvarry
|
5ff427d9e9
|
Removed Autotools Makefile.am
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-02-26 22:19:02 +11:00 |
Isaac Connor
|
86c223668d
|
Merge branch 'master' into storageareas
|
2016-02-25 19:11:38 -05:00 |
Andy Bauer
|
7a42a8c3f9
|
add Netcat ONVIF compatible ptz control
|
2016-02-24 10:15:59 -06:00 |
Isaac Connor
|
b7256a6891
|
Merge branch 'master' into storageareas
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
|
2016-02-10 09:17:40 -05:00 |
Andy Bauer
|
b718bd298f
|
Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ
|
2016-02-09 06:56:38 -06:00 |
Isaac Connor
|
47c2023441
|
Add Concurrent to Filters
|
2016-02-05 11:23:45 -05:00 |
Isaac Connor
|
5fbeb474a8
|
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
|
2016-02-04 12:25:51 -05:00 |
Isaac Connor
|
a442ef3be8
|
move the content from 1.28.109 into 1.30.1
|
2016-02-04 12:25:16 -05:00 |
Isaac Connor
|
1837cc89ea
|
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
Conflicts:
CMakeLists.txt
configure.ac
version
|
2016-02-04 12:24:07 -05:00 |
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
Isaac Connor
|
d65c9d797b
|
fix merge, update to 1.30.1
|
2016-02-04 12:13:48 -05:00 |
Isaac Connor
|
9ace6c518d
|
Merge pull request #1225 from Simpler1/profiles
Added profiles for Wanscam-HW0025 and IPCC-7210W
|
2016-02-04 11:55:48 -05:00 |
Brandon Odegard
|
029c1efa31
|
Corrected update version comment to 1.28.110
Corrected version comment to indicate database update from 1.28.109 to 1.28.110
|
2016-01-22 10:48:47 -06:00 |
Brandon Odegard
|
8753ee98e5
|
Corrected update version comment to 1.28.109
Corrected version comment to indicate an update from 1.28.108 to 1.28.109
|
2016-01-22 10:46:46 -06:00 |
Isaac Connor
|
ddf7b1ad43
|
Merge branch 'master' into storageareas
Conflicts:
web/skins/classic/js/dark.js
web/skins/classic/js/flat.js
|
2016-01-14 09:41:24 -05:00 |
Isaac Connor
|
47d4331d62
|
Add Hostname Column to create script, to match update
|
2016-01-10 20:58:45 -05:00 |
Simpler1
|
0d5d43251f
|
Added lines to db/zm_create.sql.in for two cameras
|
2016-01-04 15:51:11 -05:00 |
Isaac Connor
|
b1205bcaa9
|
Merge branch 'multi-server' into storageareas
Conflicts:
CMakeLists.txt
configure.ac
scripts/zmaudit.pl.in
version
|
2016-01-02 14:45:24 -05:00 |
Isaac Connor
|
93dbc3f0c1
|
Merge multi-server updates and bump version
|
2016-01-01 16:31:02 -05:00 |
Andy Bauer
|
94ce84af40
|
Bump version to 1.29.0
|
2016-01-01 10:15:36 -06:00 |
Isaac Connor
|
8e25b80252
|
bump version due to db change adding ServerId to Logs
|
2015-12-31 10:14:20 -05:00 |
SteveGilvarry
|
eb2829a680
|
Remove comma preventing db create script running
|
2015-12-29 00:04:17 +11:00 |
Isaac Connor
|
3802d16922
|
add ServerId to Events Table
|
2015-12-15 12:09:11 -05:00 |
Isaac Connor
|
a196906345
|
Move where StorageId goes to after ServerId
|
2015-12-15 09:12:11 -05:00 |
Isaac Connor
|
43968b7862
|
add Storage table creation
|
2015-12-14 17:03:45 -05:00 |
Isaac Connor
|
9488f71244
|
Add zmupdate script to add Storage table and StorageId to Monitors, and bump version
|
2015-12-14 17:00:04 -05:00 |
Isaac Connor
|
b2b1afa8ad
|
Merge master
|
2015-12-14 15:49:32 -05:00 |
Isaac Connor
|
7f5958d873
|
remove comma that shouldn't be there
|
2015-11-16 11:01:41 -05:00 |
Isaac Connor
|
0ee7b3d729
|
add hostname to Servers table
|
2015-11-11 16:54:41 -05:00 |
Isaac Connor
|
5e70146b0e
|
Monitor->Frames, since we are updating Frames
|
2015-11-11 16:43:57 -05:00 |
Robin Daermann
|
1f1b48ed51
|
Added Vivotek ePTZ control to zm_create.sql
|
2015-11-04 19:17:47 +01:00 |
Robin Daermann
|
330e0d7adf
|
Add Vivotek ePTZ control module to database
|
2015-11-04 17:29:07 +01:00 |
baffo32
|
d0ce4904ff
|
Stray semicolon causes SQL error
also normalized space around '='
|
2015-10-24 17:58:20 -04:00 |
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 |