Commit Graph

4126 Commits

Author SHA1 Message Date
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
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
Andrew Bauer 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
Isaac Connor 3f64f9d919 Make the log export use ZM_PATH_SWAP and report the full path on error 2015-01-03 15:16:19 -05:00
Kyle Johnson 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
Isaac Connor 56b1a50b2b revert 2015-01-03 14:07:18 -05:00
Isaac Connor 474d1fb58d Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2015-01-03 14:00:07 -05:00
Isaac Connor 51bd39c7f6 already done in master 2015-01-03 13:59:54 -05:00
Isaac Connor af570259d1 got these swapped, should be the other way around 2015-01-03 13:59:23 -05:00
Isaac Connor 14c65aefd2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
Conflicts:
	src/zm_comms.cpp
2015-01-03 13:56:40 -05:00
Isaac Connor 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
Günter Grodotzki 8350ddac7c replace getLoad() / getDiskPercent() with PHP native functions 2015-01-03 19:22:19 +01:00
Stephen Arthur 89a603cf27 Modified zmfilter.pl.in to fix #652, crashing while processing background filter with no terms 2015-01-03 12:45:18 -05:00
Andrew Bauer 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
Emmanuel Papin 0de7217317 Remove no longer needed patch because applied to master 2015-01-03 14:13:41 +01:00
Isaac Connor e02da8833a ifdef's for BSD 2015-01-02 17:08:51 -05:00
Isaac Connor 92e6d940bc ifdef's for BSD and cleanup 2015-01-02 17:07:49 -05:00
Isaac Connor 1137c3907e ifdef's for BSD 2015-01-02 17:06:16 -05:00
Isaac Connor e460c6f448 BSD uses some different includes, these are from FreeBSD ports 2015-01-01 17:18:12 -05:00
Isaac Connor d958a13114 this patch has been applied to master branch and is no longer needed. 2014-12-30 09:49:14 -05:00
Isaac Connor 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
Isaac Connor ddae55a1c9 Merge pull request #645 from ZoneMinder/skin_css_default
Skin css default
2014-12-29 12:00:44 -05:00
Andrew Bauer 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
Andrew Cook 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
Isaac Connor 1131809c92 format duration into HH:MM:SS 2014-12-19 10:18:27 -05:00
Isaac Connor 05206279df add missing commas 2014-12-18 09:44:04 -05:00
Isaac Connor 478c9bc630 add custom lines for loading the available skins and css options 2014-12-18 09:34:14 -05:00
Isaac Connor 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
Isaac Connor 50e6784779 this adds two config options to System tab to set the default skin and css 2014-12-17 16:45:41 -05:00
Isaac Connor d7586c2a28 fix a bare ZM_PATH_BIN which should be $Config{ZM_PATH_BIN} 2014-12-17 16:35:30 -05:00
Isaac Connor b921b6f254 the debian packaging has this, and apparently we need it to build 2014-12-17 16:23:04 -05:00
Isaac Connor 5dd1b6a388 this is in debian 2014-12-17 16:11:26 -05:00
Isaac Connor 9b860fb08c libjpeg updates to match debian 2014-12-17 16:10:54 -05:00
Isaac Connor 67fc4c5ea9 update to what has been done in debian 2014-12-17 15:43:32 -05:00
Isaac Connor e9e6d84c7b bump release # 2014-12-17 15:30:20 -05:00
Isaac Connor 45feac3d36 Merge pull request #640 from jrd288/offer_login
Offer login prompt instead of throwing error
2014-12-16 09:35:08 -05:00
Andrew Bauer c28206e8d1 Merge pull request #632 from ZoneMinder/better_security
better fix for the view=console security flaw.
2014-12-16 08:34:14 -06:00
Andrew Bauer 8b44c6d732 Merge pull request #635 from ZoneMinder/zmcontrol_improvements
Improve zmcontrol.pl
2014-12-16 07:18:59 -06:00
Andrew Bauer abf8a55747 Merge pull request #631 from ZoneMinder/fix_security_on_watch
add check to see if user has rights to view this monitor
2014-12-16 07:15:17 -06:00
jrd288 52d3ec7142 Fixed autotools build to reflect file name change
postlogin.js -> postlolgin.js.php
2014-12-15 18:11:06 -05:00
jrd288 f4289cd253 postlogin.js replaced by postlogin.js.php 2014-12-15 17:38:18 -05:00
jrd288 10dba9b4c2 Offer login instead of error
When a user accesses a view but receives an error, and is not logged
on, he is offered a login prompt instead.  The login prompt saves the
original query URL in a hidden field, and postlogin redirects back to
the original URL once the user has logged on.

If the user is logged in and there is an error, no login prompt is
shown.

This allows the user to click an event link in an e-mail and then log
in before being shown the event, instead of requiring going back
through the front ZM page to log in.
2014-12-15 17:17:03 -05:00
Kristof Robot 643438e3f2 zmfilter: Send message for events that are still ongoing 2014-12-15 08:15:59 +01:00