Commit graph

123 commits

Author SHA1 Message Date
Charles Truluck
6e538e221f Changed the selector
Also, I’m an idiot. (coming, not comming.)
2015-12-23 22:37:51 -05:00
CommanderStrax
6451720c48 Font-size and spelling 2015-12-23 21:35:53 -06:00
CommanderStrax
2ada6b75a2 Standardized placeholder color 2015-12-23 21:00:20 -06:00
CommanderStrax
9789d69851 Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2015-12-23 20:32:15 -06:00
CommanderStrax
05383ed0ae Added name input 2015-12-23 20:32:01 -06:00
James Wang
4bebf8dcf3 Add user login functionality 2015-12-23 21:30:55 -05:00
CommanderStrax
4da85d1662 Added reCAPTCHA keys 2015-12-23 20:25:07 -06:00
CommanderStrax
5e6efbf463 Added reCAPTCHA 2015-12-23 20:19:59 -06:00
CommanderStrax
71c893fd68 Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2015-12-23 20:12:09 -06:00
CommanderStrax
b676a1425a Added user type menu 2015-12-23 20:11:25 -06:00
James Wang
dc262f778a Begin work on user registration 2015-12-23 21:08:47 -05:00
CommanderStrax
782eecb70c Added email 2015-12-23 20:08:01 -06:00
Charles Truluck
64bd65b3ad Updated "about" and "login" pages
Sanitized the “about” and “login” page.
2015-12-23 20:44:40 -05:00
Charles Truluck
2cfe7ff5b5 I am stupid
Added submit button (which I can’t believe I forgot).
2015-12-23 20:38:11 -05:00
Charles Truluck
2ddd49a026 Updated "Register" page
Sanitized “register” page.
2015-12-23 20:36:03 -05:00
Charles Truluck
531a7c100f Fixed NavBar Floating 2015-12-23 20:20:07 -05:00
Charles Truluck
4ec9725813 Spiced up web/index.html ;)
Working on other pages styling
2015-12-23 20:15:18 -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
Charles Truluck
32ffc7e90f Added Semantic-UI
Added Semantic-UI
Changed pages to adapt to Semantic
2015-12-23 19:09:23 -05:00
CommanderStrax
a406add0d8 Made key pages bold 2015-12-23 18:04:34 -06:00
CommanderStrax
14a4c2251e Restored to previous version 2015-12-23 18:00:31 -06:00
CommanderStrax
8bf3b01218 Made admin dir/ js+css dirs 2015-12-23 17:36:16 -06: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
CommanderStrax
011eda51e1 Added basic naviagation 2015-12-23 17:03:33 -06:00
CommanderStrax
6e09d44228 Merge branch 'master' of https://github.com/failedxyz/easyctf 2015-12-23 16:54:25 -06:00
CommanderStrax
5fa59fbd3d Added color coding to test result 2015-12-23 16:53:41 -06:00
James Wang
fe367f664e Load api as blueprint within app.py 2015-12-23 17:53:00 -05:00
CommanderStrax
1574fb153b Merge branch 'master' of https://github.com/failedxyz/easyctf 2015-12-23 16:35:14 -06:00
CommanderStrax
c352c4b70e Setup/Test Angular.js 2015-12-23 16:34:22 -06: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
James Wang
f9da3c74b9 Calculate number of workers for gunicorn 2015-12-23 17:24:37 -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
489c5e596b i'm stupid 2015-12-23 00:52:15 -06:00
Michael Zhang
741ebc8ad3 added instructions 2015-12-23 00:49:28 -06:00
Michael Zhang
a1f2738dc8 fixed mysql auth issues 2015-12-23 00:40:32 -06: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
Thomas Gerot
b6800b5b47 Deleted Angular.js 2015-12-22 19:18:30 -06:00
James Wang
44cc24b1af Add mysql dependencies 2015-12-22 20:17:39 -05:00
CommanderStrax
b359b2653b Added a file of meta tags to include 2015-12-21 21:08:36 -06:00
Thomas Gerot
e83f848060 Added main pages 2015-12-21 17:16:57 -06:00