Commit Graph

1165 Commits

Author SHA1 Message Date
Ognyan Bankov
ded6b1864a 2006 support floureon 1080p 18x 30x (#2007)
* perl control script for Fluoreon 1080p

* DB update for Floureon cameras support
2017-11-18 19:02:23 -05:00
Isaac Connor
9ad29f4baf fix and move pod to bottom 2017-09-11 22:19:49 -04:00
Isaac Connor
5516a62a0e google code style, switch quotes 2017-09-11 22:12:10 -04:00
Isaac Connor
104bf07c5a fix pod docs 2017-09-11 21:52:22 -04:00
Andrew Bauer
ac5d1738ea allow changing of the timestamp char code delimeter (#1972) 2017-08-21 11:27:11 -04:00
ralimi
ecb7df0e8b Support SSL for mysql connections (#1965)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Isaac Connor
342aacd94f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-26 10:19:44 -04:00
Isaac Connor
1264f0601f update to storageareas version, which changes the sql to use subqueries instead of JOINs 2017-07-14 15:55:08 -04:00
Andrew Bauer
89bcfc4e28 fix incorrect gpl license text mailing address 2017-07-14 10:39:50 -05:00
Isaac Connor
801d978898 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-14 10:30:25 -04:00
Isaac Connor
a07f8961d1 add another zmDbConnect at the bottom of the while(1) loop which will ping and reconnect to db if neccessary. 2017-07-14 10:30:12 -04:00
Isaac Connor
d5a4aaca5d fix braces, spacing, move pod docs to bottom 2017-07-14 10:28:31 -04:00
Martin Goodwell
3789dcb5de Introducing Maginon Supra IPC camera Controls and script (#1947)
* Added Maginon Supra IPC to Controls

* Adding support for Maginon Supra IPC camera
2017-07-13 11:10:20 -04:00
Isaac Connor
2cab6baf2c add some comments and one change that may fix effectiveLevel use 2017-07-05 15:25:01 -04:00
Isaac Connor
1ef25ae1f3 switch to single quotes where possible 2017-06-28 11:03:35 -04:00
Isaac Connor
9ba9495ae0 whitespace, braces, move pod doc to bottom. No functional changes 2017-06-28 10:53:35 -04:00
Isaac Connor
5d63bc47cc I believe level should be effectiveLevel here 2017-06-23 10:22:37 -04:00
Isaac Connor
12c3bde8b0 remove debug 2017-06-23 10:04:50 -04:00
Isaac Connor
25b66e9629 whitespace mostly. 2017-06-23 09:58:54 -04:00
Isaac Connor
3a00656c3f WHen can't open file log, turn on terminal logging so that the message goes somewhere useful. 2017-06-23 09:58:19 -04:00
Isaac Connor
2460e1acd9 fix whitspace 2017-06-23 09:58:01 -04:00
abishai
950c8f19d3 Upstream FreeBSD patches (#1926)
* apply FreeBSD patches

* timeval struct needs time.h

* typo

* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
Andrew Bauer
df304b417a Update zmupdate.pl.in 2017-06-13 11:08:58 -05:00
Andrew Bauer
bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908)
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor
c55814647c fix spacing, braces, quotes 2017-06-07 15:28:31 -04:00
Isaac Connor
1ab5e0e374 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-06 15:36:10 -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
Isaac Connor
90c3c40f55 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-04 17:33:30 -04:00
Isaac Connor
07704dd5d6 coments 2017-06-04 17:30:39 -04:00
Isaac Connor
7d6f85f9ea Merge ../ZoneMinder.connortechnology 2017-06-02 20:18:16 -04:00
Isaac Connor
d910bcf121 fix quoting on config 2017-06-02 20:18:05 -04:00
Isaac Connor
7b8222f73b fix type for WEB_EVENT_DISK_SPACE to boolean. 2017-06-02 20:17:08 -04:00
Isaac Connor
9c9eaa6851 move test for MIN_AGE up. Don't need to constantly check for it because it won't change. 2017-06-02 12:35:01 -04:00
Isaac Connor
8b91403c25 remove references to Storage object 2017-06-02 12:32:02 -04:00
Isaac Connor
b6b4738b9f fix quotes 2017-06-02 12:31:54 -04:00
Isaac Connor
71b9ca97c6 no need to store filters as an array ref 2017-06-02 12:25:26 -04:00
Isaac Connor
5228b9d008 move command line option parsing up, so if we are just getting the version we exit quick before doing a bunch of other things. 2017-06-02 11:54:40 -04:00
Isaac Connor
be5b93a64e whitespace, braces, quotes 2017-06-02 11:39:35 -04:00
Isaac Connor
53a7b2e72c more double quotes to single quotes and fix some spacing 2017-05-31 09:57:55 -04:00
Isaac Connor
36ccc5b7b6 Merge bits from SA. Mostly double to single quotes plus some debug lines when errors happen 2017-05-31 09:33:51 -04:00
Isaac Connor
82a13fac76 new class for Monitors 2017-05-30 21:21:51 -04:00
Isaac Connor
32d1e62f73 braces, spacing, quotes 2017-05-30 21:18:13 -04:00
Isaac Connor
885823aeb6 remove unnecessary quotes and convert double quotes to single quotes 2017-05-30 21:11:51 -04:00
Isaac Connor
1d5248c0b8 merge from SA, but remove Storageareas bits 2017-05-30 20:06:29 -04:00
Isaac Connor
ab85239d82 fix braces, invert control directions when camera is flipped 2017-05-30 19:49:30 -04:00
Isaac Connor
0bb2bed32c remove blank lines, do some better escaping 2017-05-30 19:47:35 -04:00
Isaac Connor
cca2c624f9 fix spelling mistake 2017-05-30 19:42:38 -04:00
Isaac Connor
b948bc5403 fix a few extra ) 2017-05-30 10:21:34 -04:00
Isaac Connor
b979712892 fix inconsistent whitespace 2017-05-30 10:01:02 -04:00
Isaac Connor
3c9d8f4ec6 Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time. 2017-05-30 09:44:43 -04:00