Commit graph

1428 commits

Author SHA1 Message Date
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
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 a7c0cdc056 got tests for send-email-notification template logic to pass 2017-11-01 13:38:42 -07:00
David Baldwynn cc62f6db3a Added test for parseTemplate for send-email-notifications 2017-11-01 12:53:52 -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
David Baldwynn 798d28d92d added routable tabs for configure panel 2017-10-31 10:36:01 -07:00
David Baldwynn 86d8b88231 got url-linked tabs to work for admin panel 2017-10-31 10:21:10 -07:00
David Baldwynn 8f55df1393
Merge pull request #246 from tellform/increaseTestCoverage
Increased Test Coverage
2017-10-30 12:03:53 -07:00
David Baldwynn 22cf37424f added share and design form directives 2017-10-30 12:00:30 -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 56cf745270 added check to not load .env on travis run 2017-10-30 11:12:44 -07:00
David Baldwynn c871d320f1 remove swig 2017-10-30 11:01:13 -07:00
David Baldwynn 814466cd1d switched to npm for travis 2017-10-30 10:47:54 -07:00
David Baldwynn 56fda0d312 switched travis scripts to yarn 2017-10-30 10:35:05 -07:00
David Baldwynn 5805c9b529 fixed travis test command 2017-10-30 09:54:03 -07:00