Commit Graph

4166 Commits

Author SHA1 Message Date
Emmanuel Papin d9bcf3aeef Fix bad declaration in zm_detector.h 2014-12-21 20:54:42 +01:00
Emmanuel Papin 7c3ddece88 Remove some remaining files auto-generated by libtool in rules file 2014-12-21 18:50:04 +01:00
Emmanuel Papin bc89082548 Refresh a patch in the debian directory 2014-12-21 18:23:51 +01:00
Emmanuel Papin c1d7d7c744 Try to fix 'ltmain.sh not found' issue at first compilation 2014-12-21 17:40:08 +01:00
Emmanuel Papin d2b1bfae13 Fix conflict when merging debian_package_split 2014-12-21 17:04:46 +01:00
Emmanuel Papin db61f93c35 Merge branch 'debian_package_split' into plugin_support_test
Conflicts:
	distros/debian8/control
2014-12-21 16:56:10 +01:00
Emmanuel Papin 39d270a8c3 Fixed autotools build to reflect file name change 2014-12-21 16:52:01 +01:00
Emmanuel Papin cb3b8a901e Merge branch 'master' into plugin_support_test
Conflicts:
	distros/debian/control
	web/skins/classic/views/js/Makefile.am
2014-12-21 16:49:25 +01: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
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 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
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
Isaac Connor 0251500f09 Merge pull request #634 from manupap1/debconf_support
Add debconf / dbconfig support to debian8 folder
2014-12-14 10:08:59 -05:00
Isaac Connor fba0afae50 Merge pull request #636 from manupap1/debian_folder_fix
Some fixes to the debian folder
2014-12-13 19:45:36 -05:00
Emmanuel Papin 3b4d08be81 Merge branch 'plugin_support' into plugin_support_test 2014-12-14 00:39:10 +01:00
Emmanuel Papin f79887d453 Update version in configure.ac and CMakeLists.txt 2014-12-14 00:37:54 +01:00
Emmanuel Papin b4f35c20f1 Fix a conflict when merging plugin_support 2014-12-13 22:06:30 +01:00
Emmanuel Papin f339518787 Merge branch plugin_support 2014-12-13 22:05:11 +01:00
Emmanuel Papin bff7fc1e2e Enable build of plugin support and dev package in debian8 folder 2014-12-13 21:58:17 +01:00
Emmanuel Papin 208c72b25e Add sql request for plugin support in existing sql update file 2014-12-13 21:51:48 +01:00
Emmanuel Papin f1ce69a8c1 Update version in changelog for plugin support 2014-12-13 21:49:08 +01:00
Emmanuel Papin 7bc44a22e6 Merge branch 'debconf_support' of https://github.com/manupap1/ZoneMinder into debconf_support 2014-12-13 21:41:11 +01:00
Emmanuel Papin 82ef0edac3 Restore conflictuous modifications for plugin support 2014-12-13 20:02:58 +01:00