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
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
David Baldwynn
386b6be968
got stable release to work
2018-08-31 15:56:49 -04: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
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
04e71be14a
Merge branch '2.20' into fixSlowAnalyticsBug
2017-11-06 14:47:01 -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
6927f9d5ac
fixed signin redirect bug
2017-11-02 10:37:29 -07:00
David Baldwynn
522dd85f89
got respondent-notifications to work
2017-11-01 17:13:55 -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
983d2ce20b
fixed bug with detecting whether form has emails for config panel
2017-11-01 11:25:24 -07:00
David Baldwynn
5a6b957495
added variable support in editor
2017-10-31 16:05:50 -07:00
David Baldwynn
5451475636
added translations for email notification panel
2017-10-30 11:41:34 -07:00
David Baldwynn
3652b41fc8
Merge branch 'master' into emailNotifications
2017-10-30 11:22:07 -07:00
David Baldwynn
8ea1f63c96
fixed travis settings
2017-10-29 21:32:02 -07:00
David Baldwynn
9a0a301c3d
got rid of unnessecary user middleware
2017-10-29 20:11:58 -07:00
David Baldwynn
e1db98ec95
added tests for api routes
2017-10-29 18:17:20 -07:00
David Baldwynn
99a6cb5009
fixed hasAuthorization bug for API
2017-10-29 17:46:08 -07:00
David Baldwynn
15eb66e455
added test for /users/me routes
2017-10-29 17:34:27 -07:00
David Baldwynn
9fffdf5328
added tests to cover reset password routes
2017-10-29 15:47:01 -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
759a4efdd1
got all tests to pass
2017-10-29 12:44:12 -07:00
David Baldwynn
d304b80913
fixed submission ordering
2017-10-28 05:13:56 -04:00
David Baldwynn
a3d203fee3
Merge branch 'master' of github.com:tellform/tellform
2017-10-28 01:51:18 -07:00
David Baldwynn
dc3bb54774
fixed submissions bug
2017-10-28 04:30:23 -04: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
82d60c5a42
add error for unactivated account login/forgot password
2017-10-27 20:59:47 -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
8de93d4413
Merge branch 'master' into emailNotifications
2017-10-26 08:37:03 -07:00
David Baldwynn
e4ef81af35
fixed verification email signup bug
2017-10-26 11:36:15 -04: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
8e402f5919
disabled cache
2017-10-07 06:14:36 -04:00
David Baldwynn
3c9c11d9db
Merge branch 'master' of https://github.com/tellform/tellform into publicFormImprovments
2017-10-07 02:40:55 -07:00
David Baldwynn
9e351dd520
updated mail templates
2017-10-07 02:40:24 -07:00
David Baldwynn
ef621f03ce
fix embedded header bug
2017-10-07 04:50:52 -04:00
David Baldwynn
1a155e9ef1
Merge branch 'publicFormImprovments' of github.com:whitef0x0/tellform into speed_improvements
2017-10-07 04:23:59 -04:00
David Baldwynn
3ebb4eebff
fixed bug in form controller
2017-10-07 00:27:03 -07:00
David Baldwynn
c1f88603ca
obfuscated email for forgot password
2017-10-05 22:32:50 -07:00
David Baldwynn
00e1d43858
got basic emailNotifications to work
2017-10-05 21:53:13 -07:00
David Baldwynn
5c3a0a5bd4
Merge branch 'master' of https://github.com/tellform/tellform
2017-10-05 21:26:31 -07:00