Commit graph

145 commits

Author SHA1 Message Date
James Wang
3dc40ea3dc Fix file upload 2016-01-03 19:02:58 +00:00
James Wang
6e6c35a222 Minor fixes to problem updating 2016-01-03 18:12:07 +00:00
James Wang
e4392cf94e Implement problem updating for admins 2016-01-02 22:15:23 -05:00
James Wang
9d8e7ea919 Render problems for admin problem view 2016-01-02 20:01:30 -05:00
James Wang
2b34d3e486 Display problem point values 2016-01-02 19:45:45 -05:00
James Wang
499de76caa Display problems from database to problems.html 2016-01-02 19:40:28 -05:00
James Wang
53b4b10947 Redirect user upon successful login/registration 2016-01-02 14:49:52 -05:00
Thomas
f85b55e19b Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2016-01-02 13:43:25 -06:00
Thomas
d2322480c0 Deleted placeholder map 2016-01-02 13:42:47 -06:00
James Wang
44473e2fe6 Display items in the navbar when appropriate 2016-01-02 14:31:32 -05:00
Thomas
4517ef015c Added in interactive Google Map 2016-01-02 12:57:24 -06:00
Thomas
d47f6274d9 Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2016-01-02 12:45:47 -06:00
Thomas
668ebf8456 Started stats/status page 2016-01-02 12:44:51 -06:00
James Wang
9b50731b9b Use "danger" class instead of "warning" for error messages 2016-01-02 13:26:02 -05:00
James Wang
16733cc00a Use better method for displaying messages 2016-01-02 13:20:12 -05:00
Thomas
9b55132e08 Fixed dropdown menu focus color and border 2016-01-02 11:26:36 -06:00
Thomas
c38948121a Formatted rules and retype first section 2016-01-02 01:51:57 -06:00
Thomas
7a40fcc1e4 Added new fake problem and hint btn 2016-01-02 00:51:17 -06:00
Thomas
5767d9cc93 Added point value to problems page 2016-01-02 00:31:33 -06:00
Thomas
e7cba75d0c Realized inconsistant formatting in files 2016-01-02 00:25:30 -06:00
Thomas
36934077c8 Reformatted file container format 2016-01-02 00:21:17 -06:00
Tillson Galloway
245cae5f81 Merge branch 'master' of https://github.com/failedxyz/easyctf 2016-01-02 01:01:50 -05:00
Tillson Galloway
03ef13ade0 Lets not use obsolete <center> tags 2016-01-02 01:01:34 -05:00
Thomas
16542051a3 Added in the missing file. 2016-01-01 23:58:51 -06:00
Tillson Galloway
547307ec9c Problems page changes 2016-01-02 00:51:56 -05:00
Tillson Galloway
42ccc3cc5e Merge 2016-01-02 00:43:25 -05:00
Tillson Galloway
4315987ef0 Navbar dropdown for problems and use font awesome for symbols 2016-01-02 00:42:09 -05:00
Thomas
48c8a72438 Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2016-01-01 23:23:01 -06:00
Thomas
d9c16f2830 Added C3js scoreboard with fake teams 2016-01-01 23:22:06 -06:00
Thomas
0901f05cca Added C3js scoreboard with fake teams 2016-01-01 23:21:27 -06:00
James Wang
aa208c4d15 Add problem solve functionality 2016-01-02 00:15:29 -05:00
Thomas
f412840df8 Lightened Background 2016-01-01 21:05:28 -06:00
Thomas
f2a3bb3dae Cleaned meta content 2016-01-01 20:57:40 -06:00
CommanderStrax
47b97255f8 Added icons (pls fix right side) 2016-01-01 14:41:21 -06:00
CommanderStrax
3649834b40 Added icon images for nav bar (still need to be inserted) 2015-12-30 23:39:26 -06:00
CommanderStrax
878fe1cc1b Added countdown on home page 2015-12-30 23:09:12 -06:00
CommanderStrax
95aa94f965 Prepped Submission Page 2015-12-30 00:56:42 -06:00
CommanderStrax
f90ddc7dc0 Edited register page 2015-12-27 18:23:59 -06:00
CommanderStrax
84ea7f1e1a Completely Fixed Twitter Timeline Embed 2015-12-27 17:11:30 -06:00
CommanderStrax
64784a57d8 Added tweets to update page 2015-12-27 16:39:24 -06:00
CommanderStrax
63caee14be Updated admin submission to include files 2015-12-27 16:30:28 -06:00
Charles Truluck
d4465b988d refined some things, also did the following:
I did:
- Misc Pages on README.md
- Added an example file in Problems
- rounded the Chat page
2015-12-27 16:54:50 -05:00
CommanderStrax
07403199d0 Added admin submission page 2015-12-27 14:46:17 -06:00
CommanderStrax
aa94a78a0a Changed theme of IRC client 2015-12-27 13:51:14 -06:00
CommanderStrax
dbde6193c1 Added in IRC Client to chat.html 2015-12-27 13:43:22 -06:00
Charles Truluck
5ab1e059c4 Fade-in for page load? Maybe? 2015-12-26 23:50:52 -05:00
Charles Truluck
8a263f4f90 Added rules/prizes, sanitized other things. 2015-12-26 22:30:44 -05:00
Charles Truluck
5b1c46e63c Added multiple pages and changed look/feel 2015-12-26 13:06:17 -05:00
Charles Truluck
c55d196eae Added Chat and Updates
Still need an iframe for irc
2015-12-26 01:48:46 -05:00
Charles Truluck
18be30194b Added a scoreboard 2015-12-26 01:36:55 -05:00
Charles Truluck
c744f44a37 Converted from Semantic-UI to Bootstrap 2015-12-26 00:01:19 -05:00
Michael Zhang
b7d4196e1b angular routing 2015-12-24 21:38:00 -06:00
James Wang
2680034587 Add interface for registering 2015-12-24 20:37:49 -05:00
James Wang
d62415b513 Link login front and back ends 2015-12-24 19:57:58 -05:00
CommanderStrax
87500e59b9 Cleaned content 2015-12-24 11:29:02 -06:00
CommanderStrax
b284096bba Readded about content 2015-12-24 11:27:23 -06:00
Michael Zhang
16cfe158bc new login form 2015-12-24 10:49:08 -06:00
Michael Zhang
614b4fd1c6 got rid of extraneous html files 2015-12-24 10:44:46 -06:00
Michael Zhang
a87c5da98c added some content 2015-12-24 10:42:44 -06:00
Michael Zhang
c68ed41bfb added some content 2015-12-24 10:36:32 -06:00
CommanderStrax
aa997b6691 Cleaned and copied HTML 2015-12-24 10:04:12 -06:00
CommanderStrax
2b5e3f98be Added Content 2015-12-24 00:32:33 -06:00
Michael Zhang
1a7e0d7971 remove components 2015-12-23 23:30:28 -06:00
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
CommanderStrax
63dddf2488 Added notice to registration page 2015-12-23 22:51:21 -06:00
CommanderStrax
564a44ef61 Reworded registration options 2015-12-23 22:48:41 -06:00
CommanderStrax
eb95fea8ff Merge branch 'master' of https://www.github.com/failedxyz/easyctf 2015-12-23 22:39:49 -06:00
CommanderStrax
5e38e44aa0 Rebulked the About page 2015-12-23 22:39:30 -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
41f5e34aa6 Link registration 2015-12-23 23:04:37 -05:00
Charles Truluck
e92a343590 Added components, account page, etc.
Should have added components a long time ago.
2015-12-23 23:00:11 -05:00
Michael Zhang
861531b5fe testing navbar 2015-12-23 21:51:42 -06:00
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
05383ed0ae Added name input 2015-12-23 20:32:01 -06:00
CommanderStrax
5e6efbf463 Added reCAPTCHA 2015-12-23 20:19:59 -06:00
CommanderStrax
b676a1425a Added user type menu 2015-12-23 20:11:25 -06: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
Charles Truluck
32ffc7e90f Added Semantic-UI
Added Semantic-UI
Changed pages to adapt to Semantic
2015-12-23 19:09:23 -05: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
CommanderStrax
011eda51e1 Added basic naviagation 2015-12-23 17:03:33 -06:00
CommanderStrax
5fa59fbd3d Added color coding to test result 2015-12-23 16:53:41 -06:00
CommanderStrax
c352c4b70e Setup/Test Angular.js 2015-12-23 16:34:22 -06:00
Michael Zhang
5ba6479171 connect flask API with nginx 2015-12-23 13:49:31 -06:00
Michael Zhang
a99b68c04e added basic database stuff 2015-12-23 00:26:27 -06:00
CommanderStrax
b359b2653b Added a file of meta tags to include 2015-12-21 21:08:36 -06:00