98 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
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
b3bf791d3c improve docker images, fix jsep and initial build 2019-07-01 10:03:29 +02:00
David Baldwynn
6838fa94e3 merged with 2.20 2017-11-23 18:53:16 -08:00
David Baldwynn
d8c5b00581 bumped version in bower.json and package.json 2017-11-23 18:52:10 -08:00
David Baldwynn
a8ae7e2105 fixed ng-quill dependency 2017-11-19 18:36:32 -08:00
David Baldwynn
0e7ee4261a added jspdf to bower deps 2017-11-19 21:20:46 -05:00
David Baldwynn
0e7eb457cc got clientside tests to pass 2017-11-19 11:12:46 -08:00
David Baldwynn
d23342ac57 removed textAngular 2017-11-15 04:14:39 -08: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
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
5a6b957495 added variable support in editor 2017-10-31 16:05:50 -07:00
Alex Gleason
e110820fcb whitef0x0/tellform --> tellform/tellform 2017-10-17 13:12:27 -04:00
David Baldwynn
53828594ff fixed star field has preset value before being set bug 2017-08-02 17:13:10 -04:00
David Baldwynn
4e09d7c28c fixed date field bug 2017-08-02 16:23:54 -04:00
David Baldwynn
f13d0cf077 Fixed bug that didn't allow user to rearrange form fields 2017-08-02 16:05:17 -04:00
David Baldwynn
7320305ebe Added ngCacheBuster to bower.json 2017-07-20 17:20:45 -07:00
David Baldwynn
0871c70788
got angular unit tests to pass 2017-04-23 13:12:07 -07:00
David Baldwynn
cd7624a867 Removed duplicated fields from bower.json 2017-04-20 21:40:10 -07:00
David Baldwynn
8d9ecf2cee Update bower.json 2017-04-20 20:56:17 -07:00
David Baldwynn
d97e746574 Update bower.json 2017-04-20 20:55:10 -07:00
David Baldwynn
b08a6f69a2 Moved to fixed dependencies in bower.json 2017-04-19 20:58:28 -07:00
David Baldwynn
f1c43f152a Fixed bower resolutions 2017-03-30 10:11:18 -07:00
David Baldwynn
709303d43c
got all frontend tests to pass 2017-03-27 13:32:33 -07:00
David Baldwynn
d02573cc0a
readded modification for multichoice and rating inputs 2017-03-12 21:19:41 -07:00
David Baldwynn
55b6a37ad6
got logic jump to work in new edit modal 2017-03-10 10:25:35 -08:00
David Baldwynn
ff52274882
Merge branch 'master' of https://github.com/whitef0x0/tellform 2017-03-06 16:48:46 -08:00
David Baldwynn
0e2fe9076a fixed socket.io cdn 2017-03-01 15:11:20 -05:00
David Baldwynn
f464deb959 fixed analytics service 2016-11-09 11:06:01 -08:00
David Baldwynn
5d5526fba0 fixed overflow of analyze table 2016-11-02 14:32:12 -07:00
David Baldwynn
2455f5dd9a Merge branch 'api' into stage 2016-10-07 08:38:45 -07:00
David Baldwynn
1d65da9792 Merge branch 'logic_jump' into stage 2016-10-07 08:30:09 -07:00
David Baldwynn
0a74598894 added diff to update 2016-08-26 15:34:29 -07:00
David Baldwynn
13c68f7411 got logicjump to work and added more comparison fields 2016-08-23 15:58:27 -07:00
David Baldwynn
02e25ef739 added logicjump to forms 2016-08-23 14:45:59 -07:00
David Baldwynn
de5ac881c9 fixed signup error 2016-08-17 12:04:42 -07:00
David Baldwynn
d6c3aebe65 changed form updated method to use diffs 2016-07-05 18:52:18 -07:00
David Baldwynn
c5607c7c61 fixed mongodb env 2016-06-18 17:01:02 -04:00
David Baldwynn
26b2fafc3d created basic analytics dashboard 2016-06-17 14:33:33 -07:00
Sam
0658c2de60 make it work 2016-06-08 19:59:54 +02:00
David Baldwynn
5635e352c7 fixed dropdown option value bug 2016-06-04 20:13:42 -07:00
David Baldwynn
23c53eb365 updated ui-select fork 2016-06-04 03:53:51 -07:00
David Baldwynn
6131f7de94 added multiple choice default options 2016-05-31 18:06:45 -07:00
David Baldwynn
f8f934f7b0 fixed exportTo for form submissions 2016-05-16 17:47:34 -07:00
David Baldwynn
ac73db734b added submit validation message 2016-05-16 17:30:20 -07:00