Commit Graph

7741 Commits

Author SHA1 Message Date
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
Andrew Bauer 3fa4c525f8
Add Raspbian Stretch to buildsystem 2018-02-19 20:33:41 -06:00
Andrew Bauer c7aa45c4ce
libmysqlclient-dev debian package name changes 2018-02-19 20:21:21 -06:00
Andrew Bauer 2bc47ca6ec
add qemu arm support to travis ci 2018-02-19 19:31:22 -06:00
Andrew Bauer 1ace6861c8
raspbian support to buildsystem 2018-02-19 11:30:27 -06:00
Andrew Bauer a177d8e9dc
Merge pull request #2041 from flashoftheblades/master
Added control script for Reolink cameras
2018-02-06 14:02:36 -06:00
flashoftheblades 34f6584081
Update zm_create.sql.in 2018-02-05 18:53:47 -05:00
flashoftheblades 630dde26d1
Add files via upload 2018-02-05 18:52:05 -05:00
Simpler1 ce19c65cc9 Ipcc (#2040)
* fix(ipcc): Invert up/down to work properly

* fix(ipcc): Change the initial values for ipcc camera
2018-01-22 15:33:11 -05:00
Andrew Bauer 9a8a72ba27
typo 2018-01-20 17:46:53 -06:00
Andrew Bauer 06c2c18135
fix url to display properly 2018-01-20 17:46:15 -06:00
Andrew Bauer 8dc6910bbd
Remove reference to zm 1.29, update description of isaac's ppa 2018-01-20 17:34:37 -06:00
Andrew Bauer 32bf57d35b docker support files moved to zmdockerfiles 2018-01-19 15:15:11 -06:00
Andy Bauer 95edf1b2a8 fix typo 2018-01-18 09:35:04 -06:00
Andy Bauer 2e4a20dfba entrypoint.sh - add multi-distro compatibility 2018-01-18 09:08:09 -06:00
Andrew Bauer 9d28836e57
Merge pull request #2036 from ZoneMinder/fix_export
Add a few more extensions to the list of files to include in export
2018-01-18 08:34:08 -06:00
Andrew Bauer b7258bb6c1
Merge pull request #2037 from kb5won/patch-1
Update packpack.rst
2018-01-18 08:33:18 -06:00
Brian Gallimore 9df7349e8e
Update packpack.rst
added path to git clone command.  (I'm following install guide for first time and that step didn't work without the path)
2018-01-17 19:57:45 -06:00
Isaac Connor 55fa86c7be Add a few more extensions to the list of files to include in export 2018-01-17 16:57:38 -05:00
Andrew Bauer 6c5dd0d395
Update zmlinkcontent.sh.in 2018-01-17 14:46:21 -06:00
Andrew Bauer 285a3a2958 zmlinkcontent.sh - only symlink events & images folder when -o flag is set 2018-01-17 14:41:44 -06:00
Andrew Bauer 617331ef32
fix apache alias 2018-01-17 10:38:20 -06:00
Andrew Bauer 5d0defd9fa
zmlinkcontent.sh - modify temp folder link command 2018-01-17 09:58:18 -06:00
Andrew Bauer 064be68efa
fix typo 2018-01-17 08:46:38 -06:00