Merge pull request #408 from kylejohnson/master

Move API to under web dir
This commit is contained in:
Kyle Johnson 2014-04-29 23:31:37 -04:00
commit 0e2a164c08
1059 changed files with 50 additions and 43 deletions

View File

@ -1,43 +0,0 @@
CakePHP
=======
[![CakePHP](http://cakephp.org/img/cake-logo.png)](http://www.cakephp.org)
CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.
Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.
Some Handy Links
----------------
[CakePHP](http://www.cakephp.org) - The rapid development PHP framework
[CookBook](http://book.cakephp.org) - THE CakePHP user documentation; start learning here!
[API](http://api.cakephp.org) - A reference to CakePHP's classes
[Plugins](http://plugins.cakephp.org/) - A repository of extensions to the framework
[The Bakery](http://bakery.cakephp.org) - Tips, tutorials and articles
[Community Center](http://community.cakephp.org) - A source for everything community related
[Training](http://training.cakephp.org) - Join a live session and get skilled with the framework
[CakeFest](http://cakefest.org) - Don't miss our annual CakePHP conference
[Cake Software Foundation](http://cakefoundation.org) - Promoting development related to CakePHP
Get Support!
------------
[#cakephp](http://webchat.freenode.net/?channels=#cakephp) on irc.freenode.net - Come chat with us, we have cake
[Google Group](https://groups.google.com/group/cake-php) - Community mailing list and forum
[GitHub Issues](https://github.com/cakephp/cakephp/issues) - Got issues? Please tell us!
[Roadmaps](https://github.com/cakephp/cakephp/wiki#roadmaps) - Want to contribute? Get involved!
[![Bake Status](https://secure.travis-ci.org/cakephp/cakephp.png?branch=master)](http://travis-ci.org/cakephp/cakephp)
![Cake Power](https://raw.github.com/cakephp/cakephp/master/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif)

1
docs/README.md Normal file
View File

@ -0,0 +1 @@
The latest version of these docs can be found at http://zoneminder.readthedocs.org/

34
docs/faq.rst Normal file
View File

@ -0,0 +1,34 @@
Frequently Asked Questions (FAQ)
================================
This is the FAQ page. Feel free to contribute any FAQs that you think are missing.
Why can't I view all of my monitors in Montage view?
----------------------------------------------------
1. You will most likely need to increase `mysql_max_connections` in my.cnf.
2. If using Firefox, you may need to increase `network.http.max-persistent-connections-per-server` in `about:config`.
How do I enable ZoneMinder's security?
--------------------------------------
You may also consider to use the web server security, for example, htaccess files under Apache, or mod_auth.
1. In the console, click on Options.
2. Check the box next to "ZM_OPT_USE_AUTH".
3. Click Save
4. You will immediately be asked to login. The username is 'admin' and the password is 'admin'.
To Manage Users
^^^^^^^^^^^^^^^
1. In main console, go to Options->Users.
The "Zones" view for a Monitor is blank (I can't see / setup a Zone)
--------------------------------------------------------------------
Snapshots and Zones images are stored in the `images` directory in your webroot.
Ensure that the `images` directory is writable by the user which ZoneMinder is
running as. If the `images` directory is a symlink, ensure that your web server
has access to that directory as well.

View File

@ -12,6 +12,7 @@ Contents:
:maxdepth: 2 :maxdepth: 2
api api
faq

14
web/api/README.md Normal file
View File

@ -0,0 +1,14 @@
ZoneMinder API
==============
This is the ZoneMinder API. It should be, for now, installed under the webroot
e.g. /api.
app/Config/database.php.default must be configured and copied to
app/Config/database.php
In adition, Security.salt and Security.cipherSeed in app/Config/core.php should
be changed.
The API can run on a dedicated / separate instance, so long as it can access
the database as ocnfigured in app/Config/database.php

View File

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 372 B

View File

Before

Width:  |  Height:  |  Size: 943 B

After

Width:  |  Height:  |  Size: 943 B

View File

Before

Width:  |  Height:  |  Size: 201 B

After

Width:  |  Height:  |  Size: 201 B

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 496 B

After

Width:  |  Height:  |  Size: 496 B

View File

Before

Width:  |  Height:  |  Size: 783 B

After

Width:  |  Height:  |  Size: 783 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Some files were not shown because too many files have changed in this diff Show More