beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into stage

Browse source
This commit is contained in:
David Baldwynn 2016-06-20 13:26:44 -07:00
parent 5ad79e621f f35869c5f0
commit cf564308a8
9 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -13,14 +13,12 @@ Current stable release: v1.3.0
TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that can create stunning forms from PDFs or from scratch TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that can create stunning forms from PDFs or from scratch
##Demo Forms ##Demo Forms
[Job Application Example](https://stage.tellform.com/#!/forms/571a76b856d64f9e4ca73ca1) [See examples here](https://tellform.com/examples)
[Contact Form Example](https://stage.tellform.com/#!/forms/57196d592601ed12074eecc0)
[Patient Registration Example](https://stage.tellform.com/#!/forms/573f8329d18419854559c29c)
##Screenshots ##Screenshots
![screenshot](design/screenshots/tellform_screenshot1.png) ![screenshot](design/screenshots/tellform_screenshot1.png)
![screenshot](design/screenshots/analytics.png)
![screenshot](design/screenshots/tellform_rating.png)
## Features ## Features

3
app/controllers/users/users.authentication.server.controller.js
View file

@ -124,7 +124,8 @@ exports.signup = function(req, res) {
// new user created // new user created
if (newTempUser) { if (newTempUser) {
nev.registerTempUser(newTempUser, function (err) { var URL = newTempUser[nev.options.URLFieldName];
nev.sendVerificationEmail(user.email, URL, function (err, info) {
if (err) { if (err) {
console.log('Error: '); console.log('Error: ');
console.log(err); console.log(err);

BIN
design/screenshots/analytics.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 156 KiB

BIN
design/screenshots/tellform_rating.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 179 KiB

0
docs/Extreme Programming:Agile/Sprints/tasks_sep13.md → docs/Extreme Programming_Agile/Sprints/tasks_sep13.md
View file

0
docs/Extreme Programming:Agile/User Stories/kiosk_userstories.md → docs/Extreme Programming_Agile/User Stories/kiosk_userstories.md
View file

0
docs/Extreme Programming:Agile/requirements.md → docs/Extreme Programming_Agile/requirements.md
View file

2
package.json
View file

@ -34,7 +34,7 @@
"consolidate": "~0.13.1", "consolidate": "~0.13.1",
"cookie-parser": "~1.4.0", "cookie-parser": "~1.4.0",
"dotenv": "^2.0.0", "dotenv": "^2.0.0",
"email-verification": "whitef0x0/node-email-verification", "email-verification": "email-verification",
"envfile": "^2.0.1", "envfile": "^2.0.1",
"express": "~4.13.3", "express": "~4.13.3",
"express-device": "~0.4.2", "express-device": "~0.4.2",

1
public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
View file

@ -214,6 +214,7 @@
Field Analytics Field Analytics
</div> </div>
<div class="row col-xs-12 field-title-row"> <div class="row col-xs-12 field-title-row">
<div class="col-xs-3"> <div class="col-xs-3">
<strong>{{ 'FIELD_TITLE' | translate }}</strong> <strong>{{ 'FIELD_TITLE' | translate }}</strong>
</div> </div>