Merge branch 'master' of github.com:tellform/tellform into stable2.1
This commit is contained in:
commit
17b428b304
3
.bowerrc
3
.bowerrc
@ -1,4 +1,5 @@
|
||||
{
|
||||
"directory": "public/lib",
|
||||
"analytics": false
|
||||
"analytics": false,
|
||||
"registry": "https://registry.bower.io"
|
||||
}
|
||||
|
@ -10,56 +10,7 @@ TellForm Installation Instructions
|
||||
|
||||
## Local deployment with Docker
|
||||
|
||||
### Prerequisites
|
||||
|
||||
Make you sure have the following packages and versions on your machine:
|
||||
```
|
||||
"node": ">=6.11.2"
|
||||
"npm": ">=3.3.6"
|
||||
"bower": ">=1.8.0"
|
||||
"grunt-cli": ">=1.2.0"
|
||||
"grunt": ">=0.4.5"
|
||||
"docker": ">=17.06.0-ce"
|
||||
"docker-compose": ">=1.14.0"
|
||||
```
|
||||
|
||||
### Install dependencies
|
||||
|
||||
```
|
||||
$ npm install
|
||||
```
|
||||
|
||||
### Prepare .env file:
|
||||
Create `.env` file at project root folder. Fill in `MAILER_SERVICE_PROVIDER`, `MAILER_EMAIL_ID`, `MAILER_PASSWORD` and `MAILER_FROM`.
|
||||
```
|
||||
APP_NAME=TellForm
|
||||
BASE_URL=localhost:3000
|
||||
PORT=3000
|
||||
DB_PORT_27017_TCP_ADDR=tellform-mongo
|
||||
REDIS_DB_PORT_6379_TCP_ADDR=tellform-redis
|
||||
MAILER_SERVICE_PROVIDER=<TO-FILL-IN>
|
||||
MAILER_EMAIL_ID=<TO-FILL-IN>
|
||||
MAILER_PASSWORD=<TO-FILL-IN>
|
||||
MAILER_FROM=<TO-FILL-IN>
|
||||
SIGNUP_DISABLED=false
|
||||
SUBDOMAINS_DISABLED=true
|
||||
DISABLE_CLUSTER_MODE=true
|
||||
```
|
||||
|
||||
### Build docker image
|
||||
|
||||
```
|
||||
$ docker-compose build
|
||||
```
|
||||
|
||||
### Run docker containers with docker-compose
|
||||
|
||||
Create and start mongo & redis docker container:
|
||||
```
|
||||
$ docker-compose up
|
||||
```
|
||||
|
||||
Your application should run on port 3000 or the port you specified in your .env file, so in your browser just go to [http://localhost:3000](http://localhost:3000)
|
||||
Refer to [docker_files](https://github.com/tellform/docker_files).
|
||||
|
||||
## AWS AMI Deployment
|
||||
|
||||
|
15
README.md
15
README.md
@ -1,6 +1,7 @@
|
||||
TellForm 2.1.0
|
||||
========
|
||||
|
||||
[![Code Shelter](https://www.codeshelter.co/static/badges/badge-flat.svg)](https://www.codeshelter.co/)
|
||||
[![Build Status](https://travis-ci.org/tellform/tellform.svg?branch=master)](https://travis-ci.org/tellform/tellform)
|
||||
![Project Status](https://img.shields.io/badge/status-2.1.0-green.svg)
|
||||
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/3491e86eb7194308b8fc80711d736ede)](https://www.codacy.com/app/david-baldwin/tellform?utm_source=github.com&utm_medium=referral&utm_content=tellform/tellform&utm_campaign=Badge_Grade)
|
||||
@ -204,24 +205,24 @@ TellForm's configuration is done with environment variables. To set an option fo
|
||||
Does your company use TellForm? Help keep the project bug-free and feature rich by [sponsoring the project](https://opencollective.com/tellform#sponsor).
|
||||
|
||||
<a href="https://m.do.co/c/a86fd8843e09" style="padding: 30px 0">
|
||||
<img src="/docs/readme_logos/do_logo.png" height="30px">
|
||||
<img src="/docs/readme_logos/digitalOcean.png" height="30px">
|
||||
</a>
|
||||
<a href="https://getsentry.com/" style="padding: 30px 0">
|
||||
<img src="/docs/readme_logos/sentry_logo.png" height="30px">
|
||||
<img src="/docs/readme_logos/sentryIO.png" height="30px">
|
||||
</a>
|
||||
<a href="https://statuspage.io/" style="padding: 30px 0">
|
||||
<img src="/docs/readme_logos/statuspage_logo.png" height="30px">
|
||||
<img src="/docs/readme_logos/statusPageIO.png" height="30px">
|
||||
</a>
|
||||
<br><br>
|
||||
<a href="https://www.stickermule.com/unlock?ref_id=0939360701" style="padding: 30px 0">
|
||||
<img src="/docs/readme_logos/stickermule_logo.png" height="30px">
|
||||
<img src="/docs/readme_logos/stickerMule.png" height="30px">
|
||||
</a>
|
||||
<a href="https://sparkpost.com/" style="padding: 30px 0">
|
||||
<img src="/docs/readme_logos/sparkpost_logo.png" height="30px">
|
||||
<img src="/docs/readme_logos/sparkPost.png" height="30px">
|
||||
</a>
|
||||
|
||||
<a href="https://therooststand.com/" style="padding: 30px 0">
|
||||
<img src="/docs/readme_logos/roost_logo.png" height="30px">
|
||||
<img src="/docs/readme_logos/theRoostStand.png" height="30px">
|
||||
</a>
|
||||
|
||||
## Backers
|
||||
@ -245,8 +246,6 @@ Love our work and community? [Become a backer](https://opencollective.com/tellfo
|
||||
<!-- ALL-CONTRIBUTORS-LIST:END -->
|
||||
## Mentions on the Web
|
||||
|
||||
[Mister Ad](http://start.mister-ad.biz/newsticker/open-source-alternative-zu-typeform-tellform-in-der-kurzvorstellung/)
|
||||
|
||||
[t3n.de](http://t3n.de/news/open-source-alternative-typeform-tellform-707295/)
|
||||
|
||||
[BootCSS Expo](http://expo.bootcss.com/)
|
||||
|
@ -19,7 +19,7 @@ exports.deleteSubmissions = function(req, res) {
|
||||
var submission_id_list = req.body.deleted_submissions,
|
||||
form = req.form;
|
||||
|
||||
FormSubmission.remove({ form: req.form, admin: req.user, _id: {$in: submission_id_list} }, function(err){
|
||||
FormSubmission.remove({ form: req.form, _id: {$in: submission_id_list} }, function(err){
|
||||
|
||||
if(err){
|
||||
res.status(400).send({
|
||||
|
@ -59,6 +59,9 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
|
||||
script(type='text/javascript').
|
||||
socketUrl = "!{socketUrl}"
|
||||
|
||||
//JSEP
|
||||
script(src='https://cdn.jsdelivr.net/npm/jsep@0.3.4/build/jsep.min.js', type='text/javascript')
|
||||
|
||||
script(src='/static/lib/jquery/dist/jquery.min.js', type='text/javascript')
|
||||
link(rel='stylesheet', href='/static/lib/font-awesome/css/font-awesome.min.css')
|
||||
link(rel='stylesheet', href='/static/lib/bootstrap/dist/css/bootstrap.min.css')
|
||||
|
@ -1,22 +1,22 @@
|
||||
{
|
||||
"500_HEADER": "500 - Internal Server Error",
|
||||
"500_HEADER": "500 - Internt Serverfel",
|
||||
"404_HEADER": "404 - Sidan hittades inte",
|
||||
"404_BODY": "%s är inte en giltig väg",
|
||||
"500_BODY": "Ett oväntad fel verkar ha inträffat. Varför inte pröva med att uppdatera sidan? Eller så kan du kontakta oss om problemet återuppstår.",
|
||||
"404_BODY": "%s är inte en giltig sökväg",
|
||||
"500_BODY": "Ett oväntat fel verkar ha inträffat. Kan du prova med att uppdatera sidan? Eller kan du kontakta oss om problemet återuppstår igen?",
|
||||
"EMAIL_GREETING": "Hej där!",
|
||||
"VERIFICATION_EMAIL_PARAGRAPH_1": "Välkommen till TellForm! Här är en speciell länk för att aktivera ditt nya konto:",
|
||||
"VERIFICATION_EMAIL_PARAGRAPH_1": "Välkommen till TellForm! Här är en speciell länk till dig för att aktivera ditt nya konto:",
|
||||
"VERIFICATION_EMAIL_LINK_TEXT": "Aktivera mitt konto",
|
||||
"VERIFICATION_EMAIL_PARAGRAPH_2": "Tack så mycket för att du använder våra tjänster! Om du har några frågor eller förslag är du varmt välkommen att e-posta oss här på",
|
||||
"VERIFICATION_EMAIL_SUBJECT": "Aktivera ditt nya TellForm-konto!",
|
||||
"VERIFICATION_EMAIL_TEXT": "Vänligen verifiera ditt konto genom att klicka på den följande länken, eller genom att kopiera och klistra in den i din webbläsare: ${URL}",
|
||||
"EMAIL_SIGNATURE": "- TellForm-gruppen",
|
||||
"WELCOME_EMAIL_PARAGRAPH_1": "Vi skulle vilja välkomna dig som vår nyaste medlem!",
|
||||
"WELCOME_EMAIL_PARAGRAPH_2": "Vi hoppas att du gillar använda TellForm! Om du stöter på några problem är du varmt välkommen att e-posta oss här på",
|
||||
"WELCOME_EMAIL_PARAGRAPH_2": "Vi hoppas att du gillar att använda TellForm! Om du stöter på några problem är du varmt välkommen att e-posta oss här på",
|
||||
"WELCOME_EMAIL_SUBJECT": "Välkommen till %s!",
|
||||
"WELCOME_EMAIL_TEXT": "Ditt konto har framgångsrikt blivit verifierat.",
|
||||
"RESET_PASSWORD_CONFIRMATION_EMAIL_PARAGRAPH_1": "Detta är ett artigt meddelande för att bekräfta att ditt lösenord just har ändrats.",
|
||||
"RESET_PASSWORD_REQUEST_EMAIL_PARAGRAPH_1": "Här är en speciell länk som kommer tillåta dig att återställa ditt lösenord. Vänligen notera att det kommer utgå om en timma för din säkerhet:",
|
||||
"RESET_PASSWORD_REQUEST_EMAIL_LINK_TEXT": "Återställ Ditt Lösenord",
|
||||
"RESET_PASSWORD_REQUEST_EMAIL_PARAGRAPH_2": "Om du inte begärde detta, vänligen ignorera detta meddelande och ditt lösenord kommer förbli oförändrat.",
|
||||
"RESET_PASSWORD_REQUEST_EMAIL_PARAGRAPH_2": "Om du inte begärde detta, vänligen ignorera detta meddelande och ditt lösenord kommer att förbli oförändrat.",
|
||||
"RESET_PASSWORD_CONFIRMATION_EMAIL_BODY_1": "RESET_PASSWORD_CONFIRMATION_EMAIL_BODY_1"
|
||||
}
|
||||
|
BIN
docs/readme_logos/digitalOcean.png
Normal file
BIN
docs/readme_logos/digitalOcean.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.5 KiB |
BIN
docs/readme_logos/sentryIO.png
Normal file
BIN
docs/readme_logos/sentryIO.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.6 KiB |
BIN
docs/readme_logos/sparkPost.png
Normal file
BIN
docs/readme_logos/sparkPost.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.2 KiB |
BIN
docs/readme_logos/statusPageIO.png
Normal file
BIN
docs/readme_logos/statusPageIO.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.4 KiB |
BIN
docs/readme_logos/stickerMule.png
Normal file
BIN
docs/readme_logos/stickerMule.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.1 KiB |
BIN
docs/readme_logos/theRoostStand.png
Normal file
BIN
docs/readme_logos/theRoostStand.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 105 KiB |
Loading…
Reference in New Issue
Block a user