7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
94ce84af40
Bump version to 1.29.0
2016-01-01 10:15:36 -06:00
8e25b80252
bump version due to db change adding ServerId to Logs
2015-12-31 10:14:20 -05:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
f322bde35c
increase version to 109 because I at some point pushed a db update script
2015-11-16 11:01:11 -05:00
029044bca3
merge master, bump version
2015-10-23 16:14:49 -04:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
9dcb3e1df3
Add Index to Frames table. Fixes #1085 .
2015-10-22 11:40:25 -06:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
2be61906a4
add checks for execinfo library
2015-10-02 13:37:50 -04:00
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
b94a148559
Bump version
2015-09-29 14:28:54 -06:00
d3dc214d90
let's keep all the versions up to date
2015-09-16 08:39:54 -04:00
70fa177a32
bump db version
2015-08-31 16:04:34 -04:00
fbcd6f365b
Change database schema (add 'Blacken' zone type) and bump version to 1.28.105
2015-08-20 16:17:08 +02:00
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
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
0547a66870
Bump version to 1.28.102
2015-08-17 13:40:30 +02:00
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
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
57843cc0c8
Added new Makefiles to configure.ac for dark CSS
2015-07-27 09:53:59 +02:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
47be582354
bump version to 1.28.100
2015-07-14 16:11:27 -04:00
376912158c
bump version to 1.28.99 so that dbupdate scripts actually run
2015-07-07 15:47:45 -04:00
d225bf983d
Update configure.ac
...
Add depreciated soon note.
2015-06-23 14:48:57 -05:00
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
d5e403b7e0
Merge pull request #775 from ZoneMinder/freebsd_fixes
...
Freebsd fixes
2015-04-17 15:21:42 -05:00
0a010a69bd
autotools - update v4l header file check
2015-04-03 17:36:09 -05:00
1b8554fad2
cleanup.
2015-04-01 12:17:23 -04:00
c2c130df37
try out the new AC_CONFIG_MACRO_DIRS feature.
2015-04-01 10:14:02 -04:00
bf3efa7a7a
allow AC_CHECK_SENDFILE because travis is complaining
2015-03-31 23:31:05 -04:00
21915eb92c
Merge branch 'master' into freebsd_fixes
2015-03-31 11:06:53 -04:00
6114acdadf
tell configure to look in m4 for additional macros
2015-03-27 15:15:12 -04:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
20107ac1e6
remove NETPBM dependency from autotools
2015-03-01 10:51:04 -06:00
1ffb497757
add lowercase test for BSD, add check for sendmail, don't check for libdl, add check for backtrace
2015-02-24 09:18:49 -05:00
c4daecc997
Remove duplicated test for CANONICAL_HOST
2015-02-23 16:58:10 -05:00
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
d7f58af939
Update configure.ac
...
Update ONVIF Description in configure.ac
2015-02-20 13:28:31 -06:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
77f554f7ba
bump verion to 1.28.1 in master
2015-02-18 18:24:26 -06:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
60d92d6a59
Add a check for librt which is needed on pi
2015-02-05 11:03:37 -05:00
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
60b69a4174
this add some quoting, it's something debian and ubuntu packaging does, but it's pretty clear that it is good in a more general sense.
2014-12-17 18:06:14 -05:00
6c9f93af63
Merge pull request #567 from knnniggett/zm_config_dir
...
Add the ability to specify the zm configdir at build time.
2014-12-08 10:01:17 -05:00
bf33eab17c
Merge branch 'video' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/zm_event.cpp
web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
82c01479c6
move flat css files into the classic skin.
...
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
2014-12-01 15:44:01 -05:00
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
SteveGilvarry
Andy Bauer
Isaac Connor
SteveGilvarry
Isaac Connor
Kyle Johnson
Isaac Connor
Robin Daermann
Andrew Bauer
Emmanuel Papin
Rick Sayre