ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,114 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

4114 Commits

Author SHA1 Message Date
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
Emmanuel Papin d961831355 Fix conflict when merging upstream master 2014-12-13 19:54:54 +01:00
Emmanuel Papin ee6fda5c67 Merge branch 'master' into debconf_support 2014-12-12 23:22:10 +01:00
Emmanuel Papin 82310dba51 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debconf_support 2014-12-12 23:22:04 +01:00
Emmanuel Papin cd0b85aaa6 Move dbconfig stuff from rules script to postinst and postrm scripts 2014-12-12 15:06:51 +01:00
Emmanuel Papin aa31c9b292 Fix regex when removing a sql request in zm_create.sql file 2014-12-12 13:22:33 +01:00
Emmanuel Papin 74f08787d4 Remove buggy functions and debug mode 2014-12-12 13:04:17 +01:00
Andrew Bauer 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
Isaac Connor 74da3e9c02 fix auth requirement by checking for user when AUTH is on 2014-12-11 17:09:18 -05:00
Isaac Connor 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
Andrew Bauer 62b75808b3 Output to stderror when zmu can't read zm.conf 2014-12-10 17:54:09 -06:00
Isaac Connor 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
Emmanuel Papin 665ffcb2bc Fix a premature exit when reconfiguring 2014-12-10 16:11:56 +01:00
Isaac Connor 48f4d7eb93 Merge branch 'master' into BSD_device 2014-12-08 16:53:39 -05:00
Isaac Connor fafef86298 Merge branch 'control_improvements' 2014-12-08 16:52:52 -05:00
Isaac Connor 27b9001eb4 default MoveRoot to empty to quiet an error in logs 2014-12-08 16:52:10 -05:00
Isaac Connor 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
Isaac Connor 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
Emmanuel Papin 065850ad2b Improve debconf data input 2014-12-08 16:57:37 +01:00
Isaac Connor 2c1e4a9965 fix the paths so that the ptzControls are visible 2014-12-08 10:34:25 -05:00
Isaac Connor 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
Emmanuel Papin b1c25efcd9 Remove dependency to mysql.service in zoneminder.service 2014-12-07 18:48:11 +01:00
Emmanuel Papin 91719ff7f4 Install and remove package without error even if no database 2014-12-07 15:18:08 +01:00
Emmanuel Papin f2168f50d1 Fix permissions on /etc/zm/zm.conf as requested by the debian policy 2014-12-07 11:51:08 +01:00
Emmanuel Papin aab181ffa6 Fix some comments in postinst script 2014-12-07 02:43:08 +01:00
Emmanuel Papin 31fda1fc7c Bring localization to debconf menus and add french language 2014-12-07 02:38:00 +01:00
Emmanuel Papin 9d4c08ff45 Add version to build dependency on po-debconf 2014-12-07 01:51:36 +01:00
Emmanuel Papin af0770c33f Use 'true' to prevent config script from dying and fix a bad variable name 2014-12-07 00:04:26 +01:00
Emmanuel Papin b201ad2d7e Do not do some actions when upgrading 2014-12-06 21:39:50 +01:00
Emmanuel Papin 328ccc1bc6 Update the database version after dbconfig upgrade 2014-12-06 21:15:04 +01:00
Emmanuel Papin 6c0854f16f Fix bad setting of admin account 2014-12-06 18:48:09 +01:00
Emmanuel Papin 700aca0769 Merge branch 'debconf_support3' into debconf_support 2014-12-06 18:11:37 +01:00
Emmanuel Papin 8def8a7b94 Re-work of debconf dbconfig integration 2014-12-06 17:50:13 +01:00
Emmanuel Papin 0e1b0f8c06 Readd dependency to debconf and dbconfig-common 2014-12-06 14:10:44 +01:00
Emmanuel Papin 8ab1237d43 Fix confict when merging from master 2014-12-06 14:09:59 +01:00
Emmanuel Papin 01e57dbbe9 Readd dependency to debconf and dbconfig-common 2014-12-06 14:05:16 +01:00
Emmanuel Papin 65bd73b102 Fix conflict when merging from master 2014-12-06 14:03:24 +01:00
Emmanuel Papin 70707d6346 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debconf_support3 2014-12-06 13:54:14 +01:00
Andrew Bauer 1701764af4 Merge pull request #621 from manupap1/new_debian8_folder 
Add missing dependency to policykit-1
 2014-12-05 17:08:35 -06:00
Emmanuel Papin 94dce6729f Add missing dependency to policykit-1 2014-12-05 23:02:20 +01:00
Emmanuel Papin 42a460ae6e Add missing dependency to policykit-1 2014-12-05 22:55:47 +01:00
Emmanuel Papin 9cf50cbca4 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debconf_support 2014-12-05 22:51:40 +01:00