Commit Graph

237 Commits

Author SHA1 Message Date
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
Kevin Chung
be6430be4f Allowing admins to preview challenge board 2015-05-09 23:33:20 -04:00
CodeKevin
1e445791d1 Properly download files from admin panel 2015-05-03 17:40:18 -04:00
CodeKevin
aa77e61b3f Download files from admin panel 2015-05-03 17:35:55 -04:00
CodeKevin
b8518b7e26 Merge branch 'master' of https://github.com/isislab/CTFd 2015-05-03 17:26:14 -04:00
CodeKevin
f63b894258 Preventing team name changes 2015-05-03 17:25:59 -04:00
Kevin Chung
44df12550a Removing extra checkbox 2015-04-19 18:39:09 -04:00
CodeKevin
5e24fba459 Closes #16 2015-04-19 04:24:48 -04:00
Kevin Chung
4319af3b0d Merge pull request #30 from bburky/installation-fixes
Update installation scripts
2015-04-01 23:13:03 -04:00
Kevin Chung
561e5a61d2 Merge pull request #31 from bburky/mailgun
Fix Mailgun from address
2015-03-21 22:38:36 -04:00
Blake Burkhart
3cc62b3103 Fix Mailgun from address
Use the app.config['ADMINS'][0] address as the from address in Mailgun messages.

TODO: This email address should probably be configurable in the admin settings.
2015-03-21 21:06:15 -05:00
Blake Burkhart
0125be9403 Update installation scripts
Install libffi-dev in prepare.sh. Bcrypt seems to depend on this.

Add exact versions for all packages in requrements.txt
2015-03-21 20:40:57 -05:00
Kevin Chung
4d62a1dbcc Update README.md 2015-03-20 03:22:32 -04:00
CodeKevin
ac83c8a576 Fixing DOM XSS issues, upload issues, and usability issues 2015-03-16 16:03:58 -04:00
CodeKevin
95e015abe6 Proper custom CTF name
I should have better pushing habits
2015-03-15 15:03:16 -04:00
CodeKevin
0179fa7115 Custom CTF Name 2015-03-15 14:55:50 -04:00
CodeKevin
c26d0924bf Fixing XSS issue for users 2015-03-15 14:44:47 -04:00
CodeKevin
a0d3a1e640 Fixing XSS issue 2015-03-15 14:42:31 -04:00
CodeKevin
a499f8c731 Adding favicon for non-admins 2015-03-15 04:23:16 -04:00
CodeKevin
8334c15f98 Adding favicon 2015-03-15 04:19:58 -04:00
CodeKevin
d09d0a9678 Closes #21 2015-03-15 04:18:39 -04:00
CodeKevin
eced601485 Updating logo 2015-03-15 02:39:32 -04:00
CodeKevin
5f4a670b7a Removing debug print statement 2015-03-15 00:28:12 -04:00