Commit Graph

  • 05da93b4f6 Merge pull request #1380 from CTFd/add-sqlalchemy-engine-options Kevin Chung 2020-05-05 21:19:46 -04:00
  • 97a221aa24 Fix an issue where session id no longer exists Kevin Chung 2020-05-05 19:41:45 -04:00
  • 2f6ee65f33 Only add SQLALCHEMY_ENGINE_OPTIONS under production databases Kevin Chung 2020-05-05 19:39:36 -04:00
  • 4b54789c14 Merge branch 'master' into add-sqlalchemy-engine-options Kevin Chung 2020-05-05 19:28:02 -04:00
  • 287cb2f263 Merge pull request #1382 from CTFd/node-modules-docker-ignore Kevin Chung 2020-05-05 19:14:43 -04:00
  • 9e158749f0 Merge branch 'master' into node-modules-docker-ignore Kevin Chung 2020-05-05 18:31:07 -04:00
  • 55d96b1c1d Merge pull request #1381 from CTFd/fix-submission-type-pagination Kevin Chung 2020-05-05 17:44:25 -04:00
  • f1008a812e Add node_modules/ to .dockerignore Kevin Chung 2020-05-05 16:46:16 -04:00
  • 565b218ebc Run format Kevin Chung 2020-05-05 16:45:22 -04:00
  • 197cfc3cf2 Run formatter Kevin Chung 2020-05-05 16:44:31 -04:00
  • 73e387524a Fix url_for for admin panel submission pagination Kevin Chung 2020-05-05 15:52:45 -04:00
  • ca65d01f1a Add SQLALCHEMY_ENGINE_OPTIONS with a slightly higher default max_overflow Kevin Chung 2020-05-05 15:42:59 -04:00
  • dcfa02877d Merge pull request #1378 from CTFd/bulk-clear-sessions 2.4.0 Kevin Chung 2020-05-04 12:02:19 -04:00
  • 8b2c75761b Merge branch 'master' into bulk-clear-sessions Kevin Chung 2020-05-04 10:53:33 -04:00
  • 5dc7fc6434 Merge pull request #1376 from CTFd/dependabot/npm_and_yarn/lodash-4.17.15 Kevin Chung 2020-05-04 10:53:18 -04:00
  • 83f3f5d28a Merge branch 'master' into dependabot/npm_and_yarn/lodash-4.17.15 Kevin Chung 2020-05-04 09:50:41 -04:00
  • 66109629a3 Merge pull request #1377 from CTFd/dependabot/npm_and_yarn/eslint-utils-1.4.3 Kevin Chung 2020-05-04 09:50:28 -04:00
  • f0921f42f5 Run format Kevin Chung 2020-05-04 09:49:31 -04:00
  • 49816c730b Merge branch 'master' into dependabot/npm_and_yarn/eslint-utils-1.4.3 Kevin Chung 2020-05-04 04:08:51 -04:00
  • 7646707b8a Merge branch 'master' into bulk-clear-sessions Kevin Chung 2020-05-04 04:06:43 -04:00
  • 672798ece6 Add a test for clear_all_user_sessions Kevin Chung 2020-05-04 04:06:29 -04:00
  • 056ba7e189 Merge branch 'master' into dependabot/npm_and_yarn/lodash-4.17.15 Kevin Chung 2020-05-04 03:53:50 -04:00
  • 8e53db1617 Merge pull request #1375 from CTFd/dependabot/npm_and_yarn/acorn-5.7.4 Kevin Chung 2020-05-04 03:53:33 -04:00
  • e65d60bed1 Add function mass clear user/team sessions Kevin Chung 2020-05-04 03:44:02 -04:00
  • 2b958c3a82 Bump eslint-utils from 1.3.1 to 1.4.3 dependabot[bot] 2020-05-04 06:26:13 +00:00
  • 02f0f28365 Bump lodash from 4.17.11 to 4.17.15 dependabot[bot] 2020-05-04 06:26:13 +00:00
  • ddfa337ef3 Bump acorn from 5.7.3 to 5.7.4 dependabot[bot] 2020-05-04 06:26:13 +00:00
  • bd4900b896 Merge pull request #1361 from CTFd/2.4.0-dev Kevin Chung 2020-05-04 02:25:26 -04:00
  • fb6b30ab1b Fix lint Kevin Chung 2020-05-04 01:29:28 -04:00
  • 2c4259c999 Bump release date Kevin Chung 2020-05-04 01:04:37 -04:00
  • 625c17db30 Invalidate any previously cached attributes on user login Kevin Chung 2020-05-03 20:47:25 -04:00
  • 7779175eea Set date Kevin Chung 2020-05-03 03:22:43 -04:00
  • f559c7d8fc Merge pull request #1373 from CTFd/bulk-table-profile-actions Kevin Chung 2020-05-03 01:10:35 -04:00
  • 1befbedee0 Fix lints Kevin Chung 2020-05-02 23:57:54 -04:00
  • ba4fce4736 Update changelog Kevin Chung 2020-05-02 23:18:54 -04:00
  • 0ff9d142f7 Use sessionStorage to store most recently used tabs instead of the location hash Kevin Chung 2020-05-02 23:04:58 -04:00
  • 494052fb44 Bump min-vh Kevin Chung 2020-05-02 20:38:15 -04:00
  • 0d904d0628 Run yarn build Kevin Chung 2020-05-02 19:37:26 -04:00
  • a2e5aa4b9e Add team mark missing Kevin Chung 2020-05-02 15:04:04 -04:00
  • 76bd626c36 Make bulk mark correct work for users Kevin Chung 2020-05-02 14:35:47 -04:00
  • c101204879 Add bulk user page actions Kevin Chung 2020-05-02 14:23:15 -04:00
  • 5a9d79f2bb Add bulk table actions for team page Kevin Chung 2020-05-02 14:09:47 -04:00
  • 735faf0e23 Mark new version and add rough changelog Kevin Chung 2020-05-02 02:49:03 -04:00
  • 073c8c713d Remove small Kevin Chung 2020-05-01 21:10:10 -04:00
  • 3d652a968e Clean up some ui interactions Kevin Chung 2020-05-01 21:03:15 -04:00
  • 9003c29846 Fix up some of the tables when data is too long Kevin Chung 2020-05-01 17:26:06 -04:00
  • fe97385f69 Merge pull request #1371 from CTFd/ip-address-admin-modal Kevin Chung 2020-05-01 02:44:33 -04:00
  • 512a7d546b Merge pull request #1372 from CTFd/better-spacing-without-solves Kevin Chung 2020-05-01 02:34:50 -04:00
  • 0614bc9cf2 Run make format and yarn build Kevin Chung 2020-04-30 22:23:14 -04:00
  • 95d581ed33 Add better spacing for when there aren't solves to populate dtta Kevin Chung 2020-04-30 22:14:32 -04:00
  • c47955ff4f Always record IP usage on non-GET and clean up HTML Kevin Chung 2020-04-30 21:10:43 -04:00
  • e5814592c4 Run yarn build and add empty line to end of files Kevin Chung 2020-04-30 20:36:57 -04:00
  • 01f2d50a34 Rewrite IP tracking code to only return recent IPs. Move IPs into a modal for admin panel. Kevin Chung 2020-04-30 20:32:26 -04:00
  • 1c10643537 Merge pull request #1367 from CTFd/cache-user-ips-for-tracker Kevin Chung 2020-04-30 16:04:46 -04:00
  • b4f39e843d Merge pull request #1368 from CTFd/update-jquery-3.5.0 Kevin Chung 2020-04-30 15:57:33 -04:00
  • 2f1b3265f8 Run make lint Kevin Chung 2020-04-30 14:39:42 -04:00
  • 7d35e552bc Merge remote-tracking branch 'origin/2.4.0-dev' into update-jquery-3.5.0 Kevin Chung 2020-04-30 14:34:47 -04:00
  • c69633b479 Remove testing data Kevin Chung 2020-04-30 03:33:55 -04:00
  • b3b654bf03 Rebase 2.4.0-dev Kevin Chung 2020-04-30 03:21:13 -04:00
  • 0bd6c0d958 Merge remote-tracking branch 'origin/2.4.0-dev' into cache-user-ips-for-tracker Kevin Chung 2020-04-30 03:10:31 -04:00
  • 431c35cb51 Merge pull request #1363 from CTFd/is_admin_func_cache_hit Kevin Chung 2020-04-30 03:07:59 -04:00
  • 0d97c3539a Update jQuery to 3.5.0 Kevin Chung 2020-04-30 02:57:22 -04:00
  • 87895918f5 Fix tracker code to fix tests Kevin Chung 2020-04-30 02:45:12 -04:00
  • 232a4468b0 Run format Kevin Chung 2020-04-30 02:22:44 -04:00
  • e99f4f11a5 Merge remote-tracking branch 'origin/2.4.0-dev' into is_admin_func_cache_hit Kevin Chung 2020-04-30 00:31:21 -04:00
  • 4e28e30cb8 Fix memoize call Kevin Chung 2020-04-29 23:10:39 -04:00
  • 4a47805c41 Reduce attr cache to 30 seconds instead of 300 secs Kevin Chung 2020-04-29 22:48:03 -04:00
  • 740ea36f7a Fix tokens using too-random of a value Kevin Chung 2020-04-29 22:45:11 -04:00
  • 541d7e9cfa Add a wrapper for get_user_ips Kevin Chung 2020-04-29 22:34:33 -04:00
  • 46ca4c7283 Add newline at end of .gitignore Kevin Chung 2020-04-29 22:27:39 -04:00
  • 0dc42605ac Handle other cases for attrs invalidation Kevin Chung 2020-04-29 22:24:52 -04:00
  • 3f3109f589 Add team attrs and cache banning SQL query Kevin Chung 2020-04-29 20:33:51 -04:00
  • 0d8b0ee966 Merge branch 'is_admin_func_cache_hit' of github.com:CTFd/CTFd into is_admin_func_cache_hit Kevin Chung 2020-04-29 20:19:50 -04:00
  • 674c08c19a Switch to get_user_attrs strategy Kevin Chung 2020-04-29 20:19:05 -04:00
  • 805b48d00d Test clear_user_session and clear sessions on user modifications Kevin Chung 2020-04-29 03:58:54 -04:00
  • e1e22eddb3 Make CTFd.utils.user.is_admin wrap a cached function so we avoid a DB hit on page loads Kevin Chung 2020-04-29 03:15:20 -04:00
  • f86b7ae18f Switch to get_user_attrs strategy Kevin Chung 2020-04-29 20:19:05 -04:00
  • a9aa80af89 Merge pull request #1366 from CTFd/extract-banned-code-from-tracker Kevin Chung 2020-04-29 19:50:46 -04:00
  • abd8aae84f Reorder code and fix tests Kevin Chung 2020-04-29 18:41:18 -04:00
  • 817b67d1b0 Start to refactor tracker to cache user IPs Kevin Chung 2020-04-29 18:30:17 -04:00
  • f7e7c3c337 Merge pull request #1365 from CTFd/remove-get-config-from-models Kevin Chung 2020-04-29 14:15:43 -04:00
  • 7e3b1962c4 Extract user/team banning code into its own initialization function Kevin Chung 2020-04-29 12:46:48 -04:00
  • 57d4cb4318 Remove duplicated get_config from models and import before usage Kevin Chung 2020-04-29 12:45:06 -04:00
  • ff4ad5185f Test clear_user_session and clear sessions on user modifications Kevin Chung 2020-04-29 03:58:54 -04:00
  • 12d831a321 Make CTFd.utils.user.is_admin wrap a cached function so we avoid a DB hit on page loads Kevin Chung 2020-04-29 03:15:20 -04:00
  • e15e23f038 Merge pull request #1359 from CTFd/table-granular-admin-reset Kevin Chung 2020-04-28 12:29:11 -04:00
  • 453289b0ff Run linters Kevin Chung 2020-04-28 04:19:31 -04:00
  • 289d7441f9 Clean up word Kevin Chung 2020-04-28 03:54:46 -04:00
  • a62b18fadb Fix up reset ui Kevin Chung 2020-04-28 03:53:25 -04:00
  • aa2dd04378 Fix reset tests so they cover file deletions Kevin Chung 2020-04-28 03:15:28 -04:00
  • 696872fee5 Delete files when resetting pages and challenges Kevin Chung 2020-04-28 02:44:24 -04:00
  • 1d33ed4cb2 Fix reset tests and enforce foreign keys on sqlite Kevin Chung 2020-04-28 02:08:05 -04:00
  • c7bf346ba6 Merge pull request #1349 from CTFd/in-house-export-serialization Kevin Chung 2020-04-27 21:41:03 -04:00
  • cc08f03faa Merge pull request #1357 from CTFd/admin-users-pagination Kevin Chung 2020-04-27 21:39:47 -04:00
  • 4cfc536b41 Merge pull request #1358 from CTFd/admin-challenges-pagination Kevin Chung 2020-04-27 20:54:40 -04:00
  • c5667dc9d1 Merge pull request #1356 from CTFd/admin-teams-pagination Kevin Chung 2020-04-27 20:22:31 -04:00
  • e4a0f99f7e Merge pull request #1352 from CTFd/1339-submission-searching Kevin Chung 2020-04-27 20:21:46 -04:00
  • f4b6afd32c Run make format Kevin Chung 2020-04-27 20:15:51 -04:00
  • 77af80b538 Run make lint Kevin Chung 2020-04-27 20:13:12 -04:00
  • 6092ed1f31 Clear caches after populate and enable foreign keys in SQLite Kevin Chung 2020-04-27 18:33:53 -04:00