Andy Bauer
00ab9b4c03
merge proposed changes in ubuntu1804 folder -> ubuntu1604 folder instead
2018-03-13 09:28:11 -05:00
Andy Bauer
389ca9e291
Merge branch 'ubuntu_bionic_v2' of https://github.com/MTres19/zoneminder into MTres19-ubuntu_bionic_v2
2018-03-13 09:27:28 -05:00
Matthew Trescott
ee146acf07
Remove obsolete symlink handling, update README.Debian
2018-03-06 20:35:41 -05:00
Matthew Trescott
4c44c32a62
Allow db username/password setting in conf.d
2018-03-06 19:23:01 -05:00
Andy Bauer
d1f9fb9a37
Merge branch 'habibapp1365-patch-3'
2018-03-06 11:38:17 -06:00
Andy Bauer
b41363fd60
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
2018-03-06 11:37:49 -06:00
habibapp1365
80116aa44c
Update video.php
2018-03-06 20:12:47 +03:30
habibapp1365
497114e8e1
Update video.php
2018-03-06 20:11:02 +03:30
habibapp1365
aa2134bde4
Update zm_create.sql.in
2018-03-06 19:59:06 +03:30
habibapp1365
8a6b57c1a0
Update video.php
2018-03-06 19:54:24 +03:30
habibapp1365
7a589398a7
Update video.php
2018-03-06 19:53:26 +03:30
habibapp1365
661827a7b4
Update video.php
2018-03-06 19:52:01 +03:30
habibapp1365
afff20a06b
Update video.php
2018-03-06 19:48:01 +03:30
habibapp1365
50a63c7899
Create DCS3415.pm
...
D-Link DCS-3415 IP Control Protocol
2018-03-06 11:31:39 +03:30
Matthew Trescott
7a9350c44f
Quick fix for mistake
2018-03-05 20:24:40 -05:00
Matthew Trescott
6194977697
Revamp postinst to also support MariaDB and use systemd to check service status, not /etc/init.d.
2018-03-05 19:38:42 -05:00
Matthew Trescott
17c5028312
Don't install init.d script
...
Despite not being specified in the --with parameter to dh, dh_installinit still seems to be run. Since most distros use systemd now, it seems like a bad idea to install services to /etc/init.d.
2018-03-05 19:17:11 -05:00
Matthew Trescott
c750db91b5
Make sure a2enmod is available before calling it in postinst
...
The user may be using zm with e.g. nginx since apache is not a dependency.
2018-03-05 19:11:53 -05:00
Matthew Trescott
49a2065f34
Allow packaging with libx264-152, allow packaging with MariaDB instead of MySQL
2018-03-05 19:06:38 -05:00
Matthew Trescott
3475bfb672
Fix compilation on Ubuntu 18.04
...
I'm not entirely sure why this wasn't a problem with icconor's source package on launchpad. But, even unfamiliar as I am with CMake, it doesn't make sense to me to throw a fatal error by checking for a header that is already known to be unavailable.
2018-03-05 18:46:52 -05:00
Matthew Trescott
d13335358f
Copy ubuntu1604 to ubuntu1804
2018-03-05 18:39:29 -05:00
Andrew Bauer
0422f93202
Merge pull request #2050 from Tim-Craig/groups_api
...
Adding group handling in API
2018-03-05 08:29:20 -06:00
tim
0654c7e3b2
Adding group handling in API
2018-03-04 23:01:52 -08:00
Andrew Bauer
ed4dac761a
Merge pull request #2049 from ZoneMinder/fix_2044
...
Fix 2044
2018-03-03 12:49:57 -06:00
Andrew Bauer
029376f715
Merge pull request #2048 from Rorosha/1963-update-api-docs
...
Issue 1963: Remove spaces from example api calls.
2018-03-03 12:47:46 -06:00
Isaac Connor
34dec24ebd
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-03-03 09:25:34 -08:00
Isaac Connor
2864876d28
fix spacing, add code comment
2018-03-03 09:25:04 -08:00
Mike R
3dc157732a
Issue 1963: Remove spaces from example api calls.
2018-03-03 00:58:35 -05:00
Andrew Bauer
3e77a85549
url to css/spinner.css should be relative
...
fixes http 404 not found errors for this css file
2018-03-02 17:19:10 -06:00
Isaac Connor
0077f2e17b
Update faq.rst
...
I see no reason to mention bits. No one cares about bits. Our base unit should be bytes. Also, lets be consistent and use 1024 as the divisor when converting to Kb and Mb and Gb.
2018-02-28 11:06:28 -05:00
Andrew Bauer
7fed5fd596
spelling
2018-02-27 19:46:44 -06:00
Andrew Bauer
35c63ac0bc
Update packpack.rst
2018-02-27 17:43:36 -06:00
Andrew Bauer
5ac003d448
Update packpack.rst
2018-02-27 17:39:58 -06:00
Andrew Bauer
79037f56c1
buildsystem - fix 32bit rpm builds
2018-02-26 10:41:29 -06:00
Isaac Connor
bfbefc4c32
Use our new Control object to do the saving instead of a generic function
2018-02-26 07:31:48 -08:00
Isaac Connor
c6f632325e
create an object for Controls entries, with appropriate defaults
2018-02-26 07:31:22 -08:00
Isaac Connor
464b588f08
add a case for toggle, which are booleans and default them to false
2018-02-26 07:29:49 -08:00
Andrew Bauer
ab11e9ec38
Update zoneminder.spec
2018-02-23 11:48:35 -06:00
Andrew Bauer
b19cb60540
update path in patch file (again)
2018-02-22 09:16:59 -06:00
Andy Bauer
7b9cb59df9
force no-lintian flag
2018-02-22 08:58:33 -06:00
Andrew Bauer
075f8d461c
Docker treats quotes literally in env-file
...
see: https://github.com/moby/moby/issues/11443#issuecomment-99198051
2018-02-21 17:15:18 -06:00
Andrew Bauer
8ef0386db2
adjust the path in the packpack patch file
2018-02-21 12:30:33 -06:00
Andrew Bauer
b6ad2b6ad7
patch packpack to support custom environment vars
2018-02-21 12:15:10 -06:00
Andrew Bauer
4832de9217
fix typo
2018-02-21 10:19:35 -06:00
Andrew Bauer
f8000d7438
Update startpackpack.sh
2018-02-21 10:16:35 -06:00
Andrew Bauer
ebc6bf0dcc
move debian tweaks to startpackpack.sh
2018-02-21 09:56:19 -06:00
Andrew Bauer
aaf3b4137b
skip lintian checks for debian builds
2018-02-20 20:50:10 -06:00
Andrew Bauer
7d5f73d7c4
Update .travis.yml
2018-02-20 20:35:37 -06:00
Andrew Bauer
11660b42d4
fix zoneminder github url
2018-02-20 18:40:50 -06:00
Andrew Bauer
d228cc79d3
attempt to speed up the build
2018-02-20 18:31:19 -06:00