Commit Graph

959 Commits

Author SHA1 Message Date
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
Kevin Chung
02a5810049 Adding 502 error handling 2015-06-28 20:55:39 -04:00
Kevin Chung
0f11765499 Merge pull request #43 from slinkymanbyday/view_challs_after
View challs after
2015-05-29 15:28:26 -04:00
Kevin Chung
34273de55e Reverting last change and actually fixing bug 2015-05-29 15:22:13 -04:00
Kevin Chung
10f6c0498a Merge branch 'master' of https://github.com/isislab/CTFd 2015-05-29 14:42:46 -04:00
Kevin Chung
0285b858e9 Password updating without entering entire profile 2015-05-29 14:42:20 -04:00
Sean Meyer
68e99b9084 Fix label for checkbox 2015-05-20 09:59:07 +08:00
Sean Meyer
58d265a4d0 Merge branch 'master' of https://github.com/isislab/CTFd into view_challs_after
Conflicts:
	CTFd/admin.py
	CTFd/challenges.py
2015-05-20 09:57:04 +08:00
Sean Meyer
5a8211ea6d View after CTF 2015-05-20 09:51:27 +08:00
Kevin Chung
b3071e34d9 Merge pull request #39 from slinkymanbyday/max-tries
enable max-attempts per challenge setting
2015-05-19 15:00:56 -04:00
Sean Meyer
18ddd1eeec Key submission now stored. Correct key submissions can be deleted. 2015-05-19 13:52:15 +08:00
Sean Meyer
f660a760e6 view incorrect/correct key submission interfaces 2015-05-19 11:55:41 +08:00
Kevin Chung
d413ca69b6 Merge pull request #40 from slinkymanbyday/fix-stats
fix least solved challenge statistic
2015-05-18 00:34:15 -04:00
Sean Meyer
d9394eda53 fix least solved challenge statistic 2015-05-18 12:25:38 +08:00
Kevin Chung
683ec198c4 Merge pull request #38 from slinkymanbyday/delete-pages
Closes #32
2015-05-17 23:48:27 -04:00
Sean Meyer
db687b6c25 enable max-attempts per challenge setting 2015-05-18 11:31:43 +08:00
Sean Meyer
da2537ff3b Admins can delete pages 2015-05-18 10:35:10 +08:00
Kevin Chung
945e2148be Don't insert current time into graph 2015-05-16 01:45:26 -04:00
Kevin Chung
be9c93adb4 Fixing odd top ten issue 2015-05-16 01:34:52 -04:00
Kevin Chung
c4ed177255 Faster moving graphs 2015-05-13 18:34:14 -04:00
Kevin Chung
add67db4d2 Graph looks a little better 2015-05-13 17:48:37 -04:00
Kevin Chung
65ae712c68 Accidentally still using old password hashing in forgot password 2015-05-13 13:07:46 -04:00
Kevin Chung
3a2323b0ae Fixing password changing issue 2015-05-13 13:03:48 -04:00