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

867 Commits (master)

Author SHA1 Message Date
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
Kevin Chung 791d1a5fc9 Merge pull request #120 from computerfreak/master 
Add defaults to boolean columns in the Team model
 2016-05-13 20:53:29 -04:00
Nick Gregory 2ba89613e0 Added defaults to Team boolean columns. Switched comparisons of these columns from ==None to ==False 2016-05-12 17:23:16 -04:00
CodeKevin ad39f5a821 Relaxing container name restrictions 2016-05-08 18:25:58 -04:00
Kevin Chung 7391bb4228 More consistent titles 2016-05-07 18:30:59 -04:00
Kevin Chung 275ae6e94a Covering edge case issues 2016-05-07 18:12:17 -04:00
Kevin Chung 03d8dda878 Fixing some mistakes 2016-05-07 16:52:24 -04:00
Kevin Chung d2778c30ad Adding container support 2016-05-07 16:38:10 -04:00
CodeKevin a479b3a7aa Add container to db 2016-05-07 10:49:38 -04:00
CodeKevin a0d7d8abcb Starting containers 2016-05-03 01:11:29 -04:00
CodeKevin c769f5865f 404 for team pages 2016-04-30 16:11:32 -04:00
CodeKevin e4e989a0a5 Fixing and cleaning graphs to reflect awards 2016-04-30 13:20:30 -04:00
CodeKevin 691c971ebd Closes #112 2016-04-26 22:25:07 -04:00
CodeKevin f563cd5a21 Adding Awards feature which closes #84 
The Awards feature allows an admin to give users points. Eventually
Awards will allow for uploading icons to make the award more
commemorative.
 2016-04-24 17:30:57 -04:00
Kevin Chung 253db6eca8 Merge pull request #111 from breadchris/master 
Fixed button outlining so that custom buttons do not appear invisible
 2016-04-22 18:21:07 -04:00
Kevin Chung f4a2f165a2 Getting awards feature ready 2016-04-22 18:19:49 -04:00
Christopher Thompson 728ee63cd1 Fixed button outlining so that custom buttons do not appear invisible on site 2016-04-22 15:51:42 -04:00
CodeKevin b46b0c560d Forgot to add file 2016-04-22 10:06:26 -04:00
Kevin Chung 5590b11636 Fixing time travel solves 2016-04-21 11:40:59 -04:00
CodeKevin d129a251d0 Considering old challenge hidden value 2016-04-20 14:38:48 -04:00
CodeKevin 6308165dea Adding ability to hide challenges 2016-04-20 14:22:17 -04:00
Kevin Chung f4964dffff Closes #108 2016-04-15 15:06:37 -04:00
Kevin Chung 282b311491 Reorganizing user challenge view 2016-04-15 13:33:23 -04:00
CodeKevin 1d3ed05f37 Closes #107 and helps with #103 
Now shows UTC timestamp
 2016-04-11 23:00:18 -04:00
Kevin Chung 417e51eba9 Closes #104 2016-03-21 13:13:59 -04:00
Kevin Chung 742132abdb Closes #101 2016-03-17 21:06:21 -07:00
Kevin Chung 11be9d7f0e Closes #100 2016-03-17 21:01:49 -07:00
Kevin Chung 9ef27ae54b Adding sqlalchemy-utils as a dependency in order to create databases automatically 2016-03-12 15:41:06 -05:00
Kevin Chung 9ebf4c51e8 Fixing date display on overall key submission pages 2016-03-12 15:20:40 -05:00