Commit Graph

4805 Commits

Author SHA1 Message Date
Pliable Pixels 82fe6c8f0e States table now uses a unique Name column 2015-08-26 11:19:58 -04:00
Pliable Pixels 7396f84ce1 Merge pull request #2 from pliablepixels/1013-document-migration
formatting
2015-08-23 18:42:47 -04:00
Pliable Pixels cee933225f formatting 2015-08-23 18:41:13 -04:00
Pliable Pixels fb37317e31 Merge pull request #1 from pliablepixels/1013-document-migration
1013 document migration
2015-08-23 18:13:19 -04:00
Pliable Pixels 6045acc2ac content update 2015-08-23 16:51:37 -04:00
Pliable Pixels 65c5d41f7c content update 2015-08-23 16:41:29 -04:00
Pliable Pixels 7f23f47aea added deprecation notice 2015-08-23 16:21:05 -04:00
Pliable Pixels 7253e837f3 content update 2015-08-23 16:15:23 -04:00
Pliable Pixels 16ff2093a1 comtent update 2015-08-23 15:58:40 -04:00
Pliable Pixels 52d5aa0c70 comtent update 2015-08-23 15:19:51 -04:00
Pliable Pixels 81d6b0f023 comtent update 2015-08-23 15:16:56 -04:00
Pliable Pixels 5716b0e1ee merged content into camera control 2015-08-23 14:20:58 -04:00
Pliable Pixels 25e7702de7 Merged control camera and controlling monitors into one document - they both talk about PTZ 2015-08-23 14:19:54 -04:00
Pliable Pixels e7e2c92b95 images for define monitor doc 2015-08-23 14:13:44 -04:00
Pliable Pixels 0dcf38abc3 content 2015-08-23 14:13:11 -04:00
Pliable Pixels 3ef7250d3e Aligned ubuntu install with iconnors post about changes in the forum 2015-08-23 13:20:04 -04:00
Pliable Pixels 042e9533cf Added an explanation of control protocols work 2015-08-23 12:22:27 -04:00
Pliable Pixels a63c0a26b8 content update 2015-08-17 16:21:24 -04:00
Pliable Pixels 2ca3ca8d50 added missing zone images 2015-08-17 15:42:49 -04:00
Pliable Pixels c6e2914228 Added system diagram 2015-08-17 15:30:00 -04:00
Pliable Pixels e6061d53b3 Clarified mysql sleep is only needed for ubuntu 14.x and below 2015-08-16 15:13:28 -04:00
Pliable Pixels 2232b6b68b Updated API to add security notes 2015-08-16 15:05:15 -04:00
Pliable Pixels 1c82f57ba3 Made content same as github README.md contributing 2015-08-16 14:49:44 -04:00
Pliable Pixels 762e3eddc9 Updated mobile with correct info 2015-08-16 13:26:05 -04:00
PliablePixels 71e19f48e8 Content update 2015-08-16 05:34:00 -04:00
PliablePixels 199795a67d new content 2015-08-15 16:05:02 -04:00
PliablePixels 53d3050e78 content updates 2015-08-15 11:57:03 -04:00
PliablePixels f77d0eda22 content updates 2015-08-15 11:56:08 -04:00
PliablePixels 58f86c03fa For future use 2015-08-14 20:28:31 -04:00
PliablePixels 71b82ac84a ZM Developer notes for review in red 2015-08-14 20:28:03 -04:00
PliablePixels 1ccc127d72 Template for a custom style for future use 2015-08-14 20:27:44 -04:00
PliablePixels 7e24cbebd1 Completed ubuntu package install instructions 2015-08-14 20:00:11 -04:00
PliablePixels cd6c2a5763 Updated screenshot 2015-08-14 19:59:47 -04:00
PliablePixels 2ea8d68fa7 content updated 2015-08-14 11:53:23 -04:00
PliablePixels 69c7e0f556 content updated 2015-08-14 11:19:16 -04:00
PliablePixels 38caa4df3c content updated 2015-08-14 10:28:28 -04:00
PliablePixels 10d8d4ea93 content updates 2015-08-14 09:29:09 -04:00
PliablePixels ce704bf596 content update 2015-08-14 09:20:59 -04:00
PliablePixels 35580cf787 Fixed heading hierarchy of API so they all don't show in master TOC 2015-08-14 08:56:28 -04:00
PliablePixels 2b09afdcd0 FAQ is now the same as Wiki FAQ with sphinx format conversion 2015-08-14 08:55:38 -04:00
Andrew Bauer b69fd1e86d configure apache to follow symlinks so it find nph-zms 2015-08-13 20:23:52 -05:00
Andrew Bauer 415521477c Merge pull request #1012 from pliablepixels/patch-1
Explained a caveat  with using relative times
2015-08-13 14:29:45 -05:00
Pliable Pixels 6f3ee49d4a Explained a caveat with using relative times 2015-08-13 15:17:48 -04:00
Andrew Bauer e10bcc55a7 Update README.md
spelling
2015-08-13 08:40:16 -05:00
Andrew Bauer 66ec84fdea Merge pull request #1008 from pliablepixels/993-API-Auth
Included logic to not enforce authentication in API layer if ZM auth is off
2015-08-11 14:51:02 -05:00
Pliable Pixels a64f7c0036 Included logic to not enforce authentication in API layer if ZM_OPT_USE_AUTH is disabled
If ZM auth is off, API won't work. Changed this to make sure API disables auth if ZM disables auth
2015-08-11 14:47:49 -04:00
Andrew Bauer dff624a42c Merge pull request #985 from ZoneMinder/fix_state_load
fix #948 1
2015-08-11 10:45:16 -05:00
Andrew Bauer 882bf76750 Merge pull request #986 from ZoneMinder/fix_948_3
quiet error when no Servers in Servers table
2015-08-11 10:45:04 -05:00
Isaac Connor 495d7ad374 Merge pull request #1001 from Linwood-F/1000-add-scale-feature-to-image-php
Add scale as optional feature to image.php
2015-08-11 11:37:40 -04:00
Andrew Bauer fcc1f9705f Merge pull request #1007 from SteveGilvarry/update_ffmpeg_travis
Update to ffmpeg 2.7.2 in travis build
2015-08-11 07:35:36 -05:00