Commit graph

245 commits

Author SHA1 Message Date
David Baldwynn c561130f75 Merge branch 'fixUXBugs' into addSeleniumTests 2017-11-21 15:56:49 -08:00
David Baldwynn df83c6bb93 fixed create_admin script 2017-11-21 15:30:09 -08:00
David Baldwynn c9057b4a8a Merge branch '2.20' into addSeleniumTests 2017-11-21 13:45:28 -08:00
David Baldwynn 0a4b83186a Merge branch 'fixUXBugs' of github.com:tellform/tellform into fixUXBugs 2017-11-21 13:40:47 -08:00
David Baldwynn 20cc79f218 Merge branch '2.20' into fixUXBugs 2017-11-21 13:40:27 -08:00
David Baldwynn 9ff247fde7 Merge branch 'master' into 2.20 2017-11-21 13:39:27 -08:00
David Baldwynn fb26fbd4f9 disabled subdomains for server-side tests 2017-11-21 10:54:23 -08:00
David Baldwynn d8268e4a9b Added test for preserving visitorData on update and removed debugger statements 2017-11-21 10:50:58 -08:00
David Baldwynn 68858ca1a3 fixed fieldType constant 2017-11-21 10:42:32 -08:00
David Baldwynn fca5524751 fixed admin script 2017-11-21 07:39:00 -08:00
David Baldwynn 2c9e931257 removed unnessecary console.log() statement from passport helpers 2017-11-20 21:07:04 -08:00
David Baldwynn eb658af30d got jshint to pass 2017-11-20 21:04:07 -08:00
David Baldwynn 6a992d74ad Added tests for password, settings and verify controllers 2017-11-19 15:11:43 -08:00
David Baldwynn 0e7eb457cc got clientside tests to pass 2017-11-19 11:12:46 -08:00
David Baldwynn f5e32e9548 got validity working for rating field 2017-11-13 21:07:27 -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 5c58db879c got server tests to pass 2017-11-02 11:14:25 -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 8ea1f63c96 fixed travis settings 2017-10-29 21:32:02 -07:00
David Baldwynn d0d273a718 removed secure configuration 2017-10-29 20:23:36 -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 759a4efdd1 got all tests to pass 2017-10-29 12:44:12 -07:00
David Baldwynn 3b9f01f92a fixed form_fields translation bug 2017-10-28 00:45:04 -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 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 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 b14822d1fa Update all.js 2017-10-11 12:12:20 -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
David Baldwynn c4e097275c Update express.js 2017-10-10 16:27:07 -07:00
David Baldwynn 91d5deabcf Update all.js 2017-10-10 16:26:18 -07:00
David Baldwynn 6bf5c6d3ee Update all.js 2017-10-10 16:25:51 -07:00
David Baldwynn 101f28ea88 Update all.js 2017-10-10 15:24:45 -07:00
David Baldwynn 08c7bc19e9 Update socket.io.js 2017-10-10 15:21:23 -07:00
David Baldwynn 4d6a337e45 Update all.js 2017-10-10 15:20:03 -07:00
David Baldwynn 8218521a2b Update all.js 2017-10-10 15:12:31 -07:00
David Baldwynn 4e9a68e628 Removed OAuth providers from env/secure.js 2017-10-10 15:09:57 -07:00
David Baldwynn 2c736fe184 Removed upload config from env/all.js 2017-10-10 15:07:24 -07:00
David Baldwynn c13e09bd2e Removed OAuth ENV from test.js 2017-10-10 15:05:35 -07:00
David Baldwynn c3615f1cd6 Removed OAuth ENV from development.js 2017-10-10 15:05:12 -07:00