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
1131809c92
format duration into HH:MM:SS
2014-12-19 10:18:27 -05:00
d7586c2a28
fix a bare ZM_PATH_BIN which should be $Config{ZM_PATH_BIN}
2014-12-17 16:35:30 -05:00
b921b6f254
the debian packaging has this, and apparently we need it to build
2014-12-17 16:23:04 -05:00
5dd1b6a388
this is in debian
2014-12-17 16:11:26 -05:00
9b860fb08c
libjpeg updates to match debian
2014-12-17 16:10:54 -05:00
67fc4c5ea9
update to what has been done in debian
2014-12-17 15:43:32 -05:00
e9e6d84c7b
bump release #
2014-12-17 15:30:20 -05:00
45feac3d36
Merge pull request #640 from jrd288/offer_login
...
Offer login prompt instead of throwing error
2014-12-16 09:35:08 -05:00
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
8b44c6d732
Merge pull request #635 from ZoneMinder/zmcontrol_improvements
...
Improve zmcontrol.pl
2014-12-16 07:18:59 -06:00
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
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
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
3b4d08be81
Merge branch 'plugin_support' into plugin_support_test
2014-12-14 00:39:10 +01:00
f79887d453
Update version in configure.ac and CMakeLists.txt
2014-12-14 00:37:54 +01:00
b4f35c20f1
Fix a conflict when merging plugin_support
2014-12-13 22:06:30 +01:00
f339518787
Merge branch plugin_support
2014-12-13 22:05:11 +01:00
bff7fc1e2e
Enable build of plugin support and dev package in debian8 folder
2014-12-13 21:58:17 +01:00
208c72b25e
Add sql request for plugin support in existing sql update file
2014-12-13 21:51:48 +01:00
f1ce69a8c1
Update version in changelog for plugin support
2014-12-13 21:49:08 +01:00
7bc44a22e6
Merge branch 'debconf_support' of https://github.com/manupap1/ZoneMinder into debconf_support
2014-12-13 21:41:11 +01:00
82ef0edac3
Restore conflictuous modifications for plugin support
2014-12-13 20:02:58 +01:00
d961831355
Fix conflict when merging upstream master
2014-12-13 19:54:54 +01: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
ee6fda5c67
Merge branch 'master' into debconf_support
2014-12-12 23:22:10 +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
Emmanuel Papin
Isaac Connor
Isaac Connor
Andrew Bauer
jrd288
Andrew Bauer