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

788 Commits (46ca4c7283a1c307b733f3d25040b64014e99c29)

Author SHA1 Message Date
Kevin Chung 46ca4c7283 Add newline at end of .gitignore 2020-04-29 22:27:39 -04:00
Kevin Chung 0dc42605ac Handle other cases for attrs invalidation 2020-04-29 22:24:52 -04:00
Kevin Chung 3f3109f589 Add team attrs and cache banning SQL query 2020-04-29 20:33:51 -04:00
Kevin Chung 0d8b0ee966 Merge branch 'is_admin_func_cache_hit' of github.com:CTFd/CTFd into is_admin_func_cache_hit 2020-04-29 20:19:50 -04:00
Kevin Chung 674c08c19a Switch to get_user_attrs strategy 2020-04-29 20:19:40 -04:00
Kevin Chung 805b48d00d Test clear_user_session and clear sessions on user modifications 2020-04-29 20:19:40 -04:00
Kevin Chung e1e22eddb3 Make CTFd.utils.user.is_admin wrap a cached function so we avoid a DB hit on page loads 2020-04-29 20:19:40 -04:00
Kevin Chung f86b7ae18f Switch to get_user_attrs strategy 2020-04-29 20:19:05 -04:00
Kevin Chung a9aa80af89
Merge pull request #1366 from CTFd/extract-banned-code-from-tracker 
* Extract the banning function from the IP tracking code to start moving it into cache
 2020-04-29 19:50:46 -04:00
Kevin Chung abd8aae84f Reorder code and fix tests 2020-04-29 18:41:18 -04:00
Kevin Chung f7e7c3c337
Merge pull request #1365 from CTFd/remove-get-config-from-models 
* Remove the duplicated `get_config` function from `CTFd/models`
 2020-04-29 14:15:43 -04:00
Kevin Chung 7e3b1962c4 Extract user/team banning code into its own initialization function 2020-04-29 12:46:48 -04:00
Kevin Chung 57d4cb4318 Remove duplicated get_config from models and import before usage 2020-04-29 12:45:10 -04:00
Kevin Chung ff4ad5185f Test clear_user_session and clear sessions on user modifications 2020-04-29 03:58:54 -04:00
Kevin Chung 12d831a321 Make CTFd.utils.user.is_admin wrap a cached function so we avoid a DB hit on page loads 2020-04-29 03:15:20 -04:00
Kevin Chung e15e23f038
Merge pull request #1359 from CTFd/table-granular-admin-reset 
* Improve Reset functionality by allowing admins to pick what data they'd like to reset
* Closes #1355
 2020-04-28 12:29:11 -04:00
Kevin Chung 453289b0ff Run linters 2020-04-28 04:19:31 -04:00
Kevin Chung 289d7441f9 Clean up word 2020-04-28 03:54:46 -04:00
Kevin Chung a62b18fadb Fix up reset ui 2020-04-28 03:53:25 -04:00
Kevin Chung aa2dd04378 Fix reset tests so they cover file deletions 2020-04-28 03:15:28 -04:00
Kevin Chung 696872fee5 Delete files when resetting pages and challenges 2020-04-28 02:44:24 -04:00
Kevin Chung 1d33ed4cb2 Fix reset tests and enforce foreign keys on sqlite 2020-04-28 02:08:05 -04:00
Kevin Chung c7bf346ba6
Merge pull request #1349 from CTFd/in-house-export-serialization 
* Remove `datafreeze` dependency
* Closes #1348
 2020-04-27 21:41:03 -04:00
Kevin Chung cc08f03faa
Merge pull request #1357 from CTFd/admin-users-pagination 
* Make Admin Panel user searching use a Pagination object
 2020-04-27 21:39:47 -04:00
Kevin Chung 4cfc536b41
Merge pull request #1358 from CTFd/admin-challenges-pagination 
* Show total searched results for Admin Panel searching. This doesn't use a Pagination object b/c Admin Panel challenges doesn't paginate.
 2020-04-27 20:54:40 -04:00
Kevin Chung c5667dc9d1
Merge pull request #1356 from CTFd/admin-teams-pagination 
* Make the admin panel team searching use a pagination object instead of custom searching
 2020-04-27 20:22:31 -04:00
Kevin Chung e4a0f99f7e
Merge pull request #1352 from CTFd/1339-submission-searching 
* Add Admin Panel UI for submission searching
* Closes #1339
 2020-04-27 20:21:46 -04:00
Kevin Chung f4b6afd32c Run make format 2020-04-27 20:15:51 -04:00
Kevin Chung 77af80b538 Run make lint 2020-04-27 20:13:12 -04:00
Kevin Chung 6092ed1f31 Clear caches after populate and enable foreign keys in SQLite 2020-04-27 18:33:53 -04:00
Kevin Chung abcb791b73 Run make lint 2020-04-27 18:13:45 -04:00
Kevin Chung 8a255f8b41 Add a basic layout for improved table granular reset 2020-04-27 18:11:06 -04:00
Kevin Chung 1c9490bcb1 Clean up HTML IDs 2020-04-27 16:59:53 -04:00
Kevin Chung 48bcd76a86 Clean up HTML IDs 2020-04-27 16:59:00 -04:00
Kevin Chung d9e069933f Clean up HTML ids 2020-04-27 16:58:02 -04:00
Kevin Chung 2fa2c6074f Remove unnecessary js 2020-04-27 16:53:51 -04:00
Kevin Chung 708c6383d8 Run yarn build 2020-04-27 16:44:22 -04:00
Kevin Chung 839a767c8c Show search results on challenge search 2020-04-27 16:40:58 -04:00
Kevin Chung 052ce49e14 Fix lints 2020-04-27 16:28:45 -04:00
Kevin Chung e15d58bd11 Fix lints 2020-04-27 16:27:37 -04:00
Kevin Chung 35737e9eea Make admin team searching use a pagination object 2020-04-27 16:27:06 -04:00
Kevin Chung 81341a7730 Make admin user searching use a pagination object 2020-04-27 16:09:57 -04:00
Kevin Chung b5b503e3cf Add abs 2020-04-27 15:54:04 -04:00
Kevin Chung 067b8a4052 Fix tests 2020-04-27 15:49:51 -04:00
Kevin Chung 2d49c8dd9a Switch to using a Flask SQLAlchemy pagination object for submission searching 2020-04-27 15:04:29 -04:00
Kevin Chung b8b14a568e
Merge pull request #1351 from CTFd/codemirror-improvements 
* Add proper syntax highlighting for Codemirror and make theme footer & header configs use Codemirror as well
 2020-04-27 14:51:48 -04:00
Kevin Chung c42c2d7fc9 Merge branch '1339-submission-searching' of github.com:CTFd/CTFd into 1339-submission-searching 2020-04-27 13:46:52 -04:00
Kevin Chung 8c10c731be Add UI for submission searching 2020-04-27 13:46:36 -04:00
Kevin Chung 228701cae7 Run prettier 2020-04-27 13:10:35 -04:00
Kevin Chung fb8d9a44c2
Merge pull request #1344 from developerfred/issue/1342 
* Switches to using the Faker library for `populate.py`
* Closes #1342
 2020-04-27 12:47:46 -04:00