Merge branch 'master' into Fox-Working

Conflicts:
	.project
	Doc/Build.md
	OpenNote/Config.php
	README.md

Author: JLiscom

.project

@@ -15,4 +15,4 @@
 		<nature>org.eclipse.angularjs.core.angularnature</nature>
 		<nature>tern.eclipse.ide.core.ternnature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>

Doc/Build.md

@@ -1,20 +1,18 @@
-# How To Build
-
-Installing Build Enviorment
----------------------------
-
-git clone this repositiory
-
-thern run 
-```
-npm install
-```
-
-this will install everything fron bower to grunt.
-
-Then run 
-```
-grunt build
-```
-
-This is pull all the bower components and build things like css
+# How to build
+
+## Clone
+You will need to clone the front end and the backend
+https://github.com/FoxUSA/OpenNote
+https://github.com/FoxUSA/OpenNoteService-PHP
+
+Most of the buid tasks require the OpenNote and OpenNoteService-PHP to be in the same folder 
+
+## Build Requirments
+- Bower
+- Grunt
+- Composer
+
+## Build
+Run from OpenNote project
+`grunt build`
+

Doc/Install.md

@@ -1,24 +1,35 @@
 # How To Install
+# Automatic(Wizard Based Install)
+To run the installer open
+`<install path>/Service/install.php`
 
+Make sure you delete `install.php` and `Config.template`.
+
+### Security Note
+Be default we put the sqlite databse in the web folder. This is not a good idea. We solved this by putting in a htaccess file to not allow the database to be downloaded.
+
+Still, you should move this file out of the webserver directory and change the location in `Config.php`
+
+## Manual
 ###MYSql
 - Create a MYSQL database named "OpenNote"
 - Download and extract OpenNote into a folder on your php web-server called "OpenNote"
-- Open up the `model/sql` folder and run `notebook.sql` in your OpenNote database
-- Change the database connection settings inside of `web-server path/OpenNote/Config.php` to match your db settings.
+- Open up the `Service/model/sql` folder and run `notebook.sql` in your OpenNote database
+- Change the database connection settings inside of `Service/Config.php` to match your db settings.
 These are stored in the following lines of code in `/OpenNote/Config.php`:
 ```php
-	public static $dbUserName = "notebook";
-	public static $dbPassword = "password";
-	public static $dbServer = "localhost";
-	public static $dbName = "notebook";
+	$dbUserName = "notebook";
+	$dbPassword = "password";
+	$dbServer = "127.0.0.1";
+	$dbName = "notebook";
 ```
 			
 - Now the site install is complete. You can now open the site by going to your webserver url +/OpenNote
 
 ###SQLite
 - Download and extract OpenNote into a folder on your php web-server called "OpenNote"
-- Move the SQLite database file from `model/sql` folder to a folder not in the web server www directory.
-- Change the database connection settings inside of `web-server path/OpenNote/Config.php` to match your db settings.
+- Create a SQLite database file and execute the SQL DDL from `Service/model/sql` and run `notebook.sqlite.sql`.
+- Change the database connection settings inside of `Service/Config.php` to match your db settings.
 - These are stored in the following lines of code in `/OpenNote/Config.php`:
 
 Uncomment the following lines in the dbConfig function:
@@ -33,4 +44,4 @@ Comment the following lines in the dbConfig function:
 	$dbName = "../<relative path>/OpenNote.sqlite";
 ```
 			
-- Now the site install is complete. You can now open the site by going to your webserver url +/OpenNote
+- Now the site install is complete. You can now open the site by going to your webserver url +/OpenNote

Doc/Upgrade.md

@@ -0,0 +1,8 @@
+# How To Upgrade
+###MYSql
+- Make sure you make a copy of you database and the OpenNote directory
+- Run `Service/model/sql/updateScript/` scripts to roll the database up to current specs.
+- You will copy need to copy the upload directory contents into the new upload direcory in `Service/upload`.
+
+###SQLite
+Same as the MYSql. You may need to slightly modify the sql upload script to be compatible with sqlite.

License

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Jacob Liscom
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -31,10 +31,20 @@ Features
 
 Upcoming Features
 -----------------
+- REST service and Angular JS Based front end. Working on in working branch.
+- Tags (You win)
 - Email to note
 - Implement history viewer
 - Install script
 - Move Notes (Feature lost when migrating to Angular based list)
+- Native Apps?????
+
+User Wish List
+--------------
+List of things users are wishing for that have not made it into the pipeline.
+Please do not re-submit issues for these features. Instead, how about a donation with the feature in the comment?
+
+- Out of box PostgreSQL support. PDO connector support PostgreSQL.
 
 Demo
 -------