207 Commits

Author SHA1 Message Date
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
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
David Baldwynn
80fdcb5d4f added support for computing analytics on backend 2019-07-11 22:49:26 +02:00
David Baldwynn
9723d577d3 fixed jshint errors 2017-11-23 19:05:44 -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
df83c6bb93 fixed create_admin script 2017-11-21 15:30:09 -08:00
David Baldwynn
c97f207699 added username validation to setup script 2017-11-21 12:33:47 -08:00
David Baldwynn
8c1964146f removed newOptionSchema property from FieldSchema 2017-11-21 11:37:48 -08:00
David Baldwynn
f6546deb59 removed globalId 2017-11-21 11:37:01 -08:00
David Baldwynn
88299a2b27 simplified form_field property deletion logic in form_submission model 2017-11-20 21:21:32 -08:00
David Baldwynn
632d2b409d removed submissions property from form model 2017-11-20 21:15:47 -08:00
David Baldwynn
29633b0b8b got all serverside tests to pass 2017-11-15 11:45:39 -08:00
David Baldwynn
ef9265576c removed complex form save logic 2017-11-15 11:23:21 -08:00
David Baldwynn
ab830fdc9e fixed form footer toggle in config general admin panel 2017-11-15 09:41:19 -08:00
David Baldwynn
49141e6dc0
Merge pull request #262 from tellform/fixResponseCountOnFormList
Fix incorrect responses count for form list view
2017-11-13 23:02:03 -08:00
David Baldwynn
f5e32e9548 got validity working for rating field 2017-11-13 21:07:27 -08:00
David Baldwynn
ed6d917e6b fixed incorrect responses count for form list view 2017-11-13 16:52:42 -08:00
David Baldwynn
060cd5980f Merge branch 'fixSlowAnalyticsBug' of github.com:tellform/tellform into fixSlowAnalyticsBug 2017-11-13 14:52:52 -08:00
David Baldwynn
28fe150149 Merge branch '2.20' into fixSlowAnalyticsBug 2017-11-13 14:51:53 -08:00
David Baldwynn
f786f24f7c
Merge branch '2.20' into fixSlowAnalyticsBug 2017-11-11 21:50:43 -08:00
David Baldwynn
62953a6ffc changed dropdown add option to list of strings that are seperated by lines 2017-11-11 21:44:53 -08:00
David Baldwynn
4f2682554d merged with master 2017-11-11 20:05:06 -08:00
David Baldwynn
04e71be14a
Merge branch '2.20' into fixSlowAnalyticsBug 2017-11-06 14:47:01 -08:00
David Baldwynn
68235423c8
Merge branch 'master' into fixSlowAnalyticsBug 2017-11-06 14:26:04 -08:00
David Baldwynn
b29d5bad36 fixed admin setup script 2017-11-06 13:44:29 -08:00
David Baldwynn
a40ecad008 added aggregating for form analytics 2017-11-05 19:40:28 -08:00
David Baldwynn
5c58db879c got server tests to pass 2017-11-02 11:14:25 -07:00
David Baldwynn
33368f016c got basic email templating to work 2017-11-01 16:44:05 -07:00
David Baldwynn
9faa514ce9 added backend logic for email notifications and got it to pass server tests 2017-11-01 15:13:31 -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
3652b41fc8 Merge branch 'master' into emailNotifications 2017-10-30 11:22:07 -07:00
David Baldwynn
774d256507 removed unused code from user.server.model.js 2017-10-29 20:14:40 -07:00
David Baldwynn
e1db98ec95 added tests for api routes 2017-10-29 18:17:20 -07:00
David Baldwynn
3dbfe2f88d added helper function to remove sensitive data from forms/users 2017-10-29 14:15:13 -07:00
David Baldwynn
76d6d54cd5 got edit-submissions-form directive tests to pass 2017-10-29 11:54:40 -07:00
David Baldwynn
a829e08d73 fixed errors for password reset, user signup and user signin 2017-10-27 23:54:55 -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
4f7d646edd got email pug templates to work 2017-10-27 19:30:05 -07:00
David Baldwynn
8de93d4413 Merge branch 'master' into emailNotifications 2017-10-26 08:37:03 -07:00
David Baldwynn
5746920c34 fixed logicJump bug 2017-10-18 17:37:48 -07:00
David Baldwynn
154fddff75 fixed editField bug 2017-10-18 17:18:18 -07:00
David Baldwynn
d1039c7fc2 got all tests to pass 2017-10-10 22:07:13 -07:00
David Baldwynn
3ebb4eebff fixed bug in form controller 2017-10-07 00:27:03 -07:00