abddb5d916
Readd commit 60b69a4174 from upstream master
2015-01-13 01:18:56 +01:00
cdfb4b4bb5
Merge branch 'plugin_support_basic' into plugin_support
...
Conflicts:
distros/debian8/zoneminder.dirs
2015-01-01 19:13:53 +01:00
ee259be366
Remove unwanted modification in configure.ac
2015-01-01 19:11:53 +01:00
d070b36aec
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
2014-12-31 12:23:26 +01:00
45edab3ad9
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support_basic
...
Conflicts:
distros/debian/control
distros/debian8/zoneminder.dirs
web/skins/classic/views/js/Makefile.am
2014-12-31 12:20:56 +01:00
c1d7d7c744
Try to fix 'ltmain.sh not found' issue at first compilation
2014-12-21 17:40:08 +01: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
f79887d453
Update version in configure.ac and CMakeLists.txt
2014-12-14 00:37:54 +01:00
82ef0edac3
Restore conflictuous modifications for plugin support
2014-12-13 20:02:58 +01:00
d961831355
Fix conflict when merging upstream master
2014-12-13 19:54:54 +01: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
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
e37793f79a
Upgrade version to force database update
2014-11-29 22:28:56 +01:00
1e6902f870
Correct the list of Makefiles to be generated
2014-11-26 11:59:51 -05:00
2033918b24
Add a pkg-config file
2014-11-11 23:53:09 +01:00
12f0177f14
Add plugin options in configure
2014-11-11 23:03:25 +01:00
03d03bda21
Add a global configuration file for plugins
2014-11-11 20:59:58 +01:00
e60c3d552c
Remove unwanted dependencies
2014-11-11 20:24:48 +01:00
26608afa2d
Remove obsolete declaration
2014-11-11 19:49:28 +01:00
93a29545ce
Add libtool support for plugins
2014-11-11 19:46:20 +01:00
2e8935daf2
Add the ability to specify the zm configdir at build time.
2014-11-11 09:15:15 -06:00
71b56a163d
Zoneminder 1.28.0 Release
2014-10-18 15:23:13 -05:00
a359ea7101
fix copy paste typo
2014-10-05 11:40:10 -05:00
56fd08d6e9
Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR
2014-10-05 09:42:47 -05:00
ad364d090a
rename and process zmsystemctl.pl.in
2014-08-19 17:19:44 -05:00
1e8e710f5a
full systemd support
2014-08-10 08:47:11 -05:00
2087780ec1
tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set
2014-07-29 14:43:13 -04:00
c58c4a9720
add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall
2014-06-25 15:28:10 -04:00
caa0cb0fd5
Bump version to v1.27.1 to fix upgrade db issues
2014-06-06 08:58:35 +03:00
ffa952419c
Merge branch 'mysql2PDO'
...
Conflicts:
distros/ubuntu1204/changelog
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
web/includes/actions.php
2014-03-20 16:48:03 -04:00
189d9938cc
Add zmcamtool to autotools file manifest
2014-03-16 07:32:18 -05:00
9d3117a428
Bumped version to 1.27
2014-02-06 22:40:16 -05:00
6f5c9182ce
Add paths to flat skin in configure.ac and Makefile.am
2014-01-24 13:58:51 -05:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
dce1cbf0ce
Add header file checks for vlc/vlc.h
2013-12-21 06:47:12 +02:00
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
dc0d305811
Bump version to 1.26.5
2013-12-13 13:39:23 -05:00
bed30d32b6
Remove round() mess
2013-11-15 11:41:26 +02:00
463d8a136f
Merge branch 'master' into mysql2PDO
...
Conflicts:
zm.conf.in
2013-11-08 11:22:09 -05:00
9979385c3b
Remove the crashtrace option from configure.ac (autoconf)
2013-11-07 23:35:44 +02:00
d87709528d
fix assigning DB_TYPE
2013-11-06 17:47:23 -05:00
90d7ce98f1
Delete PATH_BUILD and TIME_BUILD from zm.conf and setup default for
...
ZM_DB_TYPE
2013-11-04 22:38:21 +02:00
72b80d7417
remake this branch off master instead of off mysql2PDO.
...
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
2013-11-01 09:47:28 -04:00
cd63b0a2a7
add defaults for ZM_DB_TYPE
2013-10-16 16:10:31 -04:00
022ecf4227
Merge pull request #201 from ZoneMinder/signalfixes
...
Signal improvements and fixes
2013-10-07 08:45:12 -07:00
01be7a8aec
Update configure.ac
...
make ZoneMinder lowercase to match the folder with the same name
2013-10-07 09:14:53 -05:00
e04cc4d026
Create pkgdatadir in make
2013-10-07 08:28:19 -05:00
1d7f664627
1) Removed the use of deprecated and undocumented sigcontext (Replaced by siginfo and ucontext)
...
2) Removed the checks for sigcontext, strsignal and siginfo.h
3) Added debugging code to the die handler
4) Using SA_RESTART in the hup and reload handlers to prevent certain functions returning EINTR
5) Added SIGINT and SIGQUIT to the term handler
2013-10-07 10:37:58 +03:00
b5c536b134
Signal and backtrace improvements
2013-10-06 18:26:33 +03:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
Emmanuel Papin
Isaac Connor
Isaac Connor
Andrew Bauer
Kfir Itzhak
Kyle Johnson
Edward Barnard
Andy Bauer
Isaac Connor