1401 Commits

Author SHA1 Message Date
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
084a8005fd fixed form vendor files 2017-11-11 19:56:41 -08:00
David Baldwynn
24cffeee37 fixed problem with production assets 2017-11-08 11:31:46 -08:00
David Baldwynn
5516e76e19 Merge branch 'fixSlowAnalyticsBug' of github.com:tellform/tellform into fixSlowAnalyticsBug 2017-11-06 15:04:42 -08:00
David Baldwynn
ffb2a23cc6 fixed duplicate npm dep in prod and dev 2017-11-06 15:03:52 -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
4fe1e8e848
Merge pull request #230 from tellform/emailNotifications
Add Email Notifications
2017-11-06 14:45:03 -08:00
David Baldwynn
ed815f68e5
Update README.md 2017-11-06 14:35:29 -08:00
David Baldwynn
552f4d8396
Update gitter.im links 2017-11-06 14:29:43 -08:00
David Baldwynn
68235423c8
Merge branch 'master' into fixSlowAnalyticsBug 2017-11-06 14:26:04 -08:00
David Baldwynn
7c3834dcae Merge branch 'master' of github.com:tellform/tellform 2017-11-06 14:12:37 -08:00
David Baldwynn
5b847b33ec moved grunt to dev dependencies 2017-11-06 14:10:27 -08:00
David Baldwynn
86f74ce85f
Merge pull request #257 from tellform/fixSetupScript
Fixed Setup Script
2017-11-06 13:58:20 -08:00
David Baldwynn
147effe028
Added buildpack for Heroku Deploy Button 2017-11-06 13:57:13 -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
53658da890 Merge branch 'master' of github.com:tellform/tellform 2017-11-05 16:28:29 -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
f8ac5454d7 Merge branch 'master' of github.com:tellform/tellform 2017-11-05 16:14:15 -08:00
David Baldwynn
4c76e37aba
Merge pull request #253 from tellform/fixGruntfile
Fixed Gruntfile
2017-11-05 16:11:47 -08:00
David Baldwynn
be6fc12949 fixed ngAnnotate grunt task 2017-11-05 16:05:58 -08:00
David Baldwynn
e2d000e6a0 fixed gruntfile build for form-application.js 2017-11-05 15:56:03 -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
8521ede885 Merge branch 'master' into 2.20 2017-11-05 15:43:07 -08:00
David Baldwynn
381df20d3c
Merge pull request #252 from tellform/hotfixes
Hotfixes - Signin Redirection, FormField Service language, Gruntfile Concat
2017-11-05 15:41:42 -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
f7d4394049 removed unused npm deps 2017-11-05 15:28:58 -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