1353 Commits

Author SHA1 Message Date
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
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
f7d4394049 removed unused npm deps 2017-11-05 15:28:58 -08: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
8f55df1393
Merge pull request #246 from tellform/increaseTestCoverage
Increased Test Coverage
2017-10-30 12:03:53 -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
David Baldwynn
fc4d9a12f0 fixed lcovMerge for travis 2017-10-30 09:40:09 -07:00
David Baldwynn
26716e256d migrating to yarn 2017-10-29 21:54:30 -07:00
David Baldwynn
8d9e66548b remove references to i18n-lint 2017-10-29 21:37:22 -07:00
David Baldwynn
8ea1f63c96 fixed travis settings 2017-10-29 21:32:02 -07:00
David Baldwynn
b2b09171f3 fixed api tests 2017-10-29 21:22:43 -07:00
David Baldwynn
d0d273a718 removed secure configuration 2017-10-29 20:23:36 -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
3e3e7ccfe6 removed hasRole and hasAdminRole from passport_helpers 2017-10-29 19:02:01 -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
David Baldwynn
aed7c6c43b added test for changing password route 2017-10-29 17:20:34 -07:00
David Baldwynn
9fffdf5328 added tests to cover reset password routes 2017-10-29 15:47:01 -07:00
David Baldwynn
3dbfe2f88d added helper function to remove sensitive data from forms/users 2017-10-29 14:15:13 -07:00
David Baldwynn
aa554c8210 added coveralls support 2017-10-29 13:02:41 -07:00
David Baldwynn
759a4efdd1 got all tests to pass 2017-10-29 12:44:12 -07:00
David Baldwynn
88fbf9e51f got user tests to pass 2017-10-29 12:20:49 -07:00
David Baldwynn
6fbfa35473 fixed on-finish-render directive tests 2017-10-29 12:17:54 -07:00
David Baldwynn
f427092144 fixed field directive tests 2017-10-29 12:16:34 -07:00
David Baldwynn
ebcc0c63cd fixed field-icon tests 2017-10-29 12:13:22 -07:00