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

478 Commits (b78589d20de4abf97067c3b1c1cbfe72b498f616)

Author SHA1 Message Date
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
Kevin Chung ad44018a1b Fixing footer pulldown 2017-04-28 19:36:01 -04:00
Kevin Chung 17afc9e2f2 Adding empty folders 2017-04-28 18:48:46 -04:00
Kevin Chung 16d98fde65 Fixing team deletion 2017-04-28 18:23:23 -04:00
Kevin Chung cf3e5cbbbd Adding link back and social detail 2017-04-28 02:36:16 -04:00
Kevin Chung c493329bf8 Extract files during import_ctf 2017-04-26 23:58:51 -04:00
Kevin Chung 8af911b745 Add import.py script 2017-04-26 22:46:06 -04:00
Kevin Chung 3488baf504 Fixing tag submission 2017-04-24 19:25:20 -04:00
Björn Kimminich ebd303a920 Use headlines in README (#249) 
+ legibility
+ ability to link to section anchors directly
 2017-04-20 19:27:16 -04:00
Kevin Chung ad34dbf970 Fixing key updating 2017-04-20 17:59:45 -04:00
Kevin Chung 4795a9e742 Fixing key editting 2017-04-20 16:59:43 -04:00
Kevin Chung f4d766473d Import export (#244) 
* Adding dataset and export function

* Removing unnecessary print

* First try at import_ctf

* Adding UI components

* First successful export and import

* Importing configs

* Alerting response for now
 2017-04-14 02:53:36 -04:00
Kevin Chung 80575e98fe Fixing preview height 2017-04-09 02:31:59 -04:00
Victor "Nate" Graf 3add93a172 fixed an eror in admin chllenge modals naming (#242) 
Although the code worked, I accidentally included a pull of an
empty file. This commit fixes that mistake
 2017-04-09 01:55:56 -04:00
Kevin Chung f07a39c343 Updating Docker files 
Thanks @erasche for these changes from PR #204.
 2017-04-08 17:35:18 -04:00
Kevin Chung aa21a3c161 Fix chal deletion (#241) 
* improving get_config
* Fixing challenge deletion
* Puts challenge deletion under utils.delete_file
 2017-04-08 03:29:11 -04:00
Kevin Chung b2fc5a6fcd improving get_config (#240) 2017-04-08 02:51:28 -04:00
Kevin Chung 72f7eeb0a4 Adds delete_file util (#239) 2017-04-08 01:34:22 -04:00
Victor "Nate" Graf fd22ef98dc challenge update modal is now replaceable (#236) 
* challenge update modal is now replaceable

By defining
* [type]-challenge-update.hbs
* [type]-challenge-modals.hbs
* [type]-challenge-update.js

in the /static/admin/js/templates/challenges/[type] folder the
challenge update modal will be defined for any challenges of
the given type. This allows for essentially full customizability
of how you will edit custom challenge types in the admin UI.

The reason for having two files, *update.hbs and *modals.hbs, is
that *update.hbs defines the body for the main challenge update
modal, while *modals.hbs defines any additional modals which will be
used within the main modal

There is one function which is required in *update.js is
`openchal(id)` which will be passed the id of the challenge to be
edited and should open the modal as well as load any needed data

* fixed multi-modal issues

Issues were coming from two sources:
* I had placed the modals in an indirect relationship in the DOM
  tree. They need to be siblings I now see
* There was double counting of modals within multi-modal.js. This
  only started to appear with the dynamically loaded modals. I
  fixed the script to accurately count modals each time
 2017-04-08 01:20:22 -04:00
Kevin Chung b027703f80 Fixing hiding challenges unintentionally 2017-04-04 03:48:55 -04:00
Kevin Chung 98071c1874 Passes management of the description to the js template 2017-04-01 16:43:41 -04:00
Kevin Chung f48a0cdacd Hints (#232) 
* Switching to Flask-Migrate to create tables/database. Adding Hints & Unlocks.
* Adding db.create_all call for sqlite db's (sqlite is not properly handled with alembic yet)
* Python 3 testing works properly with 3.5
* Adding admin side of hints
* Hints are viewable for users
 2017-03-28 21:17:56 -04:00
Rakha Kanz Kautsar 9a9b775e57 add scoreboard freeze (#208) 
* add scoreboard freeze

* delete excess div close tag

* filter out scores from team page when scoreboard freezes

* allow teams to see their full score and solves in team page

* fix unset place and score

* change parameter and filter out /solves for graph

* fix utils methods undefined

* add small notice about frozen scoreboard and resolve failing tests

* Update __init__.py

* Update scoreboard.py
 2017-03-25 01:37:37 -04:00
Kevin Chung a3a7d75ae8 Plugins enhanced utils (#231) 
* Updating utils functions to be monkey patchable

* Also fixing a team email update issue

* Adding more tests
 2017-03-22 20:00:45 -04:00
Kevin Chung ede7f1bad2 Update README.md 
Links to new repo location
 2017-03-12 20:14:13 -04:00
Kevin Chung 06d0e00cf5 Fixes Python 3 compatibility for testing (#230) 
* Testing 3.6

* Fixing Python 3 testing

* Fixing both kinds of tests :)

* PEP8 lint project and add linting checks to build process (#229)

* Revert "PEP8 lint project and add linting checks to build process (#229)"

This reverts commit 15d89d2b66030cdc2a6276b0a73acaa4912c06ab.
 2017-03-12 19:53:26 -04:00
Kevin Chung 57de89fc57 Removing functionality from the update keys button 
This makes the button do nothing but ultimately the issue is that the
buttons should automatically update the database through AJAX or
similar. This is a temporary fix so the Keys modal isn’t an outlier in
design and doesn’t cause an error.
 2017-03-12 11:12:44 -04:00
mschwager 7cbbeb0843 Fix undefined variable (#228) 2017-03-10 11:19:27 -05:00
Kevin Chung 15171f1140 setup now automatically logs in 2017-03-10 11:12:58 -05:00
Kevin Chung 967129a009 Closes #225 
Also removes unnecessary pip install from travis config
 2017-03-10 01:17:17 -05:00
Kevin Chung 613ede5738 Max attmpts (#227) 
* Making max_attempts use the Challenge value instead of the Config value
 2017-03-09 23:47:08 -05:00
mschwager 92c7f2e293 Added CI integration with Travis-CI (#226) 
Next steps:

* Go to https://travis-ci.org/
* Click "Sign in with GitHub"
* Click your user icon and click "Accounts"
* Enable for CTFd
 2017-03-09 22:00:01 -05:00