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

775 Commits (ff4ad5185fafaf4b3bafb51c6336b6d8e4ce7ce1)

Author SHA1 Message Date
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
Kevin Chung dc31717148
Merge branch 'master' into issue/1342 2020-04-27 03:28:22 -04:00
Kevin Chung 5b6eb16c60
Merge pull request #1350 from CTFd/pin-banal 
* Pin banal==0.4.2
 2020-04-27 03:27:43 -04:00
Kevin Chung 9588ab3caa Fix email issue and remove file extensions list 2020-04-27 02:36:59 -04:00
Kevin Chung 41a0ebc68d Make minified JSON 2020-04-27 02:00:11 -04:00
Kevin Chung 89ade49695 Fix serializer 2020-04-27 01:49:56 -04:00
Kevin Chung 593fed300b Remove datafreeze dependency 2020-04-27 01:02:52 -04:00
Kevin Chung 7d71eedb8e Pin banal==0.4.2 because of https://github.com/pudo/banal/issues/5 2020-04-26 22:04:19 -04:00
Kevin Chung 6099abf1a1 Add proper syntax highlighting for codemirror and make theme footer & header use codemirror 2020-04-26 02:32:28 -04:00
Kevin Chung c9d31b67aa
Merge pull request #1343 from CTFd/improved-page-select 
* Changes page selection to be a select of pages. The page will be redirected to after a new page is selected.
 2020-04-26 01:39:00 -04:00
codingsh 5a8e1b5b76 feat: add Faker and change populate.py #1342 2020-04-25 19:14:44 -03:00
Kevin Chung 04eedb4a4e Run yarn build 2020-04-25 16:45:24 -04:00
Kevin Chung 1ad520a8e7 Run prettier 2020-04-25 13:05:00 -04:00
Kevin Chung ff2e4c9dd0 Change the page selector to be less verbose 2020-04-25 13:05:00 -04:00