1
0
Commit Graph

1831 Commits

Author SHA1 Message Date
David Baldwynn
6838fa94e3 merged with 2.20 2017-11-23 18:53:16 -08:00
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
22ff9ca5cb
Merge pull request #271 from tellform/fixFormUpdate
Fix form update
2017-11-23 18:28:39 -08:00
David Baldwynn
f92d6f4ce3
Merge pull request #270 from tellform/updateSetupScript
Update setup script
2017-11-21 18:34:31 -08:00
David Baldwynn
8bda1a3a97 fixed hasAuthorization bug 2017-11-21 17:40:05 -08:00
David Baldwynn
784ae9011e fixed security flaw with removeSensitiveModelData 2017-11-21 17:26:52 -08:00
David Baldwynn
bd4af8aa7c
Merge branch 'fixUXBugs' into updateSetupScript 2017-11-21 16:01:33 -08:00
David Baldwynn
bc2f49b090 Merge branch 'fixUXBugs' into updateSetupScript 2017-11-21 15:59:18 -08:00
David Baldwynn
65a4e3fcba
Merge pull request #272 from tellform/addSeleniumTests
Add selenium tests
2017-11-21 15:57:16 -08:00
David Baldwynn
c561130f75 Merge branch 'fixUXBugs' into addSeleniumTests 2017-11-21 15:56:49 -08:00
David Baldwynn
6213ec227d updated field-icon test 2017-11-21 15:56:10 -08:00
David Baldwynn
1163debc33 made all server models exportable 2017-11-21 15:51:24 -08:00
David Baldwynn
4d4bb65298 disabled create_admin script in test mode 2017-11-21 15:49:58 -08:00
David Baldwynn
4f82a55227 added selenium tests 2017-11-21 15:35:06 -08:00
David Baldwynn
188c48b26c fixed password issue with setup script admin creation 2017-11-21 15:33:07 -08:00
David Baldwynn
df83c6bb93 fixed create_admin script 2017-11-21 15:30:09 -08:00
David Baldwynn
f076b482e9 moved to node v7 2017-11-21 14:06:08 -08:00
David Baldwynn
c9057b4a8a Merge branch '2.20' into addSeleniumTests 2017-11-21 13:45:28 -08:00
David Baldwynn
2ae316b6b3 Merge branch 'fixUXBugs' into fixFormUpdate 2017-11-21 13:43:38 -08:00
David Baldwynn
7fc2a19adc Merge branch '2.20' into fixFormUpdate 2017-11-21 13:42:51 -08:00
David Baldwynn
b2e027e0bf Merge branch '2.20' into updateSetupScript 2017-11-21 13:41:42 -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
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
0b22d06326
Merge pull request #268 from tellform/fixFormUpdate
Added tests for Form Updated and fixed bugs
2017-11-21 13:34:01 -08:00
David Baldwynn
7c6dc90592 added ASCII art for setup script 2017-11-21 13:33:25 -08:00
David Baldwynn
39125972c3 removed user and pass from mongoose options 2017-11-21 13:12:34 -08:00
David Baldwynn
31985ddda7 added setup script that runs on first run of server 2017-11-21 13:10:43 -08:00
David Baldwynn
563b8c6cd2 Modified setup script to search for admin user by email AND username 2017-11-21 12:37:57 -08:00
David Baldwynn
c97f207699 added username validation to setup script 2017-11-21 12:33:47 -08:00
David Baldwynn
e27f27f7f0 added email validation to setup script 2017-11-21 12:31:13 -08:00
David Baldwynn
acb067d626 fixed incorrect ENV variable name for redis url 2017-11-21 11:50:35 -08:00
David Baldwynn
9d2a548dca Added new form_route tests for update route 2017-11-21 11:46:57 -08:00
David Baldwynn
8c1964146f removed newOptionSchema property from FieldSchema 2017-11-21 11:37:48 -08:00
David Baldwynn
f6546deb59 removed globalId 2017-11-21 11:37:01 -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
2bd1598a01 Handled case in setup script where admin user already exists 2017-11-21 10:12:29 -08:00
David Baldwynn
a08e5c5317 removed username from .env file in setup script 2017-11-21 09:59:42 -08:00
David Baldwynn
7107bab614 added support for custom smtp server in setup script 2017-11-21 09:58:44 -08:00
David Baldwynn
2993c6e4f8 removed reCAPTCHA token from setup script 2017-11-21 07:58:11 -08:00
David Baldwynn
fca5524751 fixed admin script 2017-11-21 07:39:00 -08:00
David Baldwynn
801677bdd7 fixed angular-ui sorting bug 2017-11-21 07:24:22 -08:00
David Baldwynn
91528889e5 got tests to pass 2017-11-21 00:05:01 -08:00
David Baldwynn
94bcae9d5b added clarifying comment for formatDeviceData 2017-11-20 21:24:20 -08:00
David Baldwynn
88299a2b27 simplified form_field property deletion logic in form_submission model 2017-11-20 21:21:32 -08:00