1
0
Commit Graph

1831 Commits

Author SHA1 Message Date
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
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
0020427cf8 Update README.md 2017-10-10 15:45:07 -07:00
David Baldwynn
5641057167 Removed process.env from create_admin script 2017-10-10 15:25:32 -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
David Baldwynn
b30c3a40e0 Fixed ENV bug with create-admin script 2017-10-10 15:03:37 -07:00
David Baldwynn
533d85eb39 Update package.json 2017-10-10 14:45:19 -07:00
David Baldwynn
8e402f5919 disabled cache 2017-10-07 06:14:36 -04:00
David Baldwynn
d1b052b875 fixed ipAddr bug in sockets/analytics.js 2017-10-07 06:03:15 -04:00
David Baldwynn
988b8739c9 fix merging mistake for sockets 2017-10-07 05:44:47 -04:00
David Baldwynn
39cc78d294 Merge branch 'master' of github.com:whitef0x0/tellform 2017-10-07 05:42:23 -04:00
David Baldwynn
7f01627502 removed analytics geoIP 2017-10-07 05:42:18 -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
c02dae5a7e Merge branch 'master' of github.com:whitef0x0/tellform 2017-10-07 04:51:04 -04:00
David Baldwynn
ef621f03ce fix embedded header bug 2017-10-07 04:50:52 -04:00
David Baldwynn
b4d887450e Update package.json 2017-10-07 01:47:54 -07:00
David Baldwynn
eabe217cfa Update README.md 2017-10-07 01:47:36 -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
David Baldwynn
3cc99d7b17 form background color bug 2017-10-06 17:15:35 -07:00
David Baldwynn
f33f26d218 Merge pull request #231 from tellform/fixEmailLeakForgotPassword
obfuscated email for forgot password
2017-10-05 22:35:03 -07:00
David Baldwynn
c1f88603ca obfuscated email for forgot password 2017-10-05 22:32:50 -07:00
David Baldwynn
00e1d43858 got basic emailNotifications to work 2017-10-05 21:53:13 -07:00
David Baldwynn
ae946bd619 Merge branch 'master' into emailNotifications 2017-10-05 21:27:57 -07:00
David Baldwynn
5c3a0a5bd4 Merge branch 'master' of https://github.com/tellform/tellform 2017-10-05 21:26:31 -07:00