diff --git a/README.md b/README.md
index d88d562c..5603d305 100755
--- a/README.md
+++ b/README.md
@@ -1,34 +1,38 @@
-MEDFORMS
+NodeForms
--------
-[](https://travis-ci.org/whitef0x0/medforms)
-[](https://david-dm.org/whitef0x0/medforms)
+[](https://travis-ci.org/whitef0x0/NodeForms)
+[](https://david-dm.org/whitef0x0/NodeForms)
-Medforms is an opensource *form builder* that can create stunning forms from PDFs or from scratch
+NodeForms is an opensource *form builder* built ontop of nodejs that can create stunning forms from PDFs or from scratch
-## Before You Begin
-Before you begin we recommend you read about the basic building blocks that assemble a MEAN.JS application:
-* MongoDB - Go through [MongoDB Official Website](http://mongodb.org/) and proceed to their [Official Manual](http://docs.mongodb.org/manual/), which should help you understand NoSQL and MongoDB better.
-* Express - The best way to understand express is through its [Official Website](http://expressjs.com/), which has a [Getting Started](http://expressjs.com/starter/installing.html) guide, as well as an [ExpressJS Guide](http://expressjs.com/guide/error-handling.html) guide for general express topics. You can also go through this [StackOverflow Thread](http://stackoverflow.com/questions/8144214/learning-express-for-node-js) for more resources.
-* AngularJS - Angular's [Official Website](http://angularjs.org/) is a great starting point. You can also use [Thinkster Popular Guide](http://www.thinkster.io/), and the [Egghead Videos](https://egghead.io/).
-* Node.js - Start by going through [Node.js Official Website](http://nodejs.org/) and this [StackOverflow Thread](http://stackoverflow.com/questions/2353818/how-do-i-get-started-with-node-js), which should get you going with the Node.js platform in no time.
+Currently following features are implemented:
+
+##Current Features
+ -User login system to manage forms
+ -User CRUD
+ -Form CRUD
+ -11 possible types of form fields
+ -Editable startpage
+ -Create forms from FDF-formatted PDFs (unstable)
+ -Save form submissions as FDF-formatted PDFs (unstable)
+ -Toggle forms as private (viewable only if logged in as Form's user) or public (viewable by anyone)
+ -Drag and drop functionality to editing form field order
+ -Editable form submissions (half-done)
+
+#TODO:
+ -Implement encryption for all form data
+ -Implement custom form design
+ -Finish frontend/backend testing
+ -Integrate AWS for PDF saving
+ -Add Typeform API integration
+ -Add OscarHost API integration
+ -Add plugin support (ala Slack)
+ -Create wiki for easy installation and setup
+ -Create mockups for different user view designs
-## Prerequisites
-Make sure you have installed all of the following prerequisites on your development machine:
-* Node.js - [Download & Install Node.js](http://www.nodejs.org/download/) and the npm package manager. If you encounter any problems, you can also use this [GitHub Gist](https://gist.github.com/isaacs/579814) to install Node.js.
-* MongoDB - [Download & Install MongoDB](http://www.mongodb.org/downloads), and make sure it's running on the default port (27017).
-* Bower - You're going to use the [Bower Package Manager](http://bower.io/) to manage your front-end packages. Make sure you've installed Node.js and npm first, then install bower globally using npm:
-```bash
-$ npm install -g bower
-```
-
-* Grunt - You're going to use the [Grunt Task Runner](http://gruntjs.com/) to automate your development process. Make sure you've installed Node.js and npm first, then install grunt globally using npm:
-
-```bash
-$ npm install -g grunt-cli
-```
## Quickstart
@@ -38,9 +42,14 @@ $ npm install
$ bower install
```
-Then run your application using grunt.
+To run development version:
```bash
-$ grunt
+$ grunt default
+```
+
+To run production version:
+```bash
+$ grunt production
```
Your application should run on port 3000, so in your browser just go to [http://localhost:3000](http://localhost:3000)
diff --git a/config/env/all.js b/config/env/all.js
index 6645be80..0303c6e2 100755
--- a/config/env/all.js
+++ b/config/env/all.js
@@ -2,7 +2,7 @@
module.exports = {
app: {
- title: 'MedForms',
+ title: 'NodeForms',
description: 'Generate Forms from PDFs',
keywords: 'typeform, pdfs, forms, generator, form generator',
},
diff --git a/config/env/development.js b/config/env/development.js
index bc681063..40c885e7 100755
--- a/config/env/development.js
+++ b/config/env/development.js
@@ -19,7 +19,7 @@ module.exports = {
}
},
app: {
- title: 'MedForms'
+ title: 'NodeForms'
},
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
diff --git a/config/env/test.js b/config/env/test.js
index fd557264..162fdf20 100755
--- a/config/env/test.js
+++ b/config/env/test.js
@@ -20,7 +20,7 @@ module.exports = {
}
},
app: {
- title: 'MedForms Test'
+ title: 'NodeForms Test'
},
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
diff --git a/docs/setup_sentry_server.md b/docs/setup_sentry_server.md
index 8f59c48a..aa005964 100644
--- a/docs/setup_sentry_server.md
+++ b/docs/setup_sentry_server.md
@@ -1,7 +1,7 @@
Installing Sentry Server
------------------------
-Medforms is an opensource *form builder* that can create stunning forms from PDFs or from scratch
+NodeForms is an opensource *form builder* that can create stunning forms from PDFs or from scratch
## Before You Begin
Make sure you understand what sentry server does. You can view documentation for sentry server [here](https://sentry.readthedocs.org/). This document was written for a server running *Ubuntu 14.04 LTS server* (we used Azure).
diff --git a/package.json b/package.json
index 190a403f..408414d7 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"private": true,
"repository": {
"type": "git",
- "url": "https://github.com/whitef0x0/medforms.git"
+ "url": "https://github.com/whitef0x0/NodeForms.git"
},
"engines": {
"node": "~0.10.28",
diff --git a/public/modules/core/views/home.client.view.html b/public/modules/core/views/home.client.view.html
index f5797630..aedd618a 100755
--- a/public/modules/core/views/home.client.view.html
+++ b/public/modules/core/views/home.client.view.html
@@ -17,12 +17,18 @@
Craft beautiful forms in seconds.
+<<<<<<< HEAD
Craft beautiful forms.
Medforms is an opensource form builder that can create stunning forms from PDFs or from scratch
+=======
+
+ NodeForms is an opensource form builder that can create stunning forms from PDFs or from scratch
+
+>>>>>>> master