Commit graph

1423 commits

Author SHA1 Message Date
David Baldwynn d8c5b00581 bumped version in bower.json and package.json 2017-11-23 18:52:10 -08:00
David Baldwynn 5f65451661 added docker-compose file for development work 2017-11-23 18:40:37 -08:00
David Baldwynn 9ff247fde7 Merge branch 'master' into 2.20 2017-11-21 13:39:27 -08:00
David Baldwynn ff24843e3a Merge branch 'master' of github.com:tellform/tellform 2017-11-21 13:36:34 -08:00
David Baldwynn 4447785a56 removed secure grunt task 2017-11-21 13:36:14 -08:00
David Baldwynn 341ce5a88f
Merge pull request #265 from felixcheruiyot/master
Fix wrong vendor.min.js file reference URL
2017-11-20 20:33:33 -08:00
FELIX CHERUIYOT ed662281cd
Merge pull request #1 from felixcheruiyot/felixcheruiyot-patch-1
Fix missing vendor file reference
2017-11-17 07:44:07 +03: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 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 67a3013945 readded page loader gif for form view 2017-11-13 21:26:30 -08:00
David Baldwynn 2e5bd5beb5 fixed form validation bug with radio 2017-11-13 21:25:05 -08:00
David Baldwynn f5e32e9548 got validity working for rating field 2017-11-13 21:07:27 -08:00
David Baldwynn 04001244d1 fixed prev and next field buttons 2017-11-13 18:22:15 -08:00
David Baldwynn 6848b740b3 moved from on('scroll' to using duScroll for tracking activeField 2017-11-13 18:14:52 -08:00
David Baldwynn 15a508cca7 change name of form assets from form-vendor.min.js to vendor.min.js 2017-11-13 16:56:24 -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 1f9a0ed1e4
Merge pull request #254 from tellform/fixSlowAnalyticsBug
Fix Slow Form Analytics Bug
2017-11-13 15:00:18 -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 421d3b53b8
Merge pull request #260 from tellform/improvedAddOptionUX
Improved UX of Adding an Option
2017-11-11 21:59:47 -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