567 Commits

Author SHA1 Message Date
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
13d9bd9ece fixed bugs with authentication 2018-09-11 14:09:17 -07:00
David Baldwynn
52a1ab2bff got form running and fixed swedish translations 2018-08-31 15:25:43 -04:00
David Baldwynn
f5dc78b6d7
Merge pull request #292 from mattiasaxell/patch-5
Create swedish.js - Swedish translation
2018-03-03 16:18:06 -08:00
David Baldwynn
f384f5fee4
Merge pull request #293 from mattiasaxell/patch-6
Create swedish.js first translation
2018-03-03 16:17:57 -08:00
Mattias Axell
53fa777ce0
Create swedish.js first Swedish translation 2018-02-28 18:12:54 +01:00
Mattias Axell
e725aa1ea3
Create swedish.js first translation 2018-02-28 17:22:21 +01:00
Mattias Axell
c63e905c25
Create swedish.js - Swedish translation 2018-02-28 16:31:35 +01:00
Maxime
1ace06555c Fix french translations in modules, form_modules and locales. 2018-02-14 17:28:19 +01: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
499f2c97a8
Merge pull request #261 from tellform/fixedScrollspy
Fixed ScrollSpy for fields
2017-11-13 22:18:35 -08:00
David Baldwynn
9d51608a62 added email notifications to json form data 2017-11-13 22:09:15 -08:00
David Baldwynn
56bbc68980 fixed shape dropdown for rating field 2017-11-13 21:49:16 -08:00
David Baldwynn
2e5bd5beb5 fixed form validation bug with radio 2017-11-13 21:25:05 -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
28fe150149 Merge branch '2.20' into fixSlowAnalyticsBug 2017-11-13 14:51:53 -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
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
3dc51d9d2c fixed bug in core.routes.js 2017-11-05 19:23:01 -05:00
David Baldwynn
8521ede885 Merge branch 'master' into 2.20 2017-11-05 15:43:07 -08:00
David Baldwynn
4e18e70b18 fix html bug with textAngular attribute in config admin panel 2017-11-05 15:37:27 -08:00
David Baldwynn
15d023c133 fixed editable variables in textAngular editor 2017-11-02 14:29:02 -07:00
David Baldwynn
7451311403 removed empty authentication controller test 2017-11-02 11:37:33 -07:00
David Baldwynn
5c58db879c got server tests to pass 2017-11-02 11:14:25 -07:00
David Baldwynn
076f56bf59 fix language detection bug for FormFields service 2017-11-02 10:41:36 -07:00
David Baldwynn
6927f9d5ac fixed signin redirect bug 2017-11-02 10:37:29 -07:00
David Baldwynn
72b3e31819 fixed form expected object but got array error 2017-11-02 09:57:05 -07:00
David Baldwynn
22875abab5 fixed signin validation bug 2017-11-02 09:54:14 -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
4d94ed50ee fixed config admin panel field input padding 2017-11-01 19:20:58 -07:00
David Baldwynn
5120a2f287 fixed dropdowns for configure admin panel 2017-11-01 19:13:53 -07:00
David Baldwynn
eaea95078c fix url tab bug with configure tabs 2017-11-01 17:56:03 -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
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
f291eda21e fixed add variable dropdown only showing email fields on subject input for config 2017-11-01 11:27:07 -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
19880b0d07 add support when no email field is detected for self notifications 2017-11-01 11:15:58 -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
aa8efe8508 got static url for configure tabs to work 2017-10-31 12:32:23 -07:00
David Baldwynn
12e1fd0947 got static url for admin tabs to work 2017-10-31 12:28:01 -07:00