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

845 Commits (bulk-clear-sessions)

Author SHA1 Message Date
Kevin Chung 5821bad388 Seperating admin and original themes 
Also fixing a bug in setting end times
 2016-11-19 18:38:45 -05:00
Kevin Chung 4f5a0c912e Adding UI for admins to confirm users manually 2016-11-15 01:18:38 -05:00
Kevin Chung dbbd5a87ed Update README.md 
HTTPS is for winners
 2016-11-14 22:21:41 -05:00
JP Smith a27afd91c1 Update confirm.html (#165) 2016-11-11 21:02:29 -05:00
Kevin Chung 04d47d1d54 CTFTime configuration setting improvements 
Thanks MomentJS!
 2016-11-11 05:41:44 -05:00
Kevin Chung f1bf2fd4e5 Streamlining docker-compose process 2016-11-10 15:35:59 -05:00
Kevin Chung 70e7599439 Adding init_plugins (example plugin soon) 
Also fixing an issue in the docker functions
 2016-11-05 02:28:43 -04:00
Kevin Chung 52ad396db4 Adding file handler 2016-11-05 00:54:21 -04:00
Kevin Chung 11e3ef66b4 Fixing view challenges before CTF started if view_after_ctf is enabled 2016-11-04 21:02:27 -04:00
Kevin Chung a6f641dda3 Don't create two sqlite dbs 2016-11-04 00:37:41 -04:00
Kevin Chung 332bd656fd Fixing award deletion 2016-11-03 23:48:49 -04:00
Kevin Chung 19ed51421a Fixing award deletion 2016-10-25 23:15:47 -04:00
Kevin Chung f4fec18f44 Handling situation with no solves 2016-10-25 22:41:31 -04:00
Kevin Chung 3f596d87b1 Fixing a variety of glitches 
Fixing statistics reporting banned users as well
Fixing url encoding and some error messages
Ordering solves in the admin graphs
Removing banned users (includes admins) from public teams page
Fixing email regex in profile
 2016-10-20 23:31:24 -04:00
Kevin Chung 92f9d93bf9 Update LICENSE 2016-10-14 00:54:42 -04:00
Kevin Chung 0f541a5b3b Accidentally broke graphs for public viewing 2016-09-28 20:40:20 -04:00
Kevin Chung c81281f859 This is the best fix for #157 
so many tries :(
 2016-09-27 23:55:31 -04:00
Kevin Chung 10ef13e9d5 Causes some history glitches 2016-09-27 22:16:26 -04:00
Kevin Chung 9cf8dbf8ad Improving fix for #157 2016-09-27 22:10:35 -04:00
Kevin Chung 60bb118e16 Closes #157 2016-09-27 21:54:22 -04:00
Kevin Chung f1a63e18a7 Fixing ctf_ended function 2016-09-26 11:41:11 -04:00
Kevin Chung 71833c8913 Fixing wrong keys team link 2016-09-25 13:45:34 -04:00
Kevin Chung a49c4e6761 Properly fixing mailfrom_addr 2016-09-25 13:40:18 -04:00
Kevin Chung fc903dbff3 Properly setting mailfrom_addr 2016-09-25 13:29:28 -04:00
Kevin Chung 0bba203491 Fixing mail from address input 2016-09-25 13:26:07 -04:00
Kevin Chung cba7898c63 Fixing mailgun form and fixing import flask_caching 2016-09-25 13:18:40 -04:00
Kevin Chung 50043b42c5 Merging changes from various forks 
Until v1 is released all changes are fair game.

Caching support
Fixes for decoding confirmation and reset_password email tokens
Starting work on #154 specifying why challenges are not open
Adding a required parameter to HTML to sort of fix #153
Adding a column to specify when a team registered
Check static key by default in new key
Decreasing capability of pages functionality to address security
concerns
Fixing confirmations restrictions by modifying can__view_challenges()
 2016-09-24 17:56:07 -04:00
Kevin Chung 92ebd88025 Fixing scrolling issue and updating vendor JS 2016-09-19 02:41:18 -04:00
itsZN 1780a913e5 Fix deleting wrong keys from admin panel (#151) 
* Fix deleting wrong keys from admin panel

- Fixed wrong_keys.html template using WrongKeys.team instead of
  WrongKeys.teamid
- Added the id of the wrong key to the wrong_keys.html template entries
- Changed /admin/wrong_keys to only take the key id instead of team and
  challenge id, to allow deleting the intended key when a team has more
  than one wrong key for a challenge. (Previously it would delete only
  the first wrong key entry for that challenge)

* Have delete_wrong_key use first_or_404

- Switched first() for first_or_404()
- Changed javascript variable to use underscores instead of camelCase

* Fixing other endpoints which use the deletion interface
 2016-09-13 21:08:15 -04:00
Thomas Chauchefoin 07bfe5eab7 Fix MySQL availability tries counter (#150) 
The variable `i` was not declared and never incremented.
 2016-09-13 19:34:06 -04:00
Kevin Chung 2115e9c005 Fixing time issues in #103 2016-09-13 03:10:48 -04:00
Josh Hofing 9860c8dc78 Actually paginate the teams page, instead of only ever showing the first page of teams (#142) 2016-08-23 00:36:41 -04:00
Kevin Chung 831a959d39 Reversing routes 2016-08-18 18:09:13 -04:00
Kevin Chung dc7145e2dd Fixing privelege escalation due to new model default 2016-08-18 17:49:57 -04:00
wangxiyu191 59a8becd45 fix count in get_standings doesn't work (#132) 2016-08-15 21:31:44 -04:00
snurilov 732278587a Closes #138. (#139) 
Closes #138.
 2016-08-12 17:55:31 -04:00
Kevin Chung a4e51fcc76 Closes #136 2016-08-09 17:19:05 -04:00
Kevin Chung afbd4b5f8a Organizing mailserver code better, fixing default flask server issues, and fixing modal issues 2016-07-29 12:53:32 -04:00
wangxiyu191 431fab0520 fix reset_password show twice in reset email (#134) 
it made something like  http://localhost:4000/reset_password/reset_password/Ilx1MzA1NVx1MzA0Zlx1MzA4OVx1ODM1OCIuQ25zSEN3LlVxRlBxUzB4clR6QzdkREdaR2hBLWIz
Y1FRcw==

it should be http://localhost:4000/reset_password/Ilx1MzA1NVx1MzA0Zlx1MzA4OVx1ODM1OCIuQ25zSEN3LlVxRlBxUzB4clR6QzdkREdaR2hBLWIz
Y1FRcw==
 2016-07-28 23:43:55 -04:00
wangxiyu191 70a0245e89 fix DetachedInstanceError on /admin/statistics (#133) 
see http://stackoverflow.com/questions/15397680/detaching-sqlalchemy-instance-so-no-refresh-happens
 2016-07-28 00:00:45 -04:00
Kevin Chung 011e2c33c3 Update README.md 2016-07-22 02:46:57 -04:00
Kevin Chung b05f6152d3 Custom themes (#131) 
* Adding preliminary custom themes

* Fixing Windows compatibility

https://github.com/pallets/jinja/issues/411

* Fixing template reloading and adding UI to change themes

* Explicitly closing db connections

* Themes now have custom static folders

* Closes #128
 2016-07-22 02:46:14 -04:00
Robert Blair Mason Jr e31b502729 Various small fixes (#126) 
1.  Fix the deprecation warnings by changing from flask.ext.$name to flask_$name
2.  Be consistent with import style in admin.py
3.  Fix a residual script_root fix
4.  Store IPs in 32 bits again
 2016-07-03 13:53:17 -04:00
Robert Blair Mason Jr 6b2257236f Allow CTFd to run with script_root != '/' and PostgreSQL (#125) 
Also, Add WSGI config example
 2016-06-22 00:18:09 -04:00
Kevin Chung a9b79770f8 Making tab switching in modals more streamlined 2016-05-26 13:46:54 -04:00
Kevin Chung 80047246b7 Fixing subqueries in MySQL 2016-05-26 01:57:26 -04:00
CodeKevin 29d3cb72d7 Prioritize user config 2016-05-23 20:38:21 -04:00
CodeKevin d04fd0f5bf Users with no awards 2016-05-23 20:20:39 -04:00
CodeKevin 9171b67235 Allowing for the loading of mailgun API key from hardcoded configuration 2016-05-23 20:05:48 -04:00
CodeKevin dfd8c47690 Closes #121 2016-05-13 20:56:26 -04:00