Commit graph

400 commits

Author SHA1 Message Date
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
David Baldwynn 5120a2f287 fixed dropdowns for configure admin panel 2017-11-01 19:13:53 -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 983d2ce20b fixed bug with detecting whether form has emails for config panel 2017-11-01 11:25:24 -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 12e1fd0947 got static url for admin tabs to work 2017-10-31 12:28:01 -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 774d256507 removed unused code from user.server.model.js 2017-10-29 20:14:40 -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