Commit Graph

4230 Commits

Author SHA1 Message Date
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
Emmanuel Papin d61becb0d7 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split 2015-01-03 13:22:40 +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
Emmanuel Papin bb2cecee8a Update of build dependencies 2014-12-28 11:04:53 +01: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
Emmanuel Papin d8e682c48b Update of perl library dependencies 2014-12-21 04:02:41 +01:00
Emmanuel Papin 3bfee679f8 Move the refreshed patches to the right folder 2014-12-21 02:38:17 +01:00
Emmanuel Papin 2aa3f7e2da Refresh the debian patches 2014-12-21 01:52:42 +01:00
Emmanuel Papin aff6958398 Provide a patch to rename the service file in zmsystemctl.pl.in 2014-12-21 01:38:32 +01:00
Emmanuel Papin df2473cdf7 Use a wilcard to reference man files 2014-12-20 21:11:44 +01:00
Emmanuel Papin 5bd3b18c7b Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split 2014-12-20 20:30:54 +01:00
Emmanuel Papin fb1566c829 Fix package dependencies 2014-12-20 20:26:34 +01:00
Emmanuel Papin 939f126e76 Set the right filename for the systemd service and don't call zmupdate interactively 2014-12-20 20:21:29 +01:00
Emmanuel Papin 6cdb046b34 Do not repeat admin password question if already answered 2014-12-20 20:12:33 +01:00
Emmanuel Papin 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
Isaac Connor 1131809c92 format duration into HH:MM:SS 2014-12-19 10:18:27 -05:00
Emmanuel Papin ae1bf955e5 Update zm.conf file in package which provide it 2014-12-19 15:49:40 +01:00
Emmanuel Papin 27ca8f7ee4 Rename database package and update descriptions 2014-12-18 20:05:59 +01: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
Emmanuel Papin 9745a1fb0b Remove useless file libzoneminder-perl.manpages 2014-12-18 15:04:50 +01:00
Emmanuel Papin 5e41665d88 Fix some lintian errors and warning after package spliting 2014-12-18 11:03:54 +01: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
Emmanuel Papin 9f6e4dd794 Set the new dbg package name in the rules file 2014-12-16 21:15:11 +01:00
Emmanuel Papin 3b3a4772a4 Fix installatino of man files and sql files 2014-12-16 20:58:54 +01: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
Emmanuel Papin 7189de829c Split files in multiple packages (lb, core, ui...) 2014-12-16 12:42:51 +01:00