Commit graph

80 commits

Author SHA1 Message Date
Michael Zhang
a15eeacf9c Merge branch 'master' of github.com:failedxyz/easyctf 2015-12-23 23:29:33 -06:00
Michael Zhang
d8fe352922 angular templates 2015-12-23 23:29:04 -06:00
James Wang
cfc413f782 Validate recaptcha for registration 2015-12-23 23:31:50 -05:00
Michael Zhang
5f4edf7792 update 2015-12-23 22:14:54 -06:00
James Wang
5194830e0d Make username duplication check case insensitive 2015-12-23 23:09:05 -05:00
Michael Zhang
861531b5fe testing navbar 2015-12-23 21:51:42 -06:00
James Wang
4bebf8dcf3 Add user login functionality 2015-12-23 21:30:55 -05:00
James Wang
dc262f778a Begin work on user registration 2015-12-23 21:08:47 -05:00
James Wang
c79489c4cf Fix blueprint route 2015-12-23 20:12:23 -05:00
James Wang
36bdcd5e6f Add user blueprint to app.py 2015-12-23 19:55:01 -05:00
James Wang
c6add58ee1 Begin work on a few other models 2015-12-23 19:41:05 -05:00
Michael Zhang
8de129c2da create registration endpoint 2015-12-23 17:23:18 -06:00
Michael Zhang
de0ba444e6 added user model 2015-12-23 17:06:44 -06:00
James Wang
fe367f664e Load api as blueprint within app.py 2015-12-23 17:53:00 -05:00
James Wang
d3b15e4345 Fix import in __init__.py 2015-12-23 17:32:10 -05:00
James Wang
49d16a1306 Remove unused imports 2015-12-23 17:27:56 -05:00
Michael Zhang
be7cf1f819 Merge branch 'master' of github.com:failedxyz/easyctf 2015-12-23 13:49:44 -06:00
Michael Zhang
5ba6479171 connect flask API with nginx 2015-12-23 13:49:31 -06:00
James Wang
ab2b52adff Remove useless mysql function 2015-12-23 09:34:20 -05:00
Michael Zhang
1e971b70f5 merge 2015-12-23 00:27:48 -06:00
Michael Zhang
a99b68c04e added basic database stuff 2015-12-23 00:26:27 -06:00
James Wang
57e09be600 Add utils.py 2015-12-22 22:44:51 -05:00
James Wang
0b2e5d00c2 Add skeleton for a few decorators 2015-12-22 20:45:50 -05:00
James Wang
869ce7a269 Add beginnings of an api 2015-12-22 20:37:48 -05:00
James Wang
229441ee32 Add secret key 2015-12-21 16:08:50 -05:00
Thomas Gerot
56d12cd74b Added subpages to app.py 2015-12-21 13:43:51 -06:00
Thomas Gerot
159b0401ef Filled return statements with placeholder messages 2015-12-21 12:10:36 -06:00
James Wang
c48ee7410d Add if "__name__" == "__main__" 2015-12-21 11:08:47 -05:00
Jacob Wood
15f408e9d9 Added routes we will need 2015-12-21 02:09:23 -05:00
Michael Zhang
e6b2e45848 basic setup 2015-12-21 01:04:00 -06:00