ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,256 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

4256 Commits

Author SHA1 Message Date
Emmanuel Papin 9360837d38 Add a DeleteEvent function to Event cpp class 2015-01-26 21:13:05 +01:00
Emmanuel Papin 35ed0b475c Move a global static declaration to main binary source files. Yes this duplicates coding lines, but this allows to load plugins without destroying the variable allocation in zm binaries. 2015-01-26 20:12:20 +01:00
Emmanuel Papin a7b912b1b5 Fix call to onCloseEvent 2015-01-17 21:54:47 +01:00
Emmanuel Papin 7906307580 Fix compilation errors 2015-01-17 19:04:20 +01:00
Emmanuel Papin 53c8a3073f Update debian changelog file 2015-01-17 18:41:18 +01:00
Emmanuel Papin 9cc53883ab Merge branch 'debian_package_split' into plugin_support_new 
Conflicts:
	distros/debian8/changelog
 2015-01-17 18:34:11 +01:00
Emmanuel Papin 70a062a609 Remove image argument in new functions 2015-01-17 18:30:24 +01:00
Emmanuel Papin 279459bf2c Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split 2015-01-15 21:35:52 +01:00
Emmanuel Papin c6c4e70a36 Switch debian8 folder to native source format 2015-01-15 21:32:01 +01:00
Emmanuel Papin 2227d9c852 Add new fuctions for plugins 2015-01-15 16:51:46 +01:00
Andrew Bauer d8df44fefe Update INSTALL 2015-01-14 21:42:18 -06:00
Andrew Bauer 44606942fa Rename zoneminder.cmake.f20.spec to zoneminder.f20.spec 2015-01-13 08:17:42 -06:00
Andrew Bauer 010fd69b0b Rename zoneminder.cmake.el6.spec to zoneminder.el6.spec 2015-01-13 08:17:20 -06:00
Andrew Bauer 7c99886af2 Update zoneminder.cmake.el6.spec 
net-tools is the package that contains the arp command.
 2015-01-13 08:16:05 -06:00
Andrew Bauer 3b418bb455 Update zoneminder.cmake.f20.spec 
net-tools is the package that contains the arp command
 2015-01-13 08:15:02 -06:00
Emmanuel Papin abddb5d916 Readd commit 60b69a4174 from upstream master 2015-01-13 01:18:56 +01:00
Emmanuel Papin ce90a37bb8 Merge branch 'debian_package_split' into plugin_support 
Conflicts:
	distros/debian8/patches/series
 2015-01-13 01:11:04 +01:00
Emmanuel Papin 47ef5c999f Add dependency to apache2 for zoneminder-core package 2015-01-12 22:22:40 +01:00
Emmanuel Papin f05dc5e2a3 Rename debian patch 2015-01-12 21:03:29 +01:00
Emmanuel Papin e1824aad4b Fix a conflict when merging upstream master 2015-01-12 20:52:14 +01:00
Emmanuel Papin 0650ca1de0 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split 
Conflicts:
	distros/debian8/patches/01_vendor-perl.diff
	distros/debian8/patches/series
 2015-01-12 20:48:59 +01:00
Emmanuel Papin 77138c48d2 Fix a conflict in php lang files after merge from upstream master 2015-01-10 17:55:46 +01:00
Emmanuel Papin b5ab290e78 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 
Conflicts:
	web/lang/et_ee.php
 2015-01-10 17:47:30 +01:00
Andrew Bauer d787ad3f7a Merge pull request #666 from ZoneMinder/kill_zmcontrol 
Kill zmcontrol
 2015-01-07 17:28:08 -06:00
Isaac Connor 74929236e3 put the sendControlCommand(quit) into the right place 2015-01-07 16:56:10 -05:00
Isaac Connor 21ccb9b91a introduce the quit command which makes the resident zmcontrol.pl exit 2015-01-07 16:37:26 -05:00
Isaac Connor d0138af00c use new sendControlCommand function to send normal commands as well as send the quit command on monitor edit. 2015-01-07 16:24:34 -05:00
Isaac Connor 2e48c2ba3d add sendControlCommand function to do the heavy work of sending zmcontrol a command 2015-01-07 16:24:07 -05:00
Andrew Bauer 2f5abfbb13 Merge pull request #664 from ZoneMinder/versions 
Versions command line args
 2015-01-07 08:50:42 -06:00
Isaac Connor a10f2aa31c Add version to the usage line in zmx10.pl 2015-01-07 09:14:00 -05:00
Isaac Connor 7f934e0e69 Add version to the usage line in zmvideo.pl 2015-01-07 09:11:07 -05:00
Isaac Connor 5b79139a05 Add version to the usage line in zmsystemctl.pl 2015-01-07 09:07:40 -05:00
Isaac Connor 3013d87783 Add -v --version command line param to zmpkg.pl 2015-01-07 09:05:16 -05:00
Isaac Connor 8ea01e631b Add -v --version command line param to zmfilter.pl 2015-01-07 09:00:46 -05:00
Isaac Connor 94e0ec542a Add -v --version command line param to zmdc.pl 2015-01-07 08:47:32 -05:00
Isaac Connor 76d0dfa475 Add -v --version command line param to zmcamtool.pl 2015-01-07 08:43:51 -05:00
Isaac Connor 71c94475ff Add -v --version command line parameters to zmaudit.pl 2015-01-06 21:08:41 -05:00
Isaac Connor 1adb147899 add version command line argument to zmstreamer. Also add -h for consistency with other programs 2015-01-06 20:59:03 -05:00
Isaac Connor 258c97f75f add version command line argument to zmf 2015-01-06 20:54:49 -05:00
Isaac Connor 85e51528a6 add version command line argument to zma 2015-01-06 20:52:18 -05:00
Isaac Connor 6f42f1c6d8 add version command line argument to zmc 2015-01-06 20:49:33 -05:00
Andrew Bauer fdb3efab57 Merge pull request #662 from hanzese/patch-2 
Update et_ee.php
 2015-01-06 13:13:22 -06:00
Hannes 4508c541ef Update et_ee.php 
Fixing Some problems 
Parse error: syntax error, unexpected 'Parameters' (T_STRING) in /usr/share/zoneminder/lang/et_ee.php
 2015-01-06 17:10:58 +02:00
Isaac Connor e9fc7cf33a Merge pull request #660 from SteveGilvarry/patch-3 
#658 Fix error message for finding arp path
 2015-01-04 19:18:17 -05:00
Steve Gilvarry a44f83cb7d #658 Fix error message for finding arp path 2015-01-05 07:58:39 +11:00
Isaac Connor 1cfec7e3e7 Move require of config.php and logger up higher 2015-01-04 11:50:24 -05:00
Emmanuel Papin 72d1581f44 Display plugins with zmu even if plugin loading is not enabled 2015-01-04 14:44:43 +01:00
Emmanuel Papin 491df7671d Fix a typo error in a variable name 2015-01-04 14:01:01 +01:00
Emmanuel Papin 39e6de8f68 Fix conflict when merging from master 2015-01-04 12:29:20 +01:00
Emmanuel Papin f551b50ec0 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 
Conflicts:
	distros/debian8/patches/01_vendor-perl.diff
	distros/debian8/patches/series
 2015-01-04 12:23:29 +01:00