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

206 Commits (70a0245e8937f3ebcff85d949d0cf04e7a50aa10)

Author SHA1 Message Date
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
Kevin Chung 4fd0d333df Adding ability to mark challenges as solved 2016-03-12 14:59:29 -05:00
Kevin Chung 4d363f25cb Removing flask mail import 2016-03-01 18:00:38 -05:00
Kevin Chung dcf20cecac Reverting input design for setup.html 2016-02-20 16:44:49 -05:00
Kevin Chung 1532fc3cf4 Fixes multiple line challenge names in admin challenges panel 2016-02-20 13:47:30 -05:00
Kevin Chung 3e8f5bbbc5 Closes #93, #76 2016-02-19 14:44:56 -05:00
Kevin Chung 7a46a0a8d3 Fixing setup with new get_config and set_config 2016-02-18 11:31:03 -05:00
CodeKevin 166e6a6588 Python 3 or something 2016-02-18 02:31:58 -05:00
CodeKevin 4ae11cf7fe Adding email verification 
This commit has some model changes. It could be difficult to upgrade to
this commit.
 2016-02-18 02:30:05 -05:00
Kevin Chung 770d7f5809 Merge pull request #91 from Bird101/master 
Fixed scoreboard show graph bug
 2016-02-17 00:08:00 -05:00
Bird101 704c4144e7 Fixed scoreboard show graph bug 2016-02-17 12:39:22 +08:00
Kevin Chung e02d3c9010 Merge pull request #90 from Bird101/master 
Add nonce element in admin/login.html
 2016-02-16 11:16:21 -05:00