475 Commits

Author SHA1 Message Date
Michael Schramm
d01fa8b447 fix composer error message for mailhog, add more error handling 2020-04-12 18:07:20 +02:00
wodka
2e5184c0db bugfix call that is made with null 2019-10-10 15:20:14 +02:00
wodka
9e34fa9c50 switch from bcrypt to bcryptjs in legacy app 2019-10-10 09:44:42 +02:00
wodka
32cb5ecf0c replace old authentication with bcrypt 2019-08-31 21:07:32 +02:00
wodka
5dc388c629 add tracker 2019-07-24 16:41:29 +02:00
wodka
cc12ed924c get rid of tellform names 2019-07-18 12:35:07 +02:00
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
990898d88e remove logs and fixes for dockerfile 2019-07-15 16:30:35 +02:00
wodka
f7b1dd05e9 fix analytics
upgrade missing dependencies
upgrade libraries
change service naming
2019-07-15 10:15:06 +02:00
wodka
4997514f01 give visitor information only authenticated 2019-07-15 00:26:37 +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
423154790a Merge branch '2.20' into features/missing
# Conflicts:
#	app/models/form.server.model.js
#	package-lock.json
#	package.json
#	public/modules/forms/admin/views/admin-form.client.view.html
#	public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
2019-07-11 23:22:49 +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
David Baldwynn
80fdcb5d4f added support for computing analytics on backend 2019-07-11 22:49:26 +02:00
Arielle Baldwynn
17b428b304 Merge branch 'master' of github.com:tellform/tellform into stable2.1 2019-04-29 14:15:52 -07:00
LoneRifle
5bc0d623a5
deleteSubmissions - remove spurious condition
`FormSubmission.remove` should not use `admin` as a condition:
 - the field is not present in the schema or in any created submissions
 - the user is unlikely to be the admin of a submission 

Remove this field to facilitate deletes

Fixes #315
2018-10-20 16:33:12 +08: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
386b6be968 got stable release to work 2018-08-31 15:56:49 -04: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
01ac456f62 fix merge 2018-04-24 23:15:52 +03:00
Priansh Shah
9715088e86 Revert "fix styling on form"
This reverts commit 9a9c1ae02ec7176c8a38f0556f2f92732d43b077.
2018-04-24 23:05:46 +03:00
Priansh Shah
0f2cf42ceb revert changelog 2018-04-24 23:05:40 +03:00
Priansh Shah
985c3c1aae revert custom Earlybird changes to form 2018-04-24 23:04:16 +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
9a9c1ae02e fix styling on form 2018-04-10 00:35:12 +00:00
Priansh Shah
2835280ff3 fix mobile responsiveness 2018-04-09 21:41:37 +00:00
Priansh Shah
45f8fe7a02 fix form styling 2018-04-09 21:34:26 +00:00
Priansh Shah
83ca05e64b
Merge branch 'master' into server 2018-04-09 16:24:29 -04:00
Priansh Shah
78082f7152 fix jsep import, add fillin for HTTPS server, remove debug flag 2018-04-09 20:22:41 +00:00
Priansh Shah
e2ff321ec8
add JSEP cdn 2018-04-09 05:47:04 -04:00
David Baldwynn
9723d577d3 fixed jshint errors 2017-11-23 19:05:44 -08:00
David Baldwynn
222ce4d641 removed duplicate property in constants.js 2017-11-23 19:02:07 -08: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
1163debc33 made all server models exportable 2017-11-21 15:51:24 -08:00
David Baldwynn
4d4bb65298 disabled create_admin script in test mode 2017-11-21 15:49:58 -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
c97f207699 added username validation to setup script 2017-11-21 12:33:47 -08:00
David Baldwynn
e27f27f7f0 added email validation to setup script 2017-11-21 12:31:13 -08:00
David Baldwynn
9d2a548dca Added new form_route tests for update route 2017-11-21 11:46:57 -08:00
David Baldwynn
8c1964146f removed newOptionSchema property from FieldSchema 2017-11-21 11:37:48 -08:00