Commit graph

1316 commits

Author SHA1 Message Date
David Baldwynn 5b847b33ec moved grunt to dev dependencies 2017-11-06 14:10:27 -08:00
David Baldwynn b29d5bad36 fixed admin setup script 2017-11-06 13:44:29 -08:00
David Baldwynn 53658da890 Merge branch 'master' of github.com:tellform/tellform 2017-11-05 16:28:29 -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 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 65a8b2d7cc fixed gruntfile bug 2017-10-29 11:43:20 -04:00
David Baldwynn d304b80913 fixed submission ordering 2017-10-28 05:13:56 -04:00
David Baldwynn a3d203fee3 Merge branch 'master' of github.com:tellform/tellform 2017-10-28 01:51:18 -07:00
David Baldwynn dc3bb54774 fixed submissions bug 2017-10-28 04:30:23 -04:00
David Baldwynn 3b9f01f92a fixed form_fields translation bug 2017-10-28 00:45:04 -07:00
David Baldwynn a829e08d73 fixed errors for password reset, user signup and user signin 2017-10-27 23:54:55 -07:00
David Baldwynn 34b2cba461 added client side validation for email, username and password inputs 2017-10-27 23:23:50 -07:00
David Baldwynn 82d60c5a42 add error for unactivated account login/forgot password 2017-10-27 20:59:47 -07:00
David Baldwynn c45d248c3c internationalized transactional emails 2017-10-27 20:46:00 -07:00
David Baldwynn 4f7d646edd got email pug templates to work 2017-10-27 19:30:05 -07:00
David Baldwynn b0f03d1f0a got i18n transaltions for all serverside views 2017-10-27 17:23:24 -07:00
David Baldwynn 25ce55b4c7 moved to pug from swig and fixed public form when subdomains are disabled 2017-10-27 16:00:04 -07:00
David Baldwynn 62a34f9ab6 fixed all translations on frontend 2017-10-27 12:52:39 -07:00
David Baldwynn e6685154dd added german and italian translateions for user and core views 2017-10-27 12:13:47 -07:00
David Baldwynn fe692d2a7d Removed codeclimate badge 2017-10-26 11:06:10 -07:00
David Baldwynn 8a8f1e9b2e Update README.md 2017-10-26 11:04:50 -07:00
David Baldwynn b3213d5a8a Merge pull request #242 from alexgleason/alexgleason
whitef0x0/tellform --> tellform/tellform
2017-10-26 11:04:17 -07:00
David Baldwynn 6899a5d48f Removed npm run version 2017-10-26 11:00:05 -07:00
David Baldwynn e4ef81af35 fixed verification email signup bug 2017-10-26 11:36:15 -04:00
David Baldwynn 28614fbab4 fixed openEditModal 2017-10-18 17:44:48 -07:00
David Baldwynn 5746920c34 fixed logicJump bug 2017-10-18 17:37:48 -07:00
David Baldwynn 828f4c8bba added defaults for admin user 2017-10-18 17:32:15 -07:00
David Baldwynn accd9dad78 removed unnessecary markdown file 2017-10-18 17:29:11 -07:00
David Baldwynn d2bac982cd fixed config prod 2017-10-18 20:27:07 -04:00
David Baldwynn 3835a8aa3a Merge branch 'master' of github.com:whitef0x0/tellform into HEAD
Conflicts:
	config/env/all.js
	config/env/development.js
2017-10-18 20:20:15 -04:00
David Baldwynn 154fddff75 fixed editField bug 2017-10-18 17:18:18 -07:00
David Baldwynn fc29c7b5ca Merge branch 'master' of github.com:whitef0x0/tellform into HEAD 2017-10-18 19:42:48 -04:00
David Baldwynn 8b93bcf448 fixed analytics service 2017-10-18 19:39:34 -04:00
David Baldwynn cf3348371a Added back overlay 2017-10-18 16:37:42 -07:00
Alex Gleason e110820fcb whitef0x0/tellform --> tellform/tellform 2017-10-17 13:12:27 -04:00
David Baldwynn b14822d1fa Update all.js 2017-10-11 12:12:20 -07:00
David Baldwynn 60abe5a227 got grunt-env to work with .env file 2017-10-10 22:25:39 -07:00
David Baldwynn d1039c7fc2 got all tests to pass 2017-10-10 22:07:13 -07:00
David Baldwynn 92fd374e87 Update production.js 2017-10-10 16:30:12 -07:00