JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
859 Commits
36 Branches
35 Tags
16 MiB
Commit Graph

859 Commits (fix-invalid-session-situation)

Author SHA1 Message Date
Kevin Chung 770d7f5809 Merge pull request #91 from Bird101/master 
Fixed scoreboard show graph bug
 2016-02-17 00:08:00 -05:00
Bird101 704c4144e7 Fixed scoreboard show graph bug 2016-02-17 12:39:22 +08:00
Kevin Chung e02d3c9010 Merge pull request #90 from Bird101/master 
Add nonce element in admin/login.html
 2016-02-16 11:16:21 -05:00
Bird101 2b4ccffe1b add nonce element 2016-02-16 18:44:17 +08:00
Kevin Chung 49180438c3 Merge pull request #89 from delta24/master 
Fixed time rendering in the team page (admin view)
 2016-02-16 01:49:56 -05:00
delta24 3f13b15513 Fixed time rendering in the team page (admin view) 2016-02-16 10:30:56 +05:30
Kevin Chung 0fedb814a5 Update README.md 2016-02-10 13:34:28 -05:00
Kevin Chung a7ee79f08b Update README.md 2016-02-10 13:34:08 -05:00
Kevin Chung fe2abca911 Closes #88 2016-02-08 17:52:01 -05:00
Kevin Chung 6640f591de Closes #87 2016-02-08 17:19:55 -05:00
CodeKevin d3e2838828 Closes #87 2016-02-08 09:10:18 -05:00
CodeKevin 5622046d8e Updating momentjs 2016-02-07 19:18:49 -05:00
CodeKevin 2ed2d4d33e This closes #75, #24 2016-02-07 16:34:46 -05:00
CodeKevin 3d0a3f0824 Improve teams page on mobile and correcting populate.py 2016-02-07 05:09:21 -05:00
CodeKevin 023d81cb92 Fixing teams page slightly 2016-02-07 03:26:01 -05:00
CodeKevin b6b9e30e39 Fixing mobile challenge view 2016-02-07 03:15:41 -05:00
CodeKevin 1c90ecccf7 Fixing default index page 
Setting index page at setup should probably be removed...
 2016-02-07 00:06:53 -05:00
CodeKevin 115f2a473a Fixing logo on mobile 2016-02-07 00:00:05 -05:00
CodeKevin 54d26560e5 Fixing selection in challenge modal 2016-02-06 21:05:52 -05:00
CodeKevin fc64dfc132 Expanding IP address tracking 2016-02-06 16:25:35 -05:00
CodeKevin 1dcba3a264 Fixing CSRF issues and expanding trusted proxies to local network 2016-02-06 15:38:14 -05:00
CodeKevin c336ad6fd1 Committing get_ip() 2016-02-06 15:08:39 -05:00
CodeKevin 85e8a9d271 Closes #61, #85 
Whitelist localhost
 2016-02-06 15:05:49 -05:00
CodeKevin 0c9a4f0283 Adding better pagination for wrong/right key pages 2016-02-06 13:59:20 -05:00
CodeKevin 46413ba6ae Removing accidental admin links 2016-02-06 13:20:12 -05:00
CodeKevin 3841322e2d Challenge tags now work 2016-02-05 23:18:36 -05:00
CodeKevin a4b39a1eb5 Replacing C3 with plotly 2016-02-05 22:50:36 -05:00
CodeKevin ad3c3c13b1 Improved pagination and renaming main-style.css 2016-02-05 20:59:47 -05:00
CodeKevin 9c1f1696ec Closes #82 2016-02-05 20:44:03 -05:00
CodeKevin 44d1ea300b Allowing for deletion of solves and wrong keys 2016-02-05 19:29:44 -05:00
Kevin Chung 0615b1e510 Merge pull request #83 from Hypersonic/master 
Don't make current page id a link on Teams page
 2016-02-05 13:03:08 -05:00
Josh Hofing 2b8f5c25cb Don't make current page id a link on Teams page 2016-02-05 13:00:31 -05:00
Kevin Chung baca032aec Fixing some more style issues 2016-02-05 02:00:52 -05:00
Kevin Chung 0350544d59 Fixing some more style issues 2016-02-05 01:47:35 -05:00
Kevin Chung 7be847576a Fixing some style issues 2016-02-05 01:42:53 -05:00
Kevin Chung 43b6512b7e Closes #81 2016-02-04 10:56:46 -05:00
Kevin Chung 3997446aeb Fixing correct keys page 2016-02-03 12:13:03 -05:00
Kevin Chung 95f6d6b202 Merge pull request #80 from frohoff/fixes 
fix for lowercase comparison bug
 2016-02-02 12:30:28 -05:00
Chris Frohoff d5f3f369bf fix for lowercase comparison bug 2016-02-02 09:19:08 -08:00
Kevin Chung b235cda74f Update README.md 2016-02-02 11:40:26 -05:00
Kevin Chung 4e81ecba3e Merge pull request #78 from breadchris/master 
Updated CTFd UI to look nicer
 2016-02-02 11:39:27 -05:00
Christopher Thompson b501561551 Updated CTFd UI to use Bootstrap; makes viewing and adding challenges 
much more visually appealing
 2016-02-01 22:31:07 -05:00
CodeKevin ac6e5b8c4f Replacing hardcoded redirects with url_for() 2016-01-08 21:28:59 -05:00
CodeKevin 23d9a57809 Closes #73 2016-01-08 21:28:58 -05:00
Kevin Chung 841b206d36 Merge pull request #74 from mark-ignacio/docker-compose 
Docker Compose containerization
 2016-01-08 21:12:28 -05:00
Mark Ignacio 1f1fbbf585 Docker Compose files and adjustments 2016-01-08 21:01:55 -05:00
Kevin Chung b8746e22bf Revert "Updating Dockerfile" 
This reverts commit 1fb8679707.
 2016-01-03 05:33:26 -05:00
Kevin Chung 1fb8679707 Updating Dockerfile 2016-01-03 05:26:19 -05:00
CodeKevin 0e30058783 Closes #69 2015-11-25 00:39:34 -05:00
Kevin Chung e1584f2ac6 Temporary fix for #67 2015-11-24 13:10:32 -05:00