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
72d1581f44
Display plugins with zmu even if plugin loading is not enabled
2015-01-04 14:44:43 +01:00
491df7671d
Fix a typo error in a variable name
2015-01-04 14:01:01 +01:00
39e6de8f68
Fix conflict when merging from master
2015-01-04 12:29:20 +01:00
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
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
7fc359e940
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
2015-01-03 13:46: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
8619ed1322
Only load plugins when it is necessary
2015-01-01 22:33:03 +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
091b31ae93
Fix conflicts when merging master
2014-12-31 12:22:55 +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
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
a9986d6aa0
Merge branch 'debian_package_split' into plugin_support
2014-12-28 11:09:42 +01: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
e08c706d3c
Fix text encoding in french lang file
2014-12-22 02:45:01 +01:00
54d8e103d9
Replace short php tags in plugin.php
2014-12-22 00:28:16 +01:00
fe0476f36b
Revert commit 123326c299
2014-12-21 21:20:36 +01:00
d9bcf3aeef
Fix bad declaration in zm_detector.h
2014-12-21 20:54:42 +01:00
7c3ddece88
Remove some remaining files auto-generated by libtool in rules file
2014-12-21 18:50:04 +01:00
bc89082548
Refresh a patch in the debian directory
2014-12-21 18:23:51 +01:00
c1d7d7c744
Try to fix 'ltmain.sh not found' issue at first compilation
2014-12-21 17:40:08 +01:00
d2b1bfae13
Fix conflict when merging debian_package_split
2014-12-21 17:04:46 +01:00
db61f93c35
Merge branch 'debian_package_split' into plugin_support_test
...
Conflicts:
distros/debian8/control
2014-12-21 16:56:10 +01:00
Andrew Bauer
Hannes
Isaac Connor
Steve Gilvarry
Isaac Connor
Emmanuel Papin
Kyle Johnson
Günter Grodotzki
Stephen Arthur
Andrew Cook