855 Commits

Author SHA1 Message Date
David Baldwynn
601dcd64e4 Merge branch 'master' of github.com:whitef0x0/tellform 2016-11-14 11:27:39 -08:00
David Baldwynn
3b0af059d2 fixed hide logicJump in admin panel 2016-11-14 11:13:58 -08:00
David Baldwynn
a24b8281d6 Merge branch 'master' of github.com:whitef0x0/tellform 2016-11-14 14:12:38 -05:00
David Baldwynn
97e83968dd fixed hide logicJump in admin panel 2016-11-14 11:12:21 -08:00
David Baldwynn
fbfed815c4 fixed hide logicJump in admin panel 2016-11-14 11:10:51 -08:00
David Baldwynn
7ad79c4882 fixed password reset email 2016-11-14 11:01:16 -08:00
David Baldwynn
1092f0da7f fix password reset 2016-11-14 10:59:08 -08:00
David Baldwynn
fdccdb8f81 Merge branch 'master' of https://github.com/whitef0x0/tellform 2016-11-14 10:55:05 -08:00
David Baldwynn
dbe49af5de change expriation time of activation link to 24 hours 2016-11-14 13:43:28 -05:00
David Baldwynn
90d2e793fb fixed typo in edit-submissions-view 2016-11-14 13:41:23 -05:00
David Baldwynn
3e4028117d got tests to run 2016-11-09 12:29:36 -08:00
David Baldwynn
a1a6d0fdd5 fixed typo in edit-submissions-view 2016-11-09 11:20:50 -08:00
David Baldwynn
f464deb959 fixed analytics service 2016-11-09 11:06:01 -08:00
David Baldwynn
faa306302b fixed form analyze view 2016-11-09 10:02:12 -08:00
David Baldwynn
83fe074f56 updated version 2016-11-08 15:01:44 -08:00
David Baldwynn
6e1a8960f2 fixed setup script 2016-11-08 14:55:46 -08:00
David Baldwynn
71cd2ff1a3 removed oscarhost and soap 2016-11-08 14:53:10 -08:00
David Baldwynn
0bc207c6d3 added e2e_tests 2016-11-08 14:46:20 -08:00
David Baldwynn
e0dc6e4627 removed '=' file 2016-11-08 14:45:30 -08:00
David Baldwynn
d9e29efc8f Merge branch 'master' into stage 2016-11-08 17:44:26 -05:00
David Baldwynn
0c98c642ad fixed view form link bug 2016-11-08 17:44:00 -05:00
David Baldwynn
0255279183 fixed token generator 2016-11-08 17:28:30 -05:00
David Baldwynn
e88234dad5 Merge branch 'stage' of github.com:whitef0x0/tellform into stage
Conflicts:
	README.md
	app/models/form_submission.server.model.js
	public/dist/application.min.js
	public/dist/form-application.min.js
2016-11-08 17:25:12 -05:00
David Baldwynn
5026d788bd Update README.md 2016-11-08 17:14:32 -05:00
David Baldwynn
9e4ed965a3 Update README.md 2016-11-08 09:47:32 -08:00
David Baldwynn
08c40ea23d Update README.md 2016-11-08 09:46:46 -08:00
David Baldwynn
5d5526fba0 fixed overflow of analyze table 2016-11-02 14:32:12 -07:00
David Baldwynn
179a483661 removed nightwatch 2016-11-02 13:40:48 -07:00
David Baldwynn
4bcd8e64db fixed edit form autosaving deletion problems 2016-11-02 13:35:04 -07:00
David Baldwynn
cdd5c122aa fixed autosave bugs 2016-11-02 12:43:04 -07:00
David Baldwynn
52632f3328 fixed autosaving bug 2016-11-02 12:35:01 -07:00
David Baldwynn
2d15ae3dd5 fixed subdomain for problem 2016-11-02 12:11:41 -07:00
David Baldwynn
ecfccd803f added dnsmasq setup file 2016-11-02 11:31:15 -07:00
David Baldwynn
20e78f89bb Merge pull request #138 from toanalien/master
install nodemailer-sendgrid-transport
2016-10-24 10:11:36 -07:00
David Baldwynn
01d94ebffc Merge pull request #137 from toanalien/fixbug
Update config variables for Heroku
2016-10-24 10:11:10 -07:00
Toan Vo
c9d00688ed install nodemailer-sendgrid-transport 2016-10-24 15:51:32 +07:00
Toan Vo
4f503e6dfb update redis url 2016-10-24 15:27:03 +07:00
Toan Vo
45723bc725 db url 2016-10-24 15:24:25 +07:00
Toan Vo
79f8ca8d85 only load dotenv if development environment 2016-10-24 14:13:38 +07:00
Toan Vo
145c563171 updated README.md 2016-10-24 14:09:10 +07:00
David Baldwynn
8c4d3afe08 Merge pull request #136 from toanalien/master
fix username register
2016-10-23 10:27:21 -07:00
Thiên Toán
2d1797d407 Update setup.js 2016-10-23 17:01:07 +07:00
Toan Vo
486a1dba94 fix username 2016-10-23 12:18:47 +07:00
Toan Vo
2fe9607e43 fix jshint 2016-10-23 11:31:18 +07:00
David Baldwynn
cc2d6dadf0 Added SparkPost and GetRoost to sponsors and fixed sponsor images 2016-10-15 12:41:53 -07:00
David Baldwynn
8309b27e3e added successful verification message to login page 2016-10-07 09:01:37 -07:00
David Baldwynn
2455f5dd9a Merge branch 'api' into stage 2016-10-07 08:38:45 -07:00
David Baldwynn
1d65da9792 Merge branch 'logic_jump' into stage 2016-10-07 08:30:09 -07:00
David Baldwynn
eb96506da5 merged to stage 2016-10-07 08:29:11 -07:00
David Baldwynn
9ad13df922 Merge pull request #130 from ahmad-luqman/MeanJS-URL-fix
Fix MeanJS team url
2016-10-01 12:37:03 -07:00