271 Commits

Author SHA1 Message Date
wodka
d96308ddcc fix error if subdomain cannot be located and disable subdomain per default 2019-07-18 00:04:00 +02:00
wodka
dab7dd6ae6 upgrade all libraries
fix form editing
2019-07-15 21:04:39 +02:00
wodka
f7b1dd05e9 fix analytics
upgrade missing dependencies
upgrade libraries
change service naming
2019-07-15 10:15:06 +02:00
wodka
886c5dea65 remove tellform from locales 2019-07-15 00:48:39 +02:00
wodka
1caf34c230 Merge remote-tracking branch 'origin/fixUXBugs' into features/missing
# Conflicts:
#	.gitignore
#	app/views/form.server.view.pug
#	package-lock.json
#	package.json
#	public/form_modules/forms/base/config/i18n/french.js
#	public/modules/core/config/core.client.routes.js
#	public/modules/core/config/i18n/french.js
#	public/modules/core/controllers/header.client.controller.js
#	public/modules/forms/admin/css/admin-form.css
#	public/modules/users/controllers/authentication.client.controller.js
#	public/modules/users/services/auth.client.service.js
#	scripts/create_admin.js
#	server.js
2019-07-11 23:32:25 +02:00
wodka
2276ca100f Merge branch 'master' into 2.20
# Conflicts:
#	config/env/secure.js
#	package-lock.json
#	package.json
#	public/form_modules/forms/base/css/form.css
#	public/modules/forms/admin/config/i18n/french.js
2019-07-11 23:18:55 +02:00
wodka
77cabf15e5 attach socket.io to current server if ports are equal 2019-07-01 11:49:27 +02:00
Mattias
6453716c99 fix translations 2019-01-31 10:15:21 +01:00
Arielle Baldwynn
188705b640
Merge pull request #301 from pshah123/master
Fix Issues from PR #299
2018-08-31 13:27:24 -07:00
David Baldwynn
d9ef557edd u 2018-08-31 15:26:13 -04:00
David Baldwynn
52a1ab2bff got form running and fixed swedish translations 2018-08-31 15:25:43 -04:00
Priansh Shah
eaab2ff339 Revert "disable signups"
This reverts commit ca875ed01d57c69c0001719bda5375f94db4c46e.
2018-04-24 23:03:15 +03:00
Priansh Shah
f99049d155 Revert "fix jsep import, add fillin for HTTPS server, remove debug flag"
This reverts commit 78082f7152204158a1b7548bdb0dfb1ba49c097d.
2018-04-24 23:01:58 +03:00
Priansh Shah
ca875ed01d disable signups 2018-04-09 20:30:44 +00:00
Priansh Shah
78082f7152 fix jsep import, add fillin for HTTPS server, remove debug flag 2018-04-09 20:22:41 +00:00
Mattias Axell
a0092baf31
Update typo in Swedish translation 2018-02-28 15:55:06 +01:00
Mattias Axell
b6f5c5f897
First translation to Swedish
Proposing first translation of TellForm into Swedish.
2018-02-28 15:52:24 +01:00
Maxime
1ace06555c Fix french translations in modules, form_modules and locales. 2018-02-14 17:28:19 +01:00
Andrew Phillips
7357756625 Fix MAILER_STMP_SECURE
This should resolve https://github.com/tellform/tellform/issues/281,
matching the description in the Configuration section of `README.md`.
This also corrects the case of `TRUE` in an example.
2018-01-25 13:31:04 -04:00
David Baldwynn
784ae9011e fixed security flaw with removeSensitiveModelData 2017-11-21 17:26:52 -08:00
David Baldwynn
bd4af8aa7c
Merge branch 'fixUXBugs' into updateSetupScript 2017-11-21 16:01:33 -08:00
David Baldwynn
bc2f49b090 Merge branch 'fixUXBugs' into updateSetupScript 2017-11-21 15:59:18 -08:00
David Baldwynn
c561130f75 Merge branch 'fixUXBugs' into addSeleniumTests 2017-11-21 15:56:49 -08:00
David Baldwynn
df83c6bb93 fixed create_admin script 2017-11-21 15:30:09 -08:00
David Baldwynn
c9057b4a8a Merge branch '2.20' into addSeleniumTests 2017-11-21 13:45:28 -08:00
David Baldwynn
b2e027e0bf Merge branch '2.20' into updateSetupScript 2017-11-21 13:41:42 -08:00
David Baldwynn
0a4b83186a Merge branch 'fixUXBugs' of github.com:tellform/tellform into fixUXBugs 2017-11-21 13:40:47 -08:00
David Baldwynn
20cc79f218 Merge branch '2.20' into fixUXBugs 2017-11-21 13:40:27 -08:00
David Baldwynn
9ff247fde7 Merge branch 'master' into 2.20 2017-11-21 13:39:27 -08:00
David Baldwynn
39125972c3 removed user and pass from mongoose options 2017-11-21 13:12:34 -08:00
David Baldwynn
e27f27f7f0 added email validation to setup script 2017-11-21 12:31:13 -08:00
David Baldwynn
fb26fbd4f9 disabled subdomains for server-side tests 2017-11-21 10:54:23 -08:00
David Baldwynn
d8268e4a9b Added test for preserving visitorData on update and removed debugger statements 2017-11-21 10:50:58 -08:00
David Baldwynn
68858ca1a3 fixed fieldType constant 2017-11-21 10:42:32 -08:00
David Baldwynn
7107bab614 added support for custom smtp server in setup script 2017-11-21 09:58:44 -08:00
David Baldwynn
fca5524751 fixed admin script 2017-11-21 07:39:00 -08:00
David Baldwynn
2c9e931257 removed unnessecary console.log() statement from passport helpers 2017-11-20 21:07:04 -08:00
David Baldwynn
eb658af30d got jshint to pass 2017-11-20 21:04:07 -08:00
David Baldwynn
6a992d74ad Added tests for password, settings and verify controllers 2017-11-19 15:11:43 -08:00
David Baldwynn
0e7eb457cc got clientside tests to pass 2017-11-19 11:12:46 -08:00
David Baldwynn
f5e32e9548 got validity working for rating field 2017-11-13 21:07:27 -08:00
David Baldwynn
4f2682554d merged with master 2017-11-11 20:05:06 -08:00
David Baldwynn
084a8005fd fixed form vendor files 2017-11-11 19:56:41 -08:00
David Baldwynn
24cffeee37 fixed problem with production assets 2017-11-08 11:31:46 -08:00
David Baldwynn
5c58db879c got server tests to pass 2017-11-02 11:14:25 -07:00
David Baldwynn
ddd4c2b22c Merge branch '2.20' into emailNotifications 2017-11-01 12:46:15 -07:00
David Baldwynn
bbb3137372 got all tests to pass 2017-11-01 12:17:35 -07:00
David Baldwynn
8ea1f63c96 fixed travis settings 2017-10-29 21:32:02 -07:00
David Baldwynn
d0d273a718 removed secure configuration 2017-10-29 20:23:36 -07:00
David Baldwynn
9a0a301c3d got rid of unnessecary user middleware 2017-10-29 20:11:58 -07:00