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

131 Commits (9c1f1696ec92cef97a7e76c7079f22253cc3206e)

Author SHA1 Message Date
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
CodeKevin 40e52fb630 Switch Dockerfile to Alpine Linux 2015-11-17 21:32:16 -05:00
Kevin Chung b89a8f17e1 Adding gunicorn 2015-11-17 21:24:10 -05:00
CodeKevin 81345dc6d2 Auto-generate secret key and fixing challenge modal 2015-11-17 19:46:44 -05:00
CodeKevin e659775e0d Closes #70 2015-10-30 22:38:00 -04:00
Kevin Chung 11b9039fa1 Update Dockerfile 2015-10-20 15:35:51 -04:00
Kevin Chung 1d8748d5c4 Closes #26 2015-10-10 21:11:21 -04:00
Kevin Chung f59e497d04 Merge branch 'master' of https://github.com/isislab/CTFd 2015-10-10 21:09:47 -04:00
Kevin Chung df21544f13 Supports PY3, refinements to chal editor and viewer, model changes to resolve issues 2015-10-10 21:09:25 -04:00
CodeKevin 09594892f9 Closes #59 2015-10-05 00:35:23 -04:00
Kevin Chung 8f0f4341ae Merge pull request #57 from remasis/master 
Change setup template text to use new `/login` URL instead of the `/admin` URL
 2015-10-02 15:27:40 -04:00
Corey Thuen 55cd07d06e change setup template text to use new /login url instead of /admin login 2015-10-02 10:14:58 -05:00
Kevin Chung 5c42a99885 Merge pull request #56 from remasis/master 
Fix incorrect variable names in admin.py
 2015-10-02 11:06:38 -04:00
Corey Thuen 9db09ee609 fix setup bug w/ variable name typo 2015-10-02 09:22:11 -05:00
CodeKevin 00e8bf1fc2 Closes #53 
Not sure where or if this fix will break but should suffice.
 2015-09-24 23:56:46 -04:00
CodeKevin 478973b4f5 Fixing file deletion 2015-09-22 23:38:26 -04:00
CodeKevin 77c14653b5 Closes #54 2015-09-22 23:23:25 -04:00
Kevin Chung ff58ef181a Supports PY3, refinements to chal editor and viewer, model changes to resolve issues 2015-09-17 14:13:53 -04:00
CodeKevin 806effdbd9 Closes #51 
Thanks @JTWorks!
 2015-09-17 02:31:58 -04:00
CodeKevin f335dd71f2 Closes issue #52 2015-09-16 23:48:45 -04:00
Kevin Chung bd4bd96ce0 Merge pull request #50 from ajvpot/master 
Fix authentication for certain admin actions
 2015-09-14 22:41:59 -04:00
ajvpot 9578355143 Fix authentication for certain admin actions 2015-09-14 21:35:12 -05:00
Kevin Chung 310d6b8071 Update README.md 2015-09-14 02:32:48 -04:00
CodeKevin 7d766372df Bugfixes and architectural changes 
Moved some folders around, starting to remove subdomain handling,
blueprints, custom css, removed digital ocean interface, fixed some bugs
 2015-09-13 23:55:22 -04:00
Kevin Chung 5f6e610f2d Merge pull request #49 from gusnaughton/master 
Fully automate prepare.sh
 2015-09-13 22:44:51 -04:00
Gus Naughton 91a862e738 Fully automate prepare.sh 2015-09-13 22:43:23 -04:00
Kevin Chung 4c0ea9b760 Merge pull request #42 from slinkymanbyday/view_keys_interface 
view incorrect/correct key submission interfaces
 2015-09-13 20:43:38 -04:00
Kevin Chung 1685a528b8 Fixing view CTF after end and making it less confusing 2015-09-10 22:12:41 -04:00
Kevin Chung a17016416e Merge branch 'master' of https://github.com/isislab/CTFd 2015-06-28 20:56:01 -04:00