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
9ff247fde7
Merge branch 'master' into 2.20
2017-11-21 13:39:27 -08:00
FELIX CHERUIYOT
13c3263667
Fix missing vendor file reference
...
vendor.min.js not found
2017-11-17 07:43:21 +03: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
9d51608a62
added email notifications to json form data
2017-11-13 22:09:15 -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
ed6d917e6b
fixed incorrect responses count for form list view
2017-11-13 16:52:42 -08:00
David Baldwynn
09d430a7e1
added cosmetic changes to analytics panel
2017-11-13 15:21:29 -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
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
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
a77a59c3ba
Merge branch '2.20' into emailNotifications
2017-11-05 16:26:09 -08:00
David Baldwynn
43ce60b985
Merge branch 'master' into 2.20
2017-11-05 16:24:19 -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
15d023c133
fixed editable variables in textAngular editor
2017-11-02 14:29:02 -07:00
David Baldwynn
5c58db879c
got server tests to pass
2017-11-02 11:14:25 -07:00
David Baldwynn
6927f9d5ac
fixed signin redirect bug
2017-11-02 10:37:29 -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
