128 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
f7b1dd05e9 fix analytics
upgrade missing dependencies
upgrade libraries
change service naming
2019-07-15 10:15:06 +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
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
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
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
b6b93d15f0 fixed delete button state change bug 2017-11-19 21:15:26 -05:00
FELIX CHERUIYOT
13c3263667
Fix missing vendor file reference
vendor.min.js not found
2017-11-17 07:43:21 +03:00
David Baldwynn
98d874783f got email notifications to work with quilljs 2017-11-15 02:46:54 -08:00
David Baldwynn
f3638a1d42 fixed small ux bugs 2017-11-15 00:29:45 -08:00
David Baldwynn
758eb5a786 got textAngular to semi-work with template variables 2017-11-14 23:26:47 -08:00
David Baldwynn
67a3013945 readded page loader gif for form view 2017-11-13 21:26:30 -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
d132133d67 Merge branch 'master' of github.com:tellform/tellform 2017-11-06 17:55:46 -05:00
David Baldwynn
1539846121 fixed google analytics 2017-11-06 17:55:43 -05:00
David Baldwynn
a77a59c3ba Merge branch '2.20' into emailNotifications 2017-11-05 16:26:09 -08:00
David Baldwynn
f8ac5454d7 Merge branch 'master' of github.com:tellform/tellform 2017-11-05 16:14:15 -08:00
David Baldwynn
be6fc12949 fixed ngAnnotate grunt task 2017-11-05 16:05:58 -08:00
David Baldwynn
0f3b59a1ce Merge branch 'master' of github.com:tellform/tellform 2017-11-05 15:51:47 -08:00
David Baldwynn
492783ec49 built correct dist files 2017-11-05 15:50:55 -08:00
David Baldwynn
5c58db879c got server tests to pass 2017-11-02 11:14:25 -07:00
David Baldwynn
b2f2599fa5 fix css bug for dropdown field in admin view 2017-11-02 09:18:41 -07:00
David Baldwynn
692e4e43f5 updated styling of config panel 2017-11-01 21:15:27 -07:00
David Baldwynn
5120a2f287 fixed dropdowns for configure admin panel 2017-11-01 19:13:53 -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
b5b8df90af got subject field to support variables 2017-11-01 11:06:08 -07:00
David Baldwynn
5a6b957495 added variable support in editor 2017-10-31 16:05:50 -07:00
David Baldwynn
12e1fd0947 got static url for admin tabs to work 2017-10-31 12:28:01 -07:00
David Baldwynn
759a4efdd1 got all tests to pass 2017-10-29 12:44:12 -07:00
David Baldwynn
34b2cba461 added client side validation for email, username and password inputs 2017-10-27 23:23:50 -07:00
David Baldwynn
c45d248c3c internationalized transactional emails 2017-10-27 20:46:00 -07:00
David Baldwynn
4f7d646edd got email pug templates to work 2017-10-27 19:30:05 -07:00
David Baldwynn
b0f03d1f0a got i18n transaltions for all serverside views 2017-10-27 17:23:24 -07:00
David Baldwynn
25ce55b4c7 moved to pug from swig and fixed public form when subdomains are disabled 2017-10-27 16:00:04 -07:00