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 41c72c9022 Closes #327 (#335) 2017-08-06 20:09:12 -04:00
Kevin Chung c12544e87b Copy multi-modal.js from the admin panel (#334) 2017-08-06 19:45:20 -04:00
Kevin Chung 7aa6204116 Users should always be able to get their score, even if banned (#333) 
* Users should always be able to get their score, even if banned
* Fixing scoring logic when users haven't solved problems
* Hide None descriptions for awards
 2017-08-06 19:33:02 -04:00
Kevin Chung 59afb3d356 Adds more logging to auth.py (#317) 
* Adds more logging to auth.py. Closes #308
 2017-08-06 04:12:54 -04:00
Fariskhi Vidyan 62eb1b836c Only need to clear cache once in admin_plugin_config() (#324) 2017-07-26 11:10:06 -04:00
Fariskhi Vidyan 1ed0f4a32d Clear cache after set config in admin_plugin_config() (#323) 2017-07-25 11:03:13 -04:00
Kevin Chung 46e039ec50 Update README.md 2017-07-23 22:42:40 -04:00
Kevin Chung 1719b4b753 Update README.md 2017-07-23 11:28:58 -04:00
Kevin Chung bb49832c85 Update README.md 2017-07-23 11:28:15 -04:00
Kevin Chung d84cd305f8 Fixing scoring logic (#320) 
* fix inconsistent scoring: take awards into account in user.place() (#319)
* Adding tests
 2017-07-17 22:18:23 -04:00
Kevin Chung b900d1cb68 Fixes #315 (#316) 
CTFd creates the database instead of the docker-compose files which allows us to control encoding. Also adds a test for registering with a unicode team name.
 2017-07-16 02:50:32 -04:00
Owlz 5d35497f0c Environment var for UPLOAD_FOLDER (#314) 
It would be helpful to have the option to set the UPLOAD_FOLDER via environment variable. This change allows that.
 2017-07-15 18:01:22 -04:00
Kevin Chung 2e5c8a1adb Adding .dockerignore and making docker-entrypoint consider DATABASE_URL (#312) 2017-07-13 02:43:17 -04:00
Kevin Chung 92f130d5de Fixing large ip solves (#307) 
* Switching to using strings to store IP addresses because of the issues with storing them properly, Fixes #302, Fixes $306
* Only runs migrations when using a real database because SQlite is too inflexible to support migrations properly
* Removes calls to the ip helper functions but they can remain in case someone needs them in a plugin.
 2017-07-08 17:53:14 -04:00
Kevin Chung dea59a1bc8 Updating CHANGELOG 2017-07-01 14:18:23 -04:00
Kevin Chung 05a9641514 Marking 1.0.3 (#300) 2017-07-01 13:59:15 -04:00
Kevin Chung 7d5537e1df Adding SMTP sendmail unit test (#299) 2017-07-01 12:36:02 -04:00
Kevin Chung 95245d2ab5 Send confirmation emails on register and add button to resend email (#298) 
* Fixes #293
* Adding get_config/set_config test
 2017-07-01 01:37:08 -04:00
Kevin Chung f1e339c3dc Adding override_template function (#297) 
Purely for use by plugins to replace templates in an existing theme
 2017-06-27 21:09:38 -04:00
Josh Hofing 55a59fbf7a Add Tags as a CSS class on challenge boxes (#295) 
* Add Tags to challenge boxes on the chalboard
 2017-06-24 18:36:02 -04:00
Kevin Chung 5e98a9fbdc Making user facing graphs transparent (#294) 2017-06-20 14:39:05 -04:00
Kevin Chung b6ce783cfd Fixes unstyled Setup UI (#291) 
* Changing /static to /themes
* Adding test to make sure setup behavior works
 2017-06-18 18:54:20 -04:00
Kevin Chung 8628c724ab Rearranging some imports (#290) 
Fixes #289
 2017-06-18 12:30:49 -04:00
Andrew Meserole 81fe9c179f Fix Image Links in README (#288) 
Latest PR moving around the theme files broke the image links in the README.
 2017-06-18 11:51:12 -04:00
Kevin Chung 1bbd7feb23 Moving themes into a themes folder (#287) 
* Moving themes into a themes folder

This unifies themes under a themes folder which makes it easier to develop themes and install them.
 2017-06-18 02:13:50 -04:00
Kevin Chung c344ce314b Update README.md 2017-06-16 20:03:11 -04:00
Kevin Chung f0c44ed6d6 Upgrading exports (#283) 
* Upgrading export capabilities
* Only apply sqlite hacks for sqlite

This fixes #250, #246
Adds export.py to save CTFs without needing to actually spin up CTFd
Also forcing charset properly for MySQL
 2017-06-16 17:49:37 -04:00
Kevin Chung 34237e6292 Changes the default charset for MySQL (#282) 
This bug is actually quite sneaky and was breaking exports
 2017-06-16 15:32:09 -04:00
Kevin Chung e732e90661 Fixing hints glitches (#281) 
* Fixes #255
* Hints are automatically unlocked once the CTF is finished
* Don't provide hints if CTF hasn't started
 2017-06-16 15:25:05 -04:00
Kevin Chung 76852a587f Don't create a nonce config when adding configs from plugins (#280) 2017-06-14 14:42:34 -04:00
Kevin Chung ae45493e6e Giving config page more access (#279) 
* Giving a plugin's config page more control
* Adding utils to base

This potentially opens some risk to malicious plugins but really a
plugin would already have this capability given that it can run
arbitrary Python code.
 2017-06-14 13:57:46 -04:00
Kevin Chung 7bdfbfdd7f Adds basic search functionality for teams from the admin paenl (#278) 
* Fixes #189, #251
 2017-06-12 13:45:16 -04:00
Kevin Chung 5fc6c59245 Fixing theme switching (#277) 
Something in Flask 0.12 changed the behavior of Jinja templates. There
are a couple open issues about it
https://github.com/pallets/flask/issues/1907
 2017-06-10 14:01:32 -04:00
Kevin Chung 4fedc8f69e Design improvements (#276) 
* Fixes #269
* Adding tooltips to some admin content
* Switching from spaces to tabs in HTML files
* A variety of aesthetic improvements
 2017-06-10 00:11:27 -04:00
Kevin Chung 285b320ea5 Switching to netaddr because ip address parsing is hard (#275) 
This also re-adds Windows support
 2017-06-09 22:23:24 -04:00
Kevin Chung 280b100b8e Adding a markdown filter for Jinja2 (#272) 
In addition to adding markdown in Pages it makes sense to have a Jinja2 markdown filter for themes.
 2017-06-06 20:18:53 -04:00
Kevin Chung 202e8493b1 Give ip2long and long2ip ipv6 support (#271) 
Improved ipv6 support in the `ip2long` and `long2ip` helper functions
 2017-06-05 02:42:11 -04:00
Kevin Chung a833e8514c Remove --threads (#268) 
Should fix #266
 2017-06-03 17:43:46 -04:00
Kevin Chung 736a0e1dc3 Fixing some docker issues 
Closes #266
 2017-06-03 16:28:02 -04:00
Kevin Chung 6d9d03e35e Pages functionality improved (#267) 
* Pages now support Markdown
* Pages now have a preview tab
* Adding a media library to Pages
 2017-06-03 14:25:31 -04:00
Kevin Chung 59afacce69 Fixes #261 and generally supports Unicode better in Python 2 (#263) 
* Fixing #261 and improving Unicode in Python2
* Fixing PEP8 issues
 2017-05-21 12:43:31 -04:00
Kevin Chung 28f669be05 Update README.md 2017-05-16 02:43:34 -04:00
Kevin Chung d556bbf511 Update README.md 2017-05-16 02:25:11 -04:00
Kevin Chung c4cdb564c0 Update README.md 2017-05-16 02:11:23 -04:00
Kevin Chung 97b0aabfe1 Update README.md 2017-05-16 02:10:26 -04:00
Kevin Chung 0960ff6717 Adding scoreboard screenshot 2017-05-16 02:08:58 -04:00
Kevin Chung e16d3a0b6e General fixes and PEP8 enforcement (#258) 
* Fixing index page links when you deploy on a subdirectory

* Updating travis for pep8

* autopep8 with just formatting changes
 2017-05-12 00:34:20 -04:00
Kevin Chung b4d0d1ecab Fixes uwsgi deployment 2017-05-11 23:26:00 -04:00
Kevin Chung a10eec5688 Marking 1.0.2 2017-04-29 23:48:58 -04:00
Kevin Chung 135b714479 Some styling updates 2017-04-29 23:45:08 -04:00