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

651 Commits (d29f5aaf442493d01af08db22690b3b4a4ccc2f2)

Author SHA1 Message Date
Kevin Chung 1d28016424 Mark v2.4.1 2020-05-05 23:33:06 -04:00
ilanarbi 77afae2a4a
Merge branch 'master' into admin-theme-successful-email-fix 2020-05-06 05:22:35 +03:00
Ilan 2c563a7b84 admin theme successful confirmation email fix 2020-05-06 04:46:48 +03:00
Kevin Chung ecec8592dc
Merge branch 'master' into fix-invalid-session-situation 2020-05-05 21:20:03 -04:00
Kevin Chung 97a221aa24 Fix an issue where session id no longer exists 2020-05-05 19:41:45 -04:00
Kevin Chung 2f6ee65f33 Only add SQLALCHEMY_ENGINE_OPTIONS under production databases 2020-05-05 19:39:36 -04:00
Kevin Chung 4b54789c14
Merge branch 'master' into add-sqlalchemy-engine-options 2020-05-05 19:28:02 -04:00
Kevin Chung 565b218ebc Run format 2020-05-05 16:45:22 -04:00
Kevin Chung 197cfc3cf2 Run formatter 2020-05-05 16:44:31 -04:00
Kevin Chung 73e387524a Fix url_for for admin panel submission pagination 2020-05-05 15:52:45 -04:00
Kevin Chung ca65d01f1a Add SQLALCHEMY_ENGINE_OPTIONS with a slightly higher default max_overflow 2020-05-05 15:42:59 -04:00
Kevin Chung e65d60bed1 Add function mass clear user/team sessions 2020-05-04 03:44:02 -04:00
Kevin Chung 625c17db30 Invalidate any previously cached attributes on user login 2020-05-03 20:47:25 -04:00
Kevin Chung 1befbedee0 Fix lints 2020-05-02 23:57:54 -04:00
Kevin Chung 0ff9d142f7 Use sessionStorage to store most recently used tabs instead of the location hash 2020-05-02 23:04:58 -04:00
Kevin Chung 494052fb44 Bump min-vh 2020-05-02 20:38:15 -04:00
Kevin Chung 0d904d0628 Run yarn build 2020-05-02 19:37:26 -04:00
Kevin Chung a2e5aa4b9e Add team mark missing 2020-05-02 15:04:04 -04:00
Kevin Chung 76bd626c36 Make bulk mark correct work for users 2020-05-02 14:35:47 -04:00
Kevin Chung c101204879 Add bulk user page actions 2020-05-02 14:23:15 -04:00
Kevin Chung 5a9d79f2bb Add bulk table actions for team page 2020-05-02 14:09:52 -04:00
Kevin Chung 735faf0e23 Mark new version and add rough changelog 2020-05-02 02:49:03 -04:00
Kevin Chung 073c8c713d Remove small 2020-05-01 21:10:10 -04:00
Kevin Chung 3d652a968e Clean up some ui interactions 2020-05-01 21:03:15 -04:00
Kevin Chung 9003c29846 Fix up some of the tables when data is too long 2020-05-01 17:26:06 -04:00
Kevin Chung fe97385f69
Merge pull request #1371 from CTFd/ip-address-admin-modal 
* IP Tracking cache returns the IPs used by the user in the last hour. This way we can track the "Last Seen" value better for GET requests. 
* Moves IP addresses in the Admin Panel for Users and Teams into a modal
* Closes #1146
 2020-05-01 02:44:33 -04:00
Kevin Chung 0614bc9cf2 Run make format and yarn build 2020-04-30 22:23:14 -04:00
Kevin Chung 95d581ed33 Add better spacing for when there aren't solves to populate dtta 2020-04-30 22:14:32 -04:00
Kevin Chung c47955ff4f Always record IP usage on non-GET and clean up HTML 2020-04-30 21:10:43 -04:00
Kevin Chung e5814592c4 Run yarn build and add empty line to end of files 2020-04-30 20:36:57 -04:00
Kevin Chung 01f2d50a34 Rewrite IP tracking code to only return recent IPs. Move IPs into a modal for admin panel. 2020-04-30 20:32:26 -04:00
Kevin Chung 1c10643537
Merge pull request #1367 from CTFd/cache-user-ips-for-tracker 
* Cache user IPs and only update IP usage on new IPs or on non-GET requests
 2020-04-30 16:04:46 -04:00
Kevin Chung 2f1b3265f8 Run make lint 2020-04-30 14:39:42 -04:00
Kevin Chung 7d35e552bc Merge remote-tracking branch 'origin/2.4.0-dev' into update-jquery-3.5.0 2020-04-30 14:34:47 -04:00
Kevin Chung b3b654bf03 Rebase 2.4.0-dev 2020-04-30 03:21:13 -04:00
Kevin Chung 0bd6c0d958 Merge remote-tracking branch 'origin/2.4.0-dev' into cache-user-ips-for-tracker 2020-04-30 03:10:31 -04:00
Kevin Chung 0d97c3539a Update jQuery to 3.5.0 2020-04-30 02:57:22 -04:00
Kevin Chung 87895918f5 Fix tracker code to fix tests 2020-04-30 02:45:12 -04:00
Kevin Chung 232a4468b0 Run format 2020-04-30 02:22:44 -04:00
Kevin Chung e99f4f11a5 Merge remote-tracking branch 'origin/2.4.0-dev' into is_admin_func_cache_hit 2020-04-30 00:31:21 -04:00
Kevin Chung 4e28e30cb8 Fix memoize call 2020-04-29 23:10:39 -04:00
Kevin Chung 4a47805c41 Reduce attr cache to 30 seconds instead of 300 secs 2020-04-29 22:48:03 -04:00
Kevin Chung 740ea36f7a Fix tokens using too-random of a value 2020-04-29 22:45:11 -04:00
Kevin Chung 541d7e9cfa Add a wrapper for get_user_ips 2020-04-29 22:34:33 -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 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 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