Commit graph

1289 commits

Author SHA1 Message Date
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
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