Commit Graph

210 Commits

Author SHA1 Message Date
Isaac Connor 3aa31fd524 Merge branch 'master' into storageareas 2018-02-23 10:23:35 -05:00
Andrew Bauer 11660b42d4
fix zoneminder github url 2018-02-20 18:40:50 -06:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -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
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 489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
Steve Gilvarry d83b9ce622 Fixes #1983 (#1989)
Fair point here we put a command it should run, but I have added assistance with this part of the install is not zoneminder specific
2017-09-28 18:03:39 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
jethornton 431ec3ea75 Update faq.rst (#1970)
The memory math is confusing and incorrect. Original posted added a 5th camera but did not update the final memory size or explain how they arrived at that value.
2017-08-21 11:25:44 -04:00
Andrew Bauer dc1aa2b670 Update redhat.rst 2017-08-19 21:41:19 -05:00
Andrew Bauer 7d0531ccdd Update packpack.rst 2017-08-19 21:37:04 -05:00
Andrew Bauer e749866101 Update packpack.rst 2017-08-19 21:17:06 -05:00
Andrew Bauer 54f780e2d3 Update redhat.rst 2017-08-19 13:15:11 -05:00
Andrew Bauer 4ccca556e1 Update packpack.rst 2017-08-19 12:52:21 -05:00
Andrew Bauer 52accd7ff5 Update packpack.rst 2017-08-19 12:50:07 -05:00
Andrew Bauer 9172a1bc42 Update packpack.rst 2017-08-19 12:48:57 -05:00
Andrew Bauer e473806fff Update packpack.rst 2017-08-19 12:47:41 -05:00
Andrew Bauer 8bf395465f Update packpack.rst 2017-08-19 12:46:38 -05:00
Andrew Bauer 65f03ce613 Update packpack.rst 2017-08-19 12:46:00 -05:00
Andrew Bauer 7ed53f766e Update packpack.rst 2017-08-19 12:45:39 -05:00
Andrew Bauer 7a1208daaa Update packpack.rst 2017-08-19 12:43:28 -05:00
Andrew Bauer 4adad745d0 Update packpack.rst
fix bullets
2017-08-19 12:42:44 -05:00
Andy Bauer dafe125ed5 initial commit to add packpack build instructions 2017-08-19 12:39:54 -05:00
Isaac Connor 49464d381a Merge branch 'master' into storageareas 2017-08-14 10:44:40 -04:00
Andrew Bauer edd66dd0cf Update redhat.rst 2017-08-11 12:41:12 -05:00
Andrew Bauer 0936dc79bc Update redhat.rst 2017-08-11 12:37:44 -05:00
Andrew Bauer 4aa15702e7 Update redhat.rst 2017-08-11 12:33:39 -05:00
Andrew Bauer 3a7ad58c25 Update redhat.rst 2017-08-11 08:55:57 -05:00
Andrew Bauer 4187da2d5a Update redhat.rst 2017-08-11 08:45:34 -05:00
Andrew Bauer ae8873c2cc Update redhat.rst 2017-08-11 08:44:02 -05:00
Andrew Bauer 565612b86b Update redhat.rst 2017-08-11 07:55:29 -05:00
Andrew Bauer 64cf80ccf4 Update redhat.rst 2017-08-11 07:52:25 -05:00
Andrew Bauer 4941e6715c Update redhat.rst 2017-08-11 07:49:59 -05:00
Andrew Bauer 27796ab720 Update redhat.rst 2017-08-10 20:57:26 -05:00
Andrew Bauer 0a5188d79f Update redhat.rst 2017-08-10 20:55:22 -05:00
Isaac Connor 148d7066f9 Merge branch 'master' into storageareas 2017-07-11 16:15:02 -04:00
Joe Alamo 0faeef58c0 Update filterevents.rst (#1944)
State where filters are actually saved
2017-07-10 17:16:01 -04:00
Isaac Connor c926f733ea There should be a blank line here 2017-06-28 16:13:33 -04:00
Isaac Connor 76f63686cb Merge branch 'fix_event_viewing' into storageareas 2017-06-22 09:24:31 -04:00
Martin Owens 6cc6055bd3 Fix spelling mistake in link 2017-06-17 21:50:41 -04:00
Isaac Connor b45da97416 need a blank line 2017-06-05 13:11:09 -04:00
Isaac Connor 9a317725c0 remove extra space 2017-06-05 13:10:16 -04:00
Isaac Connor ed6a2f3636 Merge pull request #1755 from connortechnology/update_do_debian_release
Update do debian release
2017-05-10 09:06:17 -04:00
Isaac Connor de24ba7120 Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
add the ability to add substitued tags to the commandline
2017-05-10 09:00:36 -04:00
Isaac Connor a5f71a917e Merge branch 'master' into update_do_debian_release 2017-05-10 08:59:09 -04:00
Andrew Bauer e6c60737e9 Merge pull request #1756 from SteveGilvarry/zmf_goodbye
Remove zmf
2017-05-10 07:07:22 -05:00
Andrew Bauer 3870ca1ec0 Update redhat.rst
typo
2017-04-26 09:48:15 -05:00
Isaac Connor b2fc959a50 Merge branch 'master' into update_do_debian_release 2017-04-24 17:01:56 -04:00