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

@@ -50,7 +50,7 @@ - +
© TellForm 2017© OhMyForm 2017
@@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/app/views/templates/reset-password-confirm-email.server.view.pug b/app/views/templates/reset-password-confirm-email.server.view.pug index 95c05cd4..bf22c1b9 100644 --- a/app/views/templates/reset-password-confirm-email.server.view.pug +++ b/app/views/templates/reset-password-confirm-email.server.view.pug @@ -23,7 +23,7 @@ html p=__('EMAIL_GREETING') p=__('RESET_PASSWORD_CONFIRMATION_EMAIL_BODY_1') p=__("VERIFICATION_EMAIL_PARAGRAPH_2") - a(href='mailto:team@tellform.com') team@tellform.com + a(href='mailto:team@ohmyform.com') team@ohmyform.com p=__('EMAIL_SIGNATURE') td(width='36') tr @@ -38,4 +38,4 @@ html tbody tr(style="color: #c0c0c0; font-size: 11px; font-family: 'Open Sans', 'Lucida Grande', 'Segoe UI', Arial, Verdana, 'Lucida Sans Unicode', Tahoma, 'Sans Serif'; -webkit-text-size-adjust: none") td(width='400', align='left') - td(width='128', align='right') © TellForm 2017 + td(width='128', align='right')=copyright() diff --git a/app/views/templates/reset-password-email.server.view.html b/app/views/templates/reset-password-email.server.view.html index 98e8beb0..e769e05c 100755 --- a/app/views/templates/reset-password-email.server.view.html +++ b/app/views/templates/reset-password-email.server.view.html @@ -31,7 +31,7 @@

Here is a special link that will allow you to reset your password. Please note it will expire in one hour for your protection:

Reset Your Password

If you did not request this, please ignore this email and your password will remain unchanged.

-

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

@@ -52,7 +52,7 @@ - +
© TellForm 2017© OhMyForm 2017
@@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/app/views/templates/reset-password-email.server.view.pug b/app/views/templates/reset-password-email.server.view.pug index 912f32e0..8fd6cc0e 100644 --- a/app/views/templates/reset-password-email.server.view.pug +++ b/app/views/templates/reset-password-email.server.view.pug @@ -26,7 +26,7 @@ html a(href=url)=__('RESET_PASSWORD_REQUEST_EMAIL_LINK_TEXT') p=__('RESET_PASSWORD_REQUEST_EMAIL_PARAGRAPH_2') p=__('VERIFICATION_EMAIL_PARAGRAPH_2') - a(href='mailto:team@tellform.com') team@tellform.com + a(href='mailto:team@ohmyform.com') team@ohmyform.com p=__('EMAIL_SIGNATURE') td(width='36') tr @@ -41,4 +41,4 @@ html tbody tr(style="color: #c0c0c0; font-size: 11px; font-family: 'Open Sans', 'Lucida Grande', 'Segoe UI', Arial, Verdana, 'Lucida Sans Unicode', Tahoma, 'Sans Serif'; -webkit-text-size-adjust: none") td(width='400', align='left') - td(width='128', align='right') © TellForm 2017 + td(width='128', align='right')=copyright() diff --git a/app/views/verification.email.view.pug b/app/views/verification.email.view.pug index fb225507..221131e1 100644 --- a/app/views/verification.email.view.pug +++ b/app/views/verification.email.view.pug @@ -30,8 +30,8 @@ html p a(href='http://${URL}')=__('VERIFICATION_EMAIL_LINK_TEXT') p=__('VERIFICATION_EMAIL_PARAGRAPH_2') - a(href='mailto:team@tellform.com') - | team@tellform.com + a(href='mailto:team@ohmyform.com') + | team@ohmyform.com p=__('EMAIL_SIGNATURE') td(width='36') tr @@ -46,4 +46,4 @@ html tbody tr(style="color: #c0c0c0; font-size: 11px; font-family: 'Open Sans', 'Lucida Grande', 'Segoe UI', Arial, Verdana, 'Lucida Sans Unicode', Tahoma, 'Sans Serif'; -webkit-text-size-adjust: none") td(width='400', align='left') - td(width='128', align='right') © TellForm 2017 + td(width='128', align='right')=copyright() diff --git a/app/views/welcome.email.view.pug b/app/views/welcome.email.view.pug index f4562ce0..63937bf8 100644 --- a/app/views/welcome.email.view.pug +++ b/app/views/welcome.email.view.pug @@ -29,8 +29,8 @@ html p=__('EMAIL_GREETING') p=__('WELCOME_EMAIL_PARAGRAPH_1') p=__('WELCOME_EMAIL_PARAGRAPH_2') - a(href='mailto:team@tellform.com') - | team@tellform.com + a(href='mailto:team@ohmyform.com') + | team@ohmyform.com p=__('EMAIL_SIGNATURE') td(width='36') tr @@ -45,4 +45,4 @@ html tbody tr(style="color: #c0c0c0; font-size: 11px; font-family: 'Open Sans', 'Lucida Grande', 'Segoe UI', Arial, Verdana, 'Lucida Sans Unicode', Tahoma, 'Sans Serif'; -webkit-text-size-adjust: none") td(width='400', align='left') - td(width='128', align='right') © TellForm 2017 + td(width='128', align='right')=copyright() diff --git a/bower.json b/bower.json index 90c1f70f..3dfe0b8e 100755 --- a/bower.json +++ b/bower.json @@ -1,8 +1,8 @@ { - "name": "tellform", + "name": "ohmyform", "description": "Opensource alternative to TypeForm", "version": "2.2.0", - "homepage": "https://github.com/tellform/tellform", + "homepage": "https://github.com/ohmyform/ohmyform", "authors": [ "David Baldwynn (http://baldwynn.me)" ], diff --git a/config/env/all.js b/config/env/all.js index 9dd2fb16..a49b5ca0 100755 --- a/config/env/all.js +++ b/config/env/all.js @@ -3,7 +3,7 @@ module.exports = { app: { google_analytics_id: process.env.GOOGLE_ANALYTICS_ID || '', - title: process.env.APP_NAME || 'TellForm', + title: process.env.APP_NAME || 'OhMyForm', description: process.env.APP_DESC || 'Opensource form builder alternative to TypeForm', keywords: process.env.APP_KEYWORDS || 'typeform, pdfs, forms, opensource, formbuilder, google forms, nodejs' }, @@ -31,7 +31,7 @@ module.exports = { tempUserCollection: 'temporary_users', mailer: { - from: process.env.MAILER_FROM || 'testing@'+process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com', + from: process.env.MAILER_FROM || 'testing@'+process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@ohmyform.com', options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set host: process.env.MAILER_SMTP_HOST || '', port: process.env.MAILER_SMTP_PORT || 465, diff --git a/config/env/development.js b/config/env/development.js index bd19d48d..a8ae103d 100755 --- a/config/env/development.js +++ b/config/env/development.js @@ -13,7 +13,7 @@ module.exports = { // Uncomment to enable logging to a log on the file system }, mailer: { - from: process.env.MAILER_FROM || 'no-reply@tellform.com', + from: process.env.MAILER_FROM || 'no-reply@ohmyform.com', options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set host: process.env.MAILER_SMTP_HOST || '', port: process.env.MAILER_SMTP_PORT || 465, diff --git a/config/env/production.js b/config/env/production.js index 98a93f27..2d0f3fd2 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -1,12 +1,12 @@ 'use strict'; module.exports = { - baseUrl: process.env.BASE_URL || process.env.HEROKU_APP_NAME + '.herokuapp.com' || 'tellform.com', + baseUrl: process.env.BASE_URL || process.env.HEROKU_APP_NAME + '.herokuapp.com' || 'ohmyform.com', db: { uri: process.env.MONGODB_URI || process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_PORT_27017_TCP_ADDR || '127.0.0.1') + '/mean' }, port: process.env.PORT || 5000, - socketUrl: process.env.SOCKET_URL || 'ws.tellform.com', + socketUrl: process.env.SOCKET_URL || 'ws.ohmyform.com', socketPortExternallyVisible: (process.env.SOCKET_PORT_EXTERN_VISIBLE === 'TRUE' || !process.env.SOCKET_PORT_EXTERN_VISIBLE), //socketPortExternallyVisible set to true in production config by default socketPort: process.env.SOCKET_PORT || 20523, log: { @@ -25,7 +25,7 @@ module.exports = { sessionCookie: { secure: false, maxAge: 24 * 60 * 60 * 1000, // 24 hours - domain: process.env.BASE_URL || '.tellform.com' + domain: process.env.BASE_URL || '.ohmyform.com' }, assets: { css: ['public/dist/application.min.css'], diff --git a/config/env/test.js b/config/env/test.js index 651685f1..e809c9e1 100755 --- a/config/env/test.js +++ b/config/env/test.js @@ -17,7 +17,7 @@ module.exports = { }, subdomainsDisabled: true, app: { - title: 'TellForm Test' + title: 'OhMyForm Test' }, sessionCookie: { maxAge: 24 * 60 * 60 * 1000 // 24 hours diff --git a/config/express.js b/config/express.js index 69a5fe53..e101a5c0 100755 --- a/config/express.js +++ b/config/express.js @@ -3,9 +3,7 @@ /** * Module dependencies. */ -var fs = require('fs'), - https = require('https'), - express = require('express'), +const express = require('express'), morgan = require('morgan'), logger = require('./logger'), bodyParser = require('body-parser'), @@ -25,17 +23,6 @@ var fs = require('fs'), var mongoose = require('mongoose'); -/** - * Configure Socket.io - */ -var configureSocketIO = function (app, db) { - // Load the Socket.io configuration - var server = require('./socket.io')(app, db); - - // Return server object - return server; -}; - var supportedLanguages = ['en', 'de', 'fr', 'it', 'es']; function containsAnySupportedLanguages(preferredLanguages){ @@ -103,6 +90,10 @@ module.exports = function(db) { return i18n.__.apply(req, arguments); }; + res.locals.copyright = () => { + return '©OhMyForm '+(new Date().getFullYear()); + }; + next(); }); @@ -349,7 +340,7 @@ module.exports = function(db) { }); }); - app = configureSocketIO(app, db); + app = require('./socket.io')(app, db); // Return Express server instance return app; diff --git a/docker-compose.yml b/docker-compose.yml index 1782316f..8144fb95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: image: mongo volumes: - "./data/mongo:/data" - tellform: + ohmyform: image: ohmyform/ohmyform #build: . #volumes: @@ -17,7 +17,7 @@ services: SOCKET_URL: 'localhost:5000' SOCKET_PORT: "5000" SOCKET_PORT_EXTERN_VISIBLE: "TRUE" - MONGODB_URI: mongodb://mongo/tellform + MONGODB_URI: mongodb://mongo/ohmyform REDIS_URL: redis://redis MAILER_SMTP_HOST: mail MAILER_SMTP_PORT: 1025 diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 42385be7..570aacc5 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -43,7 +43,7 @@ http { {% endif %} location / { - proxy_pass http://tellform:20523; + proxy_pass http://ohmyform:20523; proxy_read_timeout 90; proxy_set_header Host $host; @@ -59,7 +59,7 @@ http { {% if TLS and not TLS_ERROR %} proxy_set_header X-Forwarded-Proto https; {% endif %} - } + } {% if TLS_FLAVOR == 'letsencrypt' %} location ^~ /.well-known/acme-challenge/ { @@ -94,9 +94,9 @@ http { root /usr/share/nginx/html; index index.html index.htm; - - location / { - proxy_pass http://tellform:5000; + + location / { + proxy_pass http://ohmyform:5000; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -106,7 +106,7 @@ http { proxy_set_header X-Forwarded-Proto https; {% endif %} } - + {% if TLS_FLAVOR == 'letsencrypt' %} location ^~ /.well-known/acme-challenge/ { proxy_pass http://127.0.0.1:8008; diff --git a/docker/nginx/letsencrypt.py b/docker/nginx/letsencrypt.py index cb5a098d..bfdd9a87 100644 --- a/docker/nginx/letsencrypt.py +++ b/docker/nginx/letsencrypt.py @@ -12,7 +12,7 @@ command = [ "-m", "{}@{}".format(os.environ["POSTMASTER"], os.environ["DOMAIN"]), "certonly", "--standalone", "--server", "https://acme-v02.api.letsencrypt.org/directory", - "--cert-name", "tellform", + "--cert-name", "ohmyform", "--preferred-challenges", "http", "--http-01-port", "8008", "--keep-until-expiring", "--rsa-key-size", "4096", diff --git a/gruntfile.js b/gruntfile.js index f50e0223..542f8163 100755 --- a/gruntfile.js +++ b/gruntfile.js @@ -243,7 +243,7 @@ module.exports = function(grunt) { }, forms: { options: { - module: 'TellForm-Form.form_templates' + module: 'OhMyForm-Form.form_templates' }, src: ['public/form_modules/**/views/**.html', 'public/form_modules/**/views/**/*.html'], dest: 'public/dist/form_populate_template_cache.js' diff --git a/public/form-config.js b/public/form-config.js index 59a076f5..56a574d9 100644 --- a/public/form-config.js +++ b/public/form-config.js @@ -3,8 +3,8 @@ // Init the application configuration module for AngularJS application var ApplicationConfiguration = (function() { // Init module configuration options - var applicationModuleName = 'TellForm-Form'; - var applicationModuleVendorDependencies = ['duScroll', 'ui.select', 'ngSanitize', 'vButton', 'ngResource', 'TellForm-Form.form_templates', 'ui.router', 'ui.bootstrap', 'pascalprecht.translate']; + var applicationModuleName = 'OhMyForm-Form'; + var applicationModuleVendorDependencies = ['duScroll', 'ui.select', 'ngSanitize', 'vButton', 'ngResource', 'OhMyForm-Form.form_templates', 'ui.router', 'ui.bootstrap', 'pascalprecht.translate']; // Add a new vertical module var registerModule = function(moduleName, dependencies) { diff --git a/public/form_modules/forms/base/config/i18n/english.js b/public/form_modules/forms/base/config/i18n/english.js index 9941d5ae..ed42a26c 100644 --- a/public/form_modules/forms/base/config/i18n/english.js +++ b/public/form_modules/forms/base/config/i18n/english.js @@ -6,8 +6,8 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr FORM_SUCCESS: 'Form entry successfully submitted!', REVIEW: 'Review', BACK_TO_FORM: 'Go back to Form', - EDIT_FORM: 'Edit this TellForm', - CREATE_FORM: 'Create this TellForm', + EDIT_FORM: 'Edit this OhMyForm', + CREATE_FORM: 'Create this OhMyForm', ADVANCEMENT: '{{done}} out of {{total}} answered', CONTINUE_FORM: 'Continue to Form', REQUIRED: 'required', diff --git a/public/form_modules/forms/base/config/i18n/french.js b/public/form_modules/forms/base/config/i18n/french.js index 0d2bca0c..6806807b 100644 --- a/public/form_modules/forms/base/config/i18n/french.js +++ b/public/form_modules/forms/base/config/i18n/french.js @@ -6,8 +6,8 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr FORM_SUCCESS: 'Votre formulaire a été enregistré!', REVIEW: 'Incomplet', BACK_TO_FORM: 'Retourner au formulaire', - EDIT_FORM: 'Éditer le Tellform', - CREATE_FORM: 'Créer un TellForm', + EDIT_FORM: 'Éditer le OhMyForm', + CREATE_FORM: 'Créer un OhMyForm', ADVANCEMENT: '{{done}} complétés sur {{total}}', CONTINUE_FORM: 'Aller au formulaire', REQUIRED: 'obligatoire', diff --git a/public/form_modules/forms/base/config/i18n/german.js b/public/form_modules/forms/base/config/i18n/german.js index f9d53732..4bc4bc0e 100644 --- a/public/form_modules/forms/base/config/i18n/german.js +++ b/public/form_modules/forms/base/config/i18n/german.js @@ -6,8 +6,8 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr FORM_SUCCESS: 'Ihre Angaben wurden gespeichert.', REVIEW: 'Unvollständig', BACK_TO_FORM: 'Zurück zum Formular', - EDIT_FORM: 'Bearbeiten Sie diese TellForm', - CREATE_FORM: 'Dieses TellForm erstellen', + EDIT_FORM: 'Bearbeiten Sie diese OhMyForm', + CREATE_FORM: 'Dieses OhMyForm erstellen', ADVANCEMENT: '{{done}} von {{total}} beantwortet', CONTINUE_FORM: 'Zum Formular', REQUIRED: 'verpflichtend', @@ -36,10 +36,10 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr LOADING_LABEL: 'Laden', WAIT_LABEL: 'Bitte warten', - + FORM_404_HEADER: '404 - Formular existiert nicht', FORM_404_BODY: 'Das Formular, auf das Sie zugreifen möchten, existiert nicht. Das tut mir leid!', - + FORM_UNAUTHORIZED_HEADER: 'Nicht zum Zugriffsformular berechtigt\' ',    FORM_UNAUTHORIZED_BODY1: 'Das Formular, auf das Sie zugreifen möchten, ist derzeit privat und nicht öffentlich zugänglich.',    FORM_UNAUTHORIZED_BODY2: 'Wenn Sie der Eigentümer des Formulars sind, können Sie es im Fenster "Konfiguration" im Formular admin auf "Öffentlich" setzen.', diff --git a/public/form_modules/forms/base/config/i18n/italian.js b/public/form_modules/forms/base/config/i18n/italian.js index 20f34143..3dac92aa 100644 --- a/public/form_modules/forms/base/config/i18n/italian.js +++ b/public/form_modules/forms/base/config/i18n/italian.js @@ -6,8 +6,8 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr FORM_SUCCESS: 'Il formulario è stato inviato con successo!', REVIEW: 'Incompleto', BACK_TO_FORM: 'Ritorna al formulario', - EDIT_FORM: 'Modifica questo TellForm', - CREATE_FORM: 'Crea questo TellForm', + EDIT_FORM: 'Modifica questo OhMyForm', + CREATE_FORM: 'Crea questo OhMyForm', ADVANCEMENT: '{{done}} su {{total}} completate', CONTINUE_FORM: 'Vai al formulario', REQUIRED: 'obbligatorio', @@ -36,10 +36,10 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr LOADING_LABEL: 'Caricamento', WAIT_LABEL: "Attendere prego", - + FORM_404_HEADER: '404 - Il modulo non esiste', FORM_404_BODY: 'La forma che stai cercando di accedere non esiste. Ci dispiace!', - + FORM_UNAUTHORIZED_HEADER: 'Non autorizzato per accedere al modulo',    FORM_UNAUTHORIZED_BODY1: 'Il modulo che si sta tentando di accedere è attualmente privato e non accessibile in pubblico.',    FORM_UNAUTHORIZED_BODY2: 'Se sei il proprietario del modulo, puoi impostarlo su "Pubblico" nel pannello "Configurazione" nell\'amministratore di moduli.', diff --git a/public/form_modules/forms/base/config/i18n/spanish.js b/public/form_modules/forms/base/config/i18n/spanish.js index 90c0b8ca..0862748c 100644 --- a/public/form_modules/forms/base/config/i18n/spanish.js +++ b/public/form_modules/forms/base/config/i18n/spanish.js @@ -6,8 +6,8 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr FORM_SUCCESS: '¡El formulario ha sido enviado con éxito!', REVIEW: 'Revisar', BACK_TO_FORM: 'Regresar al formulario', - EDIT_FORM: 'Editar este TellForm', - CREATE_FORM: 'Crear este TellForm', + EDIT_FORM: 'Editar este OhMyForm', + CREATE_FORM: 'Crear este OhMyForm', ADVANCEMENT: '{{done}} de {{total}} contestadas', CONTINUE_FORM: 'Continuar al formulario', REQUIRED: 'Información requerida', @@ -33,13 +33,13 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr OPTION_PLACEHOLDER: 'Escriba o seleccione una opción', ADD_NEW_LINE_INSTR: 'Presione MAYÚS + ENTRAR para agregar una nueva línea', ERROR: 'Error', - + LOADING_LABEL: 'Cargando', WAIT_LABEL: 'Espera', FORM_404_HEADER: '404 - La forma no existe', FORM_404_BODY: 'El formulario al que intenta acceder no existe. ¡Lo siento por eso!', - + FORM_UNAUTHORIZED_HEADER: 'Non autorizzato per accedere al modulo',    FORM_UNAUTHORIZED_BODY1: 'Il modulo che si sta tentando di accedere è attualmente privato e non accessibile in pubblico.',    FORM_UNAUTHORIZED_BODY2: 'Se sei il proprietario del modulo, puoi impostarlo su "Pubblico" nel pannello "Configurazione" nell\'amministratore di moduli.', diff --git a/public/form_modules/forms/base/config/i18n/swedish.js b/public/form_modules/forms/base/config/i18n/swedish.js index 4dcbe05a..0281e6d6 100644 --- a/public/form_modules/forms/base/config/i18n/swedish.js +++ b/public/form_modules/forms/base/config/i18n/swedish.js @@ -6,8 +6,8 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr FORM_SUCCESS: 'Formulärsvaret skickades framgångsrikt in!', REVIEW: 'Granska', BACK_TO_FORM: 'Gå tillbaka till Formuläret', - EDIT_FORM: 'Ändra denna TellForm', - CREATE_FORM: 'Skapa denna TellForm', + EDIT_FORM: 'Ändra denna OhMyForm', + CREATE_FORM: 'Skapa denna OhMyForm', ADVANCEMENT: '{{done}} utav {{total}} svar', CONTINUE_FORM: 'Fortsätt till Form', REQUIRED: 'krävs', diff --git a/public/form_modules/forms/base/services/socket.io.client.service.js b/public/form_modules/forms/base/services/socket.io.client.service.js index ecfdc829..c65a80b2 100644 --- a/public/form_modules/forms/base/services/socket.io.client.service.js +++ b/public/form_modules/forms/base/services/socket.io.client.service.js @@ -8,7 +8,7 @@ socket: null }; - // Connect to TellForm Socket.io server + // Connect to OhMyForm Socket.io server function connect() { var url = ''; if($window.socketUrl && $window.socketPort){ diff --git a/public/modules/core/img/logo_white.svg b/public/modules/core/img/logo_white.svg index 46c28925..b31368b1 100644 --- a/public/modules/core/img/logo_white.svg +++ b/public/modules/core/img/logo_white.svg @@ -9,8 +9,8 @@ - + - \ No newline at end of file + diff --git a/public/modules/forms/admin/config/i18n/english.js b/public/modules/forms/admin/config/i18n/english.js index b2257f11..08ceeeaf 100644 --- a/public/modules/forms/admin/config/i18n/english.js +++ b/public/modules/forms/admin/config/i18n/english.js @@ -6,7 +6,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid //Configure Form Tab View ADVANCED_SETTINGS: 'Advanced Settings', - FORM_NAME: 'Your tellform is called', + FORM_NAME: 'Your ohmyform is called', FORM_STATUS: 'Status', PUBLIC: 'Public', PRIVATE: 'Private', @@ -62,17 +62,17 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid DELETE_FORM_MD: 'Delete Form', DELETE: 'Delete', FORM: 'Form', - VIEW_MY_TELLFORM: 'View my tellform', + VIEW_MY_OHMYFORM: 'View my ohmyform', LIVE: 'Live', PREVIEW: 'Preview', //Share Tab COPIED_LABEL: 'Copied', COPY: 'Copy', - COPY_AND_PASTE: 'Copy and Paste this to add your TellForm to your website', + COPY_AND_PASTE: 'Copy and Paste this to add your OhMyForm to your website', CHANGE_WIDTH_AND_HEIGHT: 'Change the width and height values to suit you best', POWERED_BY: 'Powered by', - TELLFORM_URL: 'Your TellForm is permanently at this URL', + OHMYFORM_URL: 'Your OhMyForm is permanently at this URL', //Edit Form View DISABLED: 'Disabled', @@ -187,7 +187,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid FORM_SUCCESS: 'Form entry successfully submitted!', REVIEW: 'Review', BACK_TO_FORM: 'Go back to Form', - EDIT_FORM: 'Edit this TellForm', + EDIT_FORM: 'Edit this OhMyForm', ADVANCEMENT: '{{done}} out of {{total}} answered', CONTINUE_FORM: 'Continue to Form', REQUIRED: 'required', diff --git a/public/modules/forms/admin/config/i18n/french.js b/public/modules/forms/admin/config/i18n/french.js index e059a82e..cd0f9078 100644 --- a/public/modules/forms/admin/config/i18n/french.js +++ b/public/modules/forms/admin/config/i18n/french.js @@ -5,7 +5,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid $translateProvider.translations('fr', { // Configurer la vue de l'onglet Formulaire ADVANCED_SETTINGS: 'Paramètres avancés', - FORM_NAME: "Votre tellform est appelé", + FORM_NAME: "Votre ohmyform est appelé", FORM_STATUS: 'Statut', PUBLIC: 'Public', PRIVATE: "Privé", @@ -62,17 +62,17 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid DELETE_FORM_MD: "Supprimer le formulaire", DELETE: "Supprimer", FORM: 'Formulaire', - VIEW_MY_TELLFORM: "Afficher ma forme", + VIEW_MY_OHMYFORM: "Afficher ma forme", LIVE: "Live", PREVIEW: 'Aperçu', //Share Tab COPIED_LABEL: 'Copié', COPY: "Copier", - COPY_AND_PASTE: "Copiez et collez ceci pour ajouter votre TellForm à votre site Web", + COPY_AND_PASTE: "Copiez et collez ceci pour ajouter votre OhMyForm à votre site Web", CHANGE_WIDTH_AND_HEIGHT: "Changez les valeurs de largeur et de hauteur pour mieux vous convenir", POWERED_BY: "Alimenté par", - TELLFORM_URL: "Votre TellForm est disponible à cette URL", + OHMYFORM_URL: "Votre OhMyForm est disponible à cette URL", // Modifier la vue de formulaire DISABLED: "Désactivé", @@ -187,7 +187,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid FORM_SUCCESS: 'Entrée de formulaire soumise avec succès!', REVIEW: 'Réviser', BACK_TO_FORM: "Revenir au formulaire", - EDIT_FORM: "Modifier ce TellForm", + EDIT_FORM: "Modifier ce OhMyForm", ADVANCEMENT: '{{done}} sur {{total}} a répondu', CONTINUE_FORM: "Continuer à se former", REQUIRED: 'requis', diff --git a/public/modules/forms/admin/config/i18n/german.js b/public/modules/forms/admin/config/i18n/german.js index 6a2f1cf4..403598d5 100644 --- a/public/modules/forms/admin/config/i18n/german.js +++ b/public/modules/forms/admin/config/i18n/german.js @@ -5,7 +5,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid $translateProvider.translations('de', { // Konfigurieren der Formularregisterkarte ADVANCED_SETTINGS: 'Erweiterte Einstellungen', - FORM_NAME: 'Ihr tellform heißt', + FORM_NAME: 'Ihr ohmyform heißt', FORM_STATUS: 'Status', PUBLIC: 'Öffentlich', PRIVATE: 'Privat', @@ -62,16 +62,16 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid DELETE_FORM_MD: 'Formular löschen', DELETE: 'Löschen', FORM: 'Formular', - VIEW_MY_TELLFORM: 'Mein tellform anzeigen', + VIEW_MY_OHMYFORM: 'Mein ohmyform anzeigen', LIVE: 'Leben', PREVIEW: 'Vorschau', //Share Tab COPIED_LABEL: 'Kopiert', COPY: 'Kopieren', - COPY_AND_PASTE: 'Kopieren und einfügen, um Ihre TellForm auf Ihrer Website hinzuzufügen', + COPY_AND_PASTE: 'Kopieren und einfügen, um Ihre OhMyForm auf Ihrer Website hinzuzufügen', POWERED_BY: 'Unterstützt von', - TELLFORM_URL: "Ihr TellForm ist dauerhaft unter dieser URL", + OHMYFORM_URL: "Ihr OhMyForm ist dauerhaft unter dieser URL", // Formularansicht bearbeiten DISABLED: 'Deaktiviert', @@ -185,7 +185,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid FORM_SUCCESS: 'Formulareintrag erfolgreich gesendet!', REVIEW: 'Überprüfung', BACK_TO_FORM: 'Gehe zurück zu Formular', - EDIT_FORM: 'Bearbeiten Sie diese TellForm', + EDIT_FORM: 'Bearbeiten Sie diese OhMyForm', ADVANCEMENT: '{{done}} von {{total}} wurde beantwortet', CONTINUE_FORM: 'Weiter zum Formular', REQUIRED: 'erforderlich', diff --git a/public/modules/forms/admin/config/i18n/italian.js b/public/modules/forms/admin/config/i18n/italian.js index 44553d65..6166f148 100644 --- a/public/modules/forms/admin/config/i18n/italian.js +++ b/public/modules/forms/admin/config/i18n/italian.js @@ -5,7 +5,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid $translateProvider.translations('it', { // Configura la visualizzazione scheda modulo ADVANCED_SETTINGS: 'Impostazioni avanzate', - FORM_NAME: 'Il tuo tellform è chiamato', + FORM_NAME: 'Il tuo ohmyform è chiamato', FORM_STATUS: 'Stato', PUBLIC: 'pubblico', PRIVATE: 'Privato', @@ -62,16 +62,16 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid DELETE_FORM_MD: 'Elimina modulo', DELETE: 'Elimina', FORM: 'Forma', - VIEW_MY_TELLFORM: 'Visualizza la mia informazione', + VIEW_MY_OHMYFORM: 'Visualizza la mia informazione', LIVE: 'Live', PREVIEW: 'Anteprima', // Share Tab COPIED_LABEL: "Copiato", COPY: 'Copia', - COPY_AND_PASTE: 'Copia e incolla questo per aggiungere il tuo TellForm al tuo sito web', + COPY_AND_PASTE: 'Copia e incolla questo per aggiungere il tuo OhMyForm al tuo sito web', POWERED_BY: 'Offerto da', - TELLFORM_URL: 'Il tuo TellForm è permanente in questo URL', + OHMYFORM_URL: 'Il tuo OhMyForm è permanente in questo URL', // Modifica vista modulo DISABLED: 'disabilitato', @@ -186,7 +186,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid FORM_SUCCESS: 'Inserimento modulo con successo presentato!', REVIEW: 'Recensione', BACK_TO_FORM: 'Torna alla scheda', - EDIT_FORM: 'Modifica questo TellForm', + EDIT_FORM: 'Modifica questo OhMyForm', ADVANCEMENT: '{{done}} su {{total}} ha risposto', CONTINUE_FORM: "Continua a formare", REQUIRED: 'richiesta', diff --git a/public/modules/forms/admin/config/i18n/spanish.js b/public/modules/forms/admin/config/i18n/spanish.js index 085e94cf..6a958e49 100644 --- a/public/modules/forms/admin/config/i18n/spanish.js +++ b/public/modules/forms/admin/config/i18n/spanish.js @@ -5,7 +5,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid $translateProvider.translations('es', { //Configure Form Tab View ADVANCED_SETTINGS: 'Configuraciones avanzadas', - FORM_NAME: 'Tu tellform se llama', + FORM_NAME: 'Tu ohmyform se llama', FORM_STATUS: 'Estado', PUBLIC: 'Público', PRIVATE: 'Privado', @@ -19,7 +19,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid SELF_NOTIFICATIONS_TAB: 'Auto notificaciones', RESPONDANT_NOTIFICATIONS_TAB: 'Notificaciones de los demandados', GENERAL_TAB: 'Général', - + SEND_NOTIFICATION_TO: 'Enviar a', NO_EMAIL_FIELD_WARNING: 'Error: necesita un campo de correo electrónico en su formulario para enviar el correo electrónico a su encuestado', REPLY_TO: 'Responder a', @@ -62,16 +62,16 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid DELETE_FORM_MD: 'Borrar formulario', DELETE: 'Borrar', FORM: 'Formulario', - VIEW_MY_TELLFORM: 'Ver mi tellform', + VIEW_MY_OHMYFORM: 'Ver mi ohmyform', LIVE: 'Online', PREVIEW: 'Vista previa', - + // Share Tab COPIED_LABEL: 'Copiado', COPY: 'Copiar', - COPY_AND_PASTE: 'Copiar y pegar esto para agregar su TellForm a su sitio web', + COPY_AND_PASTE: 'Copiar y pegar esto para agregar su OhMyForm a su sitio web', POWERED_BY: 'Con la tecnlogía de', - TELLFORM_URL: 'Tu TellForm está en esta URL permanente', + OHMYFORM_URL: 'Tu OhMyForm está en esta URL permanente', //Edit Form View DISABLED: 'Deshabilitado', diff --git a/public/modules/forms/admin/config/i18n/swedish.js b/public/modules/forms/admin/config/i18n/swedish.js index 1c24245c..a0e79496 100644 --- a/public/modules/forms/admin/config/i18n/swedish.js +++ b/public/modules/forms/admin/config/i18n/swedish.js @@ -50,10 +50,10 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid LIVE: 'Live', PREVIEW: 'Förhandsvy', COPY: 'Kopiera', - COPY_AND_PASTE: 'Kopiera och Klistra in detta för att lägga till din TellForm till din hemsida.', + COPY_AND_PASTE: 'Kopiera och Klistra in detta för att lägga till din OhMyForm till din hemsida.', CHANGE_WIDTH_AND_HEIGHT: 'Ändra bredd- och höjdvärden för att det ska passa dig bäst', POWERED_BY: 'Genererad av', - TELLFORM_URL: "Din TellForm är permanent på denna URL", + OHMYFORM_URL: "Din OhMyForm är permanent på denna URL", // Redigera Form-vy DISABLED: 'Avaktiverat', @@ -167,7 +167,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid FORM_SUCCESS: 'Formulär framgångsrikt inskickat!', REVIEW: 'Granska', BACK_TO_FORM: 'Gå Tillbaka till Formulär', - EDIT_FORM: 'Redigera denna TellForm', + EDIT_FORM: 'Redigera denna OhMyForm', ADVANCEMENT: '{{done}} av {{total}} svarade', CONTINUE_FORM: 'Fortsätt till Formulär', REQUIRED: 'obligatorisk', diff --git a/public/modules/forms/admin/directives/share-form.client.directive.js b/public/modules/forms/admin/directives/share-form.client.directive.js index 71dcacd3..a8afd867 100644 --- a/public/modules/forms/admin/directives/share-form.client.directive.js +++ b/public/modules/forms/admin/directives/share-form.client.directive.js @@ -19,7 +19,7 @@ angular.module('forms').directive('shareFormDirective', ['$rootScope', '$transla $scope.embedCode = ""+ "
"+ $translate.instant('POWERED_BY')+ - "TellForm"+ + "OhMyForm"+ "
"; /* Tab Routing Logic */ @@ -55,4 +55,4 @@ angular.module('forms').directive('shareFormDirective', ['$rootScope', '$transla } }; } -]); \ No newline at end of file +]); diff --git a/public/modules/forms/admin/views/admin-form.client.view.html b/public/modules/forms/admin/views/admin-form.client.view.html index dd854343..be92e10b 100644 --- a/public/modules/forms/admin/views/admin-form.client.view.html +++ b/public/modules/forms/admin/views/admin-form.client.view.html @@ -46,7 +46,7 @@ - {{ 'VIEW_MY_TELLFORM' | translate }} + {{ 'VIEW_MY_OHMYFORM' | translate }} diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html index 563f147a..1d5a2be6 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html @@ -17,9 +17,9 @@
- @@ -53,7 +53,7 @@ + placeholder="noreply@ohmyform.com">
@@ -106,4 +106,4 @@ - \ No newline at end of file + diff --git a/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html b/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html index b43aecc9..0e305cc6 100644 --- a/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html +++ b/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html @@ -1,16 +1,16 @@
- - + +
-
-
\ No newline at end of file + diff --git a/public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js b/public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js index ec3d5076..de4ab108 100644 --- a/public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js +++ b/public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js @@ -19,7 +19,7 @@ var sampleVisitors = [{ socketId: '33b1f1dea0ce12fab9ed8739', - referrer: 'https://tellform.com/examples', + referrer: 'https://ohmyform.com/examples', lastActiveField: 'ed873933b0ce121f1deafab9', timeElapsed: 100000, isSubmitted: true, diff --git a/public/modules/users/config/i18n/english.js b/public/modules/users/config/i18n/english.js index 55868e1d..2aa4c590 100644 --- a/public/modules/users/config/i18n/english.js +++ b/public/modules/users/config/i18n/english.js @@ -42,7 +42,7 @@ angular.module('users').config(['$translateProvider', function ($translateProvid SAVE_PASSWORD_BTN: 'Save Password', SUCCESS_HEADER: 'Signup Successful', - SUCCESS_TEXT: 'You’ve successfully registered an account at TellForm.', + SUCCESS_TEXT: 'You’ve successfully registered an account at OhMyForm.', VERIFICATION_EMAIL_SENT: 'Verification Email has been Sent', VERIFICATION_EMAIL_SENT_TO: 'A verification email has been sent to', NOT_ACTIVATED_YET: 'But your account is not activated yet', diff --git a/public/modules/users/config/i18n/french.js b/public/modules/users/config/i18n/french.js index 3bc22b56..b3b19902 100644 --- a/public/modules/users/config/i18n/french.js +++ b/public/modules/users/config/i18n/french.js @@ -27,7 +27,7 @@ angular.module('users').config(['$translateProvider', function ($translateProvid SAVE_PASSWORD_BTN: 'Enregistrer votre nouveau mot de passe', SUCCESS_HEADER: 'Votre compte a été enregistré !', - SUCCESS_TEXT: 'Votre compte Tellform a été créé avec succès.', + SUCCESS_TEXT: 'Votre compte OhMyForm a été créé avec succès.', VERIFICATION_EMAIL_SENT: 'Un email de verification a été envoyé à', NOT_ACTIVATED_YET: 'Mais votre compte n\'est pas activé', BEFORE_YOU_CONTINUE: 'Avant de continuer, vous devez valider votre adresse mail. Merci de vérifier votre boîte mail. Si vous ne l’avez pas reçu dans les prochaines 24h, contactez-nous à ', diff --git a/public/modules/users/config/i18n/german.js b/public/modules/users/config/i18n/german.js index ec080e8c..ce572ebd 100644 --- a/public/modules/users/config/i18n/german.js +++ b/public/modules/users/config/i18n/german.js @@ -42,7 +42,7 @@ angular.module('users').config(['$translateProvider', function ($translateProvid SAVE_PASSWORD_BTN: 'Passwort speichern', SUCCESS_HEADER: 'Anmeldung erfolgreich', - SUCCESS_TEXT: 'Sie haben ein Konto erfolgreich bei TellForm registriert.', + SUCCESS_TEXT: 'Sie haben ein Konto erfolgreich bei OhMyForm registriert.', VERIFICATION_EMAIL_SENT: 'Bestätigungs-E-Mail wurde gesendet', VERIFICATION_EMAIL_SENT_TO: 'Es wurde eine Bestätigungs-E-Mail gesendet.', NOT_ACTIVATED_YET: 'Dein Account ist noch nicht aktiviert', diff --git a/public/modules/users/config/i18n/italian.js b/public/modules/users/config/i18n/italian.js index 9ad309ef..7d7e444c 100644 --- a/public/modules/users/config/i18n/italian.js +++ b/public/modules/users/config/i18n/italian.js @@ -42,7 +42,7 @@ angular.module('users').config(['$translateProvider', function ($translateProvid SAVE_PASSWORD_BTN: 'Salva password', SUCCESS_HEADER: 'Registra il successo', - SUCCESS_TEXT: 'Hai registrato un account con TellForm.', + SUCCESS_TEXT: 'Hai registrato un account con OhMyForm.', VERIFICATION_EMAIL_SENT: 'L\'email di verifica è stata inviata', VERIFICATION_EMAIL_SENT_TO: 'E\' stata inviata un\'email di verifica a ', NOT_ACTIVATED_YET: 'Ma il tuo account non è ancora attivato', diff --git a/public/modules/users/config/i18n/spanish.js b/public/modules/users/config/i18n/spanish.js index 21273914..82d96b11 100644 --- a/public/modules/users/config/i18n/spanish.js +++ b/public/modules/users/config/i18n/spanish.js @@ -42,7 +42,7 @@ angular.module('users').config(['$translateProvider', function ($translateProvid SAVE_PASSWORD_BTN: 'Grabar contraseña', SUCCESS_HEADER: 'Ingresaste exitosamente', - SUCCESS_TEXT: 'Registraste exitosamente una cuenta en TellForm.', + SUCCESS_TEXT: 'Registraste exitosamente una cuenta en OhMyForm.', VERIFICATION_EMAIL_SENT: 'El email de verificación fue enviado exitosamente', VERIFICATION_EMAIL_SENT_TO: 'Un email de verificación fue enviado a', NOT_ACTIVATED_YET: 'Tu cuenta aún no está activa', diff --git a/public/modules/users/config/i18n/swedish.js b/public/modules/users/config/i18n/swedish.js index a366048e..1832390e 100644 --- a/public/modules/users/config/i18n/swedish.js +++ b/public/modules/users/config/i18n/swedish.js @@ -42,7 +42,7 @@ angular.module('users').config(['$translateProvider', function ($translateProvid SAVE_PASSWORD_BTN: 'Spara Lösenord', SUCCESS_HEADER: 'Registrering Framgånsrik', - SUCCESS_TEXT: 'Du har framgångsrikt registrerat ett konto på TellForm.', + SUCCESS_TEXT: 'Du har framgångsrikt registrerat ett konto på OhMyForm.', VERIFICATION_EMAIL_SENT: 'Ett Verifieringsmeddelande har blivit Skickat', VERIFICATION_EMAIL_SENT_TO: 'Ett verifieringsmeddelande har blivit skickat till', NOT_ACTIVATED_YET: 'Men ditt konto är ännu inte aktiverat', diff --git a/public/modules/users/views/authentication/signup-success.client.view.html b/public/modules/users/views/authentication/signup-success.client.view.html index e77c2e05..804c8418 100755 --- a/public/modules/users/views/authentication/signup-success.client.view.html +++ b/public/modules/users/views/authentication/signup-success.client.view.html @@ -9,7 +9,7 @@

- {{ 'BEFORE_YOU_CONTINUE' | translate }} team@tellform.com

+ {{ 'BEFORE_YOU_CONTINUE' | translate }} team@ohmyform.com