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

54 Commits

Author SHA1 Message Date
Peter Keresztes Schmidt 6e96cbe14a Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2 2021-09-08 00:19:08 +02:00
Peter Keresztes Schmidt f2bee0704a LocalCamera: Remove support for V4L1 
Kernel support for Video4Linux 1 was removed in 2.6.38 (March 2011). It's time to drop support on our side.
 2021-05-31 23:29:29 +02:00
Isaac Connor 7e579fd851 Implement Snapshots user permission 2021-04-12 15:59:31 -04:00
Isaac Connor fe425302ad Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-21 10:46:13 -04:00
Isaac Connor 63ef15d247 spacing and quotes 2020-08-21 10:46:10 -04:00
Isaac Connor 80a6608733 Make values in conf.d files override values in db. Also handle the fact that they would already be defined in this case. 2020-08-21 10:36:49 -04:00
Isaac Connor 3bfcd8eb33 Check for definition of ZM_TIMEZONE before using it. Fixes #2895 2020-04-02 14:00:36 -04:00
Isaac Connor 821355c117 Only set date.timezone if we have a configured value in the Config 2020-02-11 13:21:28 -05:00
Isaac Connor e9815bf9c7 add ZM Namespace to Error calls 2020-01-02 16:54:50 -05:00
Isaac Connor b24e912050 Use ZM\Server::find_one for loading server so that it gets cached. Use a single regexp to determine config line validity instead of two for efficiency 2019-12-13 17:46:56 -05:00
Isaac Connor 6a3fe1ef1f actually set date.timezone from ZM_TIMEZONE 2019-10-18 14:37:09 -04:00
Isaac Connor 8dd8888975
Php namespace (#2537) 
* experiment with namespaces on the Server class

* experiment with namespaces on the Server class

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects
 2019-02-22 09:19:07 -05:00
Isaac Connor e30b100e8e Don't load & process categories in initial config loading 2018-10-19 15:00:30 -04:00
Andrew Bauer 3dc424282b Support quoting config variables (#2175) 
* allow handling of quotes in config files

* copy paste error

* surround zm_arptool in quotes
 2018-08-11 12:56:16 -04:00
Andrew Bauer 3c225c9f1c Migrate Webcache out of webroot (#2083) 
* migrate webcache folder out of webroot, migrate htaccess files

* rpm specfile - add missing reference to cache folder

* fix submodule mixup
 2018-04-19 15:01:46 -04:00
Isaac Connor 74fb8db5e2 make configvals global 2018-04-06 14:52:39 -04:00
Isaac Connor e9141ca3e8 re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes 2017-12-20 10:19:24 -05:00
Isaac Connor 6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
Isaac Connor 1ccd344bf5 implement Storage Area move 2017-12-04 11:05:50 -05:00
Isaac Connor f230aa01ef turn off debug 2017-10-07 11:31:48 -04:00
Isaac Connor 35482ba53c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-09-26 16:13:51 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -04:00
Isaac Connor b6965a2c3f fix spacing/braces 2017-08-14 11:38:21 -04:00
Andrew Bauer 2bc6f1627e Add support for conf.d subfolder (#1902) 
* cmake changes to support conf.d

* php changes to support conf.d

* perl changes to support conf.d

* C changes to support conf.d

* add conf.d support to rpmspecfile

* fix typo

* specify ZM_CONFIG_SUBDIR in relevant target distros

* put back my config_file perl definition

* remove quotes from ZM macros

* fix snprintf

* add README to conf.d folder

* adjust rpm specfile

* remove custom permissions from README in rpmspecfile

* modify rpm README documentation to reflect conf.d support

* set ZM_CONFIG_SUBDIR in debian rules file
 2017-06-05 16:39:19 -04:00
Andrew Bauer 200f92b1ad make zmexport not rely on symlinks in the webroot (#1888) 
* make zmexport not rely on symlinks in the webroot

* add archive view
 2017-05-17 11:30:39 -04:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Andy Bauer e5bf2d245c quit the stream in zones.php when zone.php is called 2016-04-10 15:33:55 -05:00
Andy Bauer 466f2b2ae3 change multi-server error message text 2016-03-01 11:12:54 -06:00
Isaac Connor 73badd1c2d check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message 2015-09-16 11:12:04 -04:00
Isaac Connor d235733290 Need to include logger if we are going to use Error 2015-09-14 15:57:22 -04:00
Isaac Connor 880e77b096 Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2015-08-19 13:30:48 -04:00
Andrew Bauer 5b2155f551 define Groups permission for the default user 2015-08-15 16:47:07 -05:00
Isaac Connor 441a82e611 fixup loading SERVER_ID from SERVER_NAME 2015-07-17 10:12:44 -04:00
Isaac Connor 69e1fd8b18 add code to convert the human readable config entry ZM_SERVER_NAME into ZM_SERVER_ID 2015-07-09 11:45:19 -04:00
Andrew Bauer 4182fb3295 Don't show ONVIf probe link when ONVIF support is not enabled 2015-02-21 11:12:07 -06:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO' 
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
 2014-03-20 16:48:03 -04:00
Andrew Bauer b4679f0a8c Add the ability to set up the Date and time formats by the language files, according to that language's regionals. 
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.

These definitions are removed from here and added with checking option to the later stage after loading the language files.
 2014-02-26 09:14:04 -06:00
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO 
Conflicts:
	zm.conf.in
 2013-11-08 11:22:09 -05:00
Kfir Itzhak be21a882ab Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf 
Remove ZM_VERSION from zm.conf
 2013-11-04 12:27:50 -08:00
Isaac Connor 7989e8e980 Merge branch 'master' into mysql2PDO 2013-11-03 16:07:37 -05:00
Isaac Connor 3fa91a30a3 allow the value side of config lines potentially be empty. 2013-11-03 15:52:37 -05:00
Isaac Connor 72b80d7417 remake this branch off master instead of off mysql2PDO. 
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
 2013-11-01 09:47:28 -04:00
Isaac Connor 09fbdc9e35 forget the updates to this file 2013-10-17 16:57:05 -04:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +00:00
stan f06b6cf60b Added in define for prescence/abscence of libpcre 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2692 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 18:41:14 +00:00
stan 6d78b17d90 Added CMD_VARPLAY to stream commands 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 13:16:47 +00:00
stan b7f97d388f Added configuraion and detection of V4L2 to web interface. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2678 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-28 14:25:12 +00:00
stan 1080485c33 Motage and event list issues, fixes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2642 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-30 15:29:14 +00:00