3013d87783
Add -v --version command line param to zmpkg.pl
2015-01-07 09:05:16 -05:00
8ea01e631b
Add -v --version command line param to zmfilter.pl
2015-01-07 09:00:46 -05:00
94e0ec542a
Add -v --version command line param to zmdc.pl
2015-01-07 08:47:32 -05:00
76d0dfa475
Add -v --version command line param to zmcamtool.pl
2015-01-07 08:43:51 -05:00
71c94475ff
Add -v --version command line parameters to zmaudit.pl
2015-01-06 21:08:41 -05:00
1adb147899
add version command line argument to zmstreamer. Also add -h for consistency with other programs
2015-01-06 20:59:03 -05:00
258c97f75f
add version command line argument to zmf
2015-01-06 20:54:49 -05:00
85e51528a6
add version command line argument to zma
2015-01-06 20:52:18 -05:00
6f42f1c6d8
add version command line argument to zmc
2015-01-06 20:49:33 -05:00
fdb3efab57
Merge pull request #662 from hanzese/patch-2
...
Update et_ee.php
2015-01-06 13:13:22 -06:00
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
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
a44f83cb7d
#658 Fix error message for finding arp path
2015-01-05 07:58:39 +11:00
1cfec7e3e7
Move require of config.php and logger up higher
2015-01-04 11:50:24 -05:00
ac80649e26
Merge pull request #657 from ZoneMinder/log_export_use_PATH_SWAP
...
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 14:28:18 -06:00
3f64f9d919
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 15:16:19 -05:00
db5f5a61ad
Merge pull request #654 from lifeofguenter/patch_php_replace_exec_with_native
...
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 14:39:25 -05:00
56b1a50b2b
revert
2015-01-03 14:07:18 -05:00
474d1fb58d
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2015-01-03 14:00:07 -05:00
51bd39c7f6
already done in master
2015-01-03 13:59:54 -05:00
af570259d1
got these swapped, should be the other way around
2015-01-03 13:59:23 -05:00
14c65aefd2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
...
Conflicts:
src/zm_comms.cpp
2015-01-03 13:56:40 -05:00
cff42093b9
Merge pull request #653 from thebostik/master
...
Modified zmfilter.pl.in to fix #652 , crashing while processing backgroun..
2015-01-03 13:54:41 -05:00
8350ddac7c
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 19:22:19 +01:00
89a603cf27
Modified zmfilter.pl.in to fix #652 , crashing while processing background filter with no terms
2015-01-03 12:45:18 -05:00
c4310f262c
Merge pull request #651 from manupap1/cleanup_debian_folders
...
Remove no longer needed patch because applied to master
2015-01-03 08:36:48 -06:00
0de7217317
Remove no longer needed patch because applied to master
2015-01-03 14:13:41 +01:00
d61becb0d7
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2015-01-03 13:22:40 +01:00
e02da8833a
ifdef's for BSD
2015-01-02 17:08:51 -05:00
92e6d940bc
ifdef's for BSD and cleanup
2015-01-02 17:07:49 -05:00
1137c3907e
ifdef's for BSD
2015-01-02 17:06:16 -05:00
e460c6f448
BSD uses some different includes, these are from FreeBSD ports
2015-01-01 17:18:12 -05:00
d958a13114
this patch has been applied to master branch and is no longer needed.
2014-12-30 09:49:14 -05:00
4c97bd1137
Merge pull request #638 from KristofRobot/instantNotification
...
zmfilter: Send message for events that are still ongoing
2014-12-29 12:02:51 -05:00
ddae55a1c9
Merge pull request #645 from ZoneMinder/skin_css_default
...
Skin css default
2014-12-29 12:00:44 -05:00
bb2cecee8a
Update of build dependencies
2014-12-28 11:04:53 +01:00
f6d7000ac7
Merge pull request #647 from ariscop/master
...
Don't check for zmdc.pl when stopping via systemd
2014-12-23 06:58:32 -06:00
c69badc70d
Don't check for zmdc.pl when stopping via systemd
...
If this check ever actually returns true, it makes ExecStop a no-op
and systemd will forcefully kill all processes in the service
see man systemd.service
This also prevents a deadlock when running systemctl stop,
zmpkg.pl detects bash as it's parent and attempts to call
systemctl stop itself, which blocks forever waiting for the
task it's in to complete
2014-12-23 20:32:14 +11:00
d8e682c48b
Update of perl library dependencies
2014-12-21 04:02:41 +01:00
3bfee679f8
Move the refreshed patches to the right folder
2014-12-21 02:38:17 +01:00
2aa3f7e2da
Refresh the debian patches
2014-12-21 01:52:42 +01:00
aff6958398
Provide a patch to rename the service file in zmsystemctl.pl.in
2014-12-21 01:38:32 +01:00
df2473cdf7
Use a wilcard to reference man files
2014-12-20 21:11:44 +01:00
5bd3b18c7b
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2014-12-20 20:30:54 +01:00
fb1566c829
Fix package dependencies
2014-12-20 20:26:34 +01:00
939f126e76
Set the right filename for the systemd service and don't call zmupdate interactively
2014-12-20 20:21:29 +01:00
6cdb046b34
Do not repeat admin password question if already answered
2014-12-20 20:12:33 +01:00
5457d5c5e5
Move call to zmupdate.pl in core package because it requires zm.conf file and perl libraries
2014-12-19 16:32:36 +01:00
1131809c92
format duration into HH:MM:SS
2014-12-19 10:18:27 -05:00
ae1bf955e5
Update zm.conf file in package which provide it
2014-12-19 15:49:40 +01:00
Isaac Connor
Andrew Bauer
Hannes
Isaac Connor
Steve Gilvarry
Kyle Johnson
Günter Grodotzki
Stephen Arthur
Emmanuel Papin
Andrew Cook