7189de829c
Split files in multiple packages (lb, core, ui...)
2014-12-16 12:42:51 +01:00
52d3ec7142
Fixed autotools build to reflect file name change
...
postlogin.js -> postlolgin.js.php
2014-12-15 18:11:06 -05:00
f4289cd253
postlogin.js replaced by postlogin.js.php
2014-12-15 17:38:18 -05:00
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
643438e3f2
zmfilter: Send message for events that are still ongoing
2014-12-15 08:15:59 +01:00
0251500f09
Merge pull request #634 from manupap1/debconf_support
...
Add debconf / dbconfig support to debian8 folder
2014-12-14 10:08:59 -05:00
fba0afae50
Merge pull request #636 from manupap1/debian_folder_fix
...
Some fixes to the debian folder
2014-12-13 19:45:36 -05:00
af6941f1ef
Fix lintian warning 'description-synopsis-starts-with-article' and more typo in control file
2014-12-13 17:53:53 +01:00
a27e99b104
Add section 'debug' and priority 'extra' to zoneminder debug package to fix two lintian warnings
2014-12-13 17:50:52 +01:00
655af1d373
Upgrade Standards-Version in control file to fix a lintian warning
2014-12-13 17:43:24 +01:00
7cdaf1a41e
Upgrade build dependency to version 9 of debhelper (fix a lintian warning) and fix some typo in control file
2014-12-13 17:39:06 +01:00
63d75debff
Use dh_install and dh_link in override_dh_install
2014-12-13 17:32:01 +01:00
59e2d0873d
Add required README.source file when using a patching system
2014-12-13 17:30:21 +01:00
28516df0ec
Use dh_auto_configure instead of standard configure command
2014-12-13 17:04:07 +01:00
099529c787
Switch patching system to quilt and add a patch to fix perl install directory
2014-12-13 16:57:46 +01:00
82310dba51
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debconf_support
2014-12-12 23:22:04 +01:00
78f0243c69
This replaces Module::Load with Module::Load::Conditional which can actually handle errors.
...
Then I move the module load call up before the fork so that any errors will be visible and will make zmcontrol.pl die quickly instead of waiting 11 seconds for something that will never happen.
2014-12-12 16:33:18 -05:00
3c8153c9b4
better fix for the view=console security flaw.
...
This does it in index.php,so it guards all pages, and also just changes the view to login, so instead of giving an error, it presents you with the login, which I think is better.
2014-12-12 09:38:54 -05:00
b1aa349f11
add check to see if user has rights to view this monitor
2014-12-12 09:32:03 -05:00
cd0b85aaa6
Move dbconfig stuff from rules script to postinst and postrm scripts
2014-12-12 15:06:51 +01:00
aa31c9b292
Fix regex when removing a sql request in zm_create.sql file
2014-12-12 13:22:33 +01:00
74f08787d4
Remove buggy functions and debug mode
2014-12-12 13:04:17 +01:00
9d9396c8bc
Merge pull request #628 from ZoneMinder/fix_console_auth
...
fix auth requirement on view=console by checking for user when AUTH is on
2014-12-11 16:37:11 -06:00
74da3e9c02
fix auth requirement by checking for user when AUTH is on
2014-12-11 17:09:18 -05:00
47bac3a104
Merge pull request #627 from knnniggett/zmu
...
Output to stderror when zmu can't read zm.conf
Simple enough.
2014-12-11 10:08:21 -05:00
62b75808b3
Output to stderror when zmu can't read zm.conf
2014-12-10 17:54:09 -06:00
ed61d2b925
alter the type of Device in the Monitors table to tinytext, which matches the MonitorPresets table, and increases the length to 255
2014-12-10 16:56:22 -05:00
665ffcb2bc
Fix a premature exit when reconfiguring
2014-12-10 16:11:56 +01:00
48f4d7eb93
Merge branch 'master' into BSD_device
2014-12-08 16:53:39 -05:00
fafef86298
Merge branch 'control_improvements'
2014-12-08 16:52:52 -05:00
27b9001eb4
default MoveRoot to empty to quiet an error in logs
2014-12-08 16:52:10 -05:00
a52f07fa8e
Some cleanups, remove code that does nothing.
...
Instead of using ControlDevice to store the password, parse the ControlAddress to get username, password
enforce a port, which fixes the Digest Auth.
2014-12-08 15:54:27 -05:00
5abc58ea14
Merge pull request #620 from SteveGilvarry/11-php-short-tags
...
Replace PHP Short Open Tags - Fixes #11
Works for me too.
2014-12-08 14:39:24 -05:00
065850ad2b
Improve debconf data input
2014-12-08 16:57:37 +01:00
2c1e4a9965
fix the paths so that the ptzControls are visible
2014-12-08 10:34:25 -05:00
6c9f93af63
Merge pull request #567 from knnniggett/zm_config_dir
...
Add the ability to specify the zm configdir at build time.
2014-12-08 10:01:17 -05:00
b1c25efcd9
Remove dependency to mysql.service in zoneminder.service
2014-12-07 18:48:11 +01:00
91719ff7f4
Install and remove package without error even if no database
2014-12-07 15:18:08 +01:00
f2168f50d1
Fix permissions on /etc/zm/zm.conf as requested by the debian policy
2014-12-07 11:51:08 +01:00
aab181ffa6
Fix some comments in postinst script
2014-12-07 02:43:08 +01:00
31fda1fc7c
Bring localization to debconf menus and add french language
2014-12-07 02:38:00 +01:00
9d4c08ff45
Add version to build dependency on po-debconf
2014-12-07 01:51:36 +01:00
af0770c33f
Use 'true' to prevent config script from dying and fix a bad variable name
2014-12-07 00:04:26 +01:00
b201ad2d7e
Do not do some actions when upgrading
2014-12-06 21:39:50 +01:00
328ccc1bc6
Update the database version after dbconfig upgrade
2014-12-06 21:15:04 +01:00
6c0854f16f
Fix bad setting of admin account
2014-12-06 18:48:09 +01:00
700aca0769
Merge branch 'debconf_support3' into debconf_support
2014-12-06 18:11:37 +01:00
8def8a7b94
Re-work of debconf dbconfig integration
2014-12-06 17:50:13 +01:00
0e1b0f8c06
Readd dependency to debconf and dbconfig-common
2014-12-06 14:10:44 +01:00
8ab1237d43
Fix confict when merging from master
2014-12-06 14:09:59 +01:00
Emmanuel Papin
jrd288
Kristof Robot
Isaac Connor
Isaac Connor
Andrew Bauer
Andrew Bauer