Commit graph

620 commits

Author SHA1 Message Date
David Baldwynn ef23ceb07d Merge branch '2.20' into fixedSignupErrors 2017-11-05 16:26:35 -08:00
David Baldwynn 43ce60b985 Merge branch 'master' into 2.20 2017-11-05 16:24:19 -08:00
David Baldwynn be6fc12949 fixed ngAnnotate grunt task 2017-11-05 16:05:58 -08:00
David Baldwynn 8521ede885 Merge branch 'master' into 2.20 2017-11-05 15:43:07 -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 26716e256d migrating to yarn 2017-10-29 21:54:30 -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
David Baldwynn 7d65f0161b removed duplicate translation keyword for form admin panel 2017-10-29 12:07:42 -07:00
David Baldwynn 538030c551 got edit-form-directive tests to pass 2017-10-29 12:01:30 -07:00
David Baldwynn 76d6d54cd5 got edit-submissions-form directive tests to pass 2017-10-29 11:54:40 -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 eaef327b37 fixed reloading bug for settings pages 2017-10-28 01:19:09 -07: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 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 b3213d5a8a Merge pull request #242 from alexgleason/alexgleason
whitef0x0/tellform --> tellform/tellform
2017-10-26 11:04:17 -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 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 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 d1039c7fc2 got all tests to pass 2017-10-10 22:07:13 -07:00
David Baldwynn 988b8739c9 fix merging mistake for sockets 2017-10-07 05:44:47 -04:00
David Baldwynn 3c9c11d9db Merge branch 'master' of https://github.com/tellform/tellform into publicFormImprovments 2017-10-07 02:40:55 -07:00
David Baldwynn 9e351dd520 updated mail templates 2017-10-07 02:40:24 -07:00
David Baldwynn b58d7abaec fixed button css border 2017-10-07 04:47:14 -04:00
David Baldwynn 4a816c786d fixed analytics fieldValue bug 2017-10-07 04:34:01 -04:00
David Baldwynn 1a155e9ef1 Merge branch 'publicFormImprovments' of github.com:whitef0x0/tellform into speed_improvements 2017-10-07 04:23:59 -04:00
David Baldwynn 6a4dcb0874 moved ip lookups to backend 2017-10-07 01:23:42 -07:00
David Baldwynn e620769d32 got tests to pass 2017-10-07 00:35:41 -07:00
David Baldwynn 3ebb4eebff fixed bug in form controller 2017-10-07 00:27:03 -07:00