diff --git a/.all-contributorsrc b/.all-contributorsrc
index 76f44657..7178e685 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1,6 +1,6 @@
{
- "projectName": "TellForm",
- "projectOwner": "tellform",
+ "projectName": "OhMyForm",
+ "projectOwner": "ohmyform",
"files": [
"README.md"
],
diff --git a/.env.example b/.env.example
index f07991ff..de506a30 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,4 @@
-# TellForm Configuration File
+# OhMyForm Configuration File
## TODO: Have commented out examples that would work.
###################################
@@ -7,27 +7,27 @@
# Set this to the path where Mailu data and configuration is stored
# Mac users: Change to a Docker accessible folder
-ROOT=/opt/tellform_data
+ROOT=/opt/ohmyform_data
-# Set to what environment you will be running TellForm in (production or development)
+# Set to what environment you will be running OhMyForm in (production or development)
NODE_ENV=development
# Set to a randomly generated 16 bytes string
SECRET_KEY=ChangeMeChangeMe
-# URI of Mongo database that TellForm will connect to
+# URI of Mongo database that OhMyForm will connect to
#DO NOT CHANGE
-MONGODB_URI=mongodb://mongo/tellform
+MONGODB_URI=mongodb://mongo/ohmyform
-# URL Redis server that TellForm will connect to
+# URL Redis server that OhMyForm will connect to
#DO NOT CHANGE
REDIS_URL=redis://redis:6379
-# Port that the TellForm Node app will listen on
+# Port that the OhMyForm Node app will listen on
PORT=5000
-# Domain that TellForm's admin panel will be hosted at
-BASE_URL=tellform.dev
+# Domain that OhMyForm's admin panel will be hosted at
+BASE_URL=ohmyform.dev
# Port that SocketIO server (for analytics) will listen on
SOCKET_PORT=20523
@@ -43,7 +43,7 @@ TLS_FLAVOR=notls
# Set this to enable coveralls.io support
COVERALLS_REPO_TOKEN=
-# Disable signups for your TellForm instance
+# Disable signups for your OhMyForm instance
SIGNUP_DISABLED=FALSE
# Disable per-user custom subdomains
@@ -51,9 +51,9 @@ SUBDOMAINS_DISABLED=FALSE
# Url that subdomains will be hosted at (has to have domain name as ADMIN_URL)
# Only used when SUBDOMAINS_DISABLED=FALSE
-SUBDOMAIN_URL=*.tellform.dev
+SUBDOMAIN_URL=*.ohmyform.dev
-# Enable running TellForm in pm2's 'cluster' mode
+# Enable running OhMyForm in pm2's 'cluster' mode
ENABLE_CLUSTER_MODE=FALSE
###################################
@@ -106,7 +106,7 @@ ADMIN_PASSWORD=root
# Set this to server your websockets server on a seperate URL
SOCKETS_URL=
-# Set this to change the port that TellForm will listen on
+# Set this to change the port that OhMyForm will listen on
PORT=5000
# Set this to your Google Analytics ID to enable tracking with GA
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 023b8aa2..2c68314a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
##Enforcement
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@tellform.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@ohmyform.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
diff --git a/README.md b/README.md
index d0c79a89..f82f35d1 100755
--- a/README.md
+++ b/README.md
@@ -4,13 +4,13 @@
-
+
![Project Status](https://img.shields.io/badge/status-0.2.1-green.svg)
-
+
[![Discord](https://img.shields.io/discord/595773457862492190.svg?label=Discord%20Chat)](https://discord.gg/3jYMAYg)
> An *open source alternative to TypeForm* that can create [stunning mobile-ready forms](https://ohmyform.com/examples) , surveys and questionnaires.
@@ -45,7 +45,7 @@ Moving over to Discord so that I can manage things without hassle.
- Embeddable Forms
- Forms as a Service API
-
+Please checkout our CONTRIBUTING.md on ways to contribute to OhMyForm. -->
## Quickstart
diff --git a/app/controllers/users.server.controller.js b/app/controllers/users.server.controller.js
index 06ef00ea..0ba5fe7f 100755
--- a/app/controllers/users.server.controller.js
+++ b/app/controllers/users.server.controller.js
@@ -3,7 +3,7 @@
/**
* Module dependencies.
*/
-var _ = require('lodash');
+let _ = require('lodash');
/**
* Extend user's controller
diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js
index fd66b6b1..6c77a969 100755
--- a/app/controllers/users/users.password.server.controller.js
+++ b/app/controllers/users/users.password.server.controller.js
@@ -114,7 +114,7 @@ exports.forgot = function(req, res) {
], function(err, obfuscatedEmail) {
if (err) {
return res.status(400).send({
- message: 'Couldn\'t send reset password email due to internal server errors. Please contact support at team@tellform.com.'
+ message: 'Couldn\'t send reset password email due to internal server errors. Please contact support at team@ohmyform.com.'
});
} else {
return res.send({
diff --git a/app/libs/send-email-notifications.js b/app/libs/send-email-notifications.js
index 158882e7..39be8107 100644
--- a/app/libs/send-email-notifications.js
+++ b/app/libs/send-email-notifications.js
@@ -9,7 +9,7 @@ module.exports = {
var mailOptions = {
replyTo: emailSettings.fromEmails,
- from: 'noreply@tellform.com',
+ from: 'noreply@ohmyform.com',
cc: emailSettings.toEmails,
subject: parsedSubject,
html: parsedTemplate
@@ -45,4 +45,4 @@ module.exports = {
});
return formFieldDict;
}
-};
\ No newline at end of file
+};
diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js
index 3b7e9513..daa501de 100644
--- a/app/models/form.server.model.js
+++ b/app/models/form.server.model.js
@@ -168,7 +168,7 @@ var FormSchema = new Schema({
},
subject: {
type: String,
- default: 'Tellform: Thank you for filling out this TellForm'
+ default: 'OhMyForm: Thank you for filling out this OhMyForm'
},
htmlTemplate: {
type: String,
diff --git a/app/tests/form_submission.routes.test.js b/app/tests/form_submission.routes.test.js
index 17c77ace..95361774 100644
--- a/app/tests/form_submission.routes.test.js
+++ b/app/tests/form_submission.routes.test.js
@@ -68,7 +68,7 @@ describe('Form Submission Routes Unit tests', function() {
respondentNotifications: {
toField: mongoose.Types.ObjectId(),
fromEmails: 'john@smith.com',
- subject: 'Tellform: Thank you for filling out this TellForm',
+ subject: 'OhMyForm: Thank you for filling out this OhMyForm',
htmlTemplate:'Hello,
We’ve received your submission.
Thank you & have a nice day!',
enabled: true
}
diff --git a/app/views/form.server.view.pug b/app/views/form.server.view.pug
index d66ce5fe..95deb3bb 100644
--- a/app/views/form.server.view.pug
+++ b/app/views/form.server.view.pug
@@ -96,7 +96,7 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
//Livereload script rendered
script(async='', type='text/javascript', src='http://#{request.hostname}:35729/livereload.js')
- //script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.tellform.com/2').install();
+ //script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.ohmyform.com/2').install();
if google_analytics_id
script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','{{google_analytics_id}}','auto');ga('send','pageview')
diff --git a/app/views/index.server.view.pug b/app/views/index.server.view.pug
index 0bb5ca1f..352a3adc 100644
--- a/app/views/index.server.view.pug
+++ b/app/views/index.server.view.pug
@@ -58,4 +58,4 @@ block content
script(src='https://cdn.ravenjs.com/2.3.0/angular/raven.min.js')
- script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.tellform.com/2').install();
+ script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.ohmyform.com/2').install();
diff --git a/app/views/redoc.server.view.pug b/app/views/redoc.server.view.pug
index c850dc96..868f6dde 100644
--- a/app/views/redoc.server.view.pug
+++ b/app/views/redoc.server.view.pug
@@ -3,7 +3,7 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
head
title #{title}
- // General META
+ // General META
meta(charset='utf-8')
meta(http-equiv='Content-type', content='text/html;charset=UTF-8')
meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
@@ -11,11 +11,11 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
meta(name='apple-mobile-web-app-capable', content='yes')
meta(name='apple-mobile-web-app-status-bar-style', content='black')
- // Semantic META
+ // Semantic META
meta(name='keywords', content='#{keywords}')
meta(name='description', content='#{description}')
- // Facebook META
+ // Facebook META
meta(property='og:site_name', content='#{title}')
meta(property='og:title', content='#{title}')
meta(property='og:description', content='#{description}')
@@ -23,13 +23,13 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
meta(property='og:image', content='/img/brand/logo.png')
meta(property='og:type', content='website')
- // Twitter META
+ // Twitter META
meta(name='twitter:title', content='#{title}')
meta(name='twitter:description', content='#{description}')
meta(name='twitter:url', content='{{url}}')
meta(name='twitter:image', content='/img/brand/logo.png')
- // Fav Icon
+ // Fav Icon
link(href='/static/modules/core/img/brand/favicon.ico', rel='shortcut icon', type='image/x-icon')
link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,900')
@@ -40,21 +40,21 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
body
redoc(spec-url='/static/swagger.json')
script(src='https://rebilly.github.io/ReDoc/releases/latest/redoc.min.js')
-
+
//Bower JS dependencies
each bowerJSFile in bowerJSFiles
script(type='text/javascript', src='#{bowerJSFile}')
// end Bower JS dependencies
-
+
script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.8/angular-strap.min.js')
-
+
if process.env.NODE_ENV === 'development'
script(src='https://cdn.ravenjs.com/2.3.0/angular/raven.min.js')
-
- script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.tellform.com/2').install();
-
+
+ script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.ohmyform.com/2').install();
+
script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','{{google_analytics_id}}','auto');ga('send','pageview')
-
+
script(src='https://www.google-analytics.com/analytics.js', async='', defer='')
script(type="text/javascript").
diff --git a/app/views/templates/reset-password-confirm-email.server.view.html b/app/views/templates/reset-password-confirm-email.server.view.html
index 5d8df1bb..e8dffdbe 100755
--- a/app/views/templates/reset-password-confirm-email.server.view.html
+++ b/app/views/templates/reset-password-confirm-email.server.view.html
@@ -29,7 +29,7 @@
Hello there!
This is a courtesy message to confirm that your password was just changed.
-Thanks so much for using our services! If you have any questions, or suggestions, please feel free to email us here at team@tellform.com.
+Thanks so much for using our services! If you have any questions, or suggestions, please feel free to email us here at team@ohmyform.com.
- The #{appName} team
- | © TellForm 2017 | +© OhMyForm 2017 |