Commit Graph

Select branches

Hide Pull Requests

1318-submissions-api-improvements

1386-proper-deletion-constraint-for-dynamics

2.4.0-dev

admin-challenges-pagination

admin-teams-pagination

admin-users-pagination

better-spacing-without-solves

bulk-clear-sessions

bulk-table-profile-actions

cache-user-ips-for-tracker

fix-invalid-session-situation

fix-submission-type-pagination

in-house-export-serialization

ip-address-admin-modal

is_admin_func_cache_hit

mark-2.4.1

master

remove-get-config-from-models

selenium-screenshot-testing

snyk-fix-01db22ad98fc211deb7f51194e5f3e03

snyk-fix-077ee7646b92258147761458ad8b3133

snyk-fix-28f8c905d85740d8cb0f227e2f526343

snyk-fix-360a0892266ffed44ffd36b936f1e486

snyk-fix-5bf5e5ae56c1d7a75cab74d5ccc3892e

snyk-fix-600e51cd85ee2219525f18f7935f1860

snyk-fix-771fb15a1ef1faf37d4abc9a28db5fe3

snyk-fix-832f1d103bac4fdd1438f1bd89ae932c

snyk-fix-9e4741652a6b84d1ce8b42958c1f9131

snyk-fix-b3bde7060d7d2d0fe1b8f565cc7765d2

snyk-fix-d4426f7cdb30767e4252b5a6d73a2f7c

snyk-fix-d9ddd63ed2f26932646cb62d8da620f2

snyk-fix-e44d6ffdbac4d7925987881639ba1e20

snyk-fix-ec2d9ccaf4ac8c8c3337740041d9a27f

snyk-upgrade-82e1ee576d4276bd2da1295f2c2228eb

table-granular-admin-reset

update-jquery-3.5.0

#1

#1

#10

#10

#11

#11

#12

#12

#13

#13

#14

#14

#2

#2

#3

#3

#4

#4

#5

#5

#6

#6

#7

#7

#8

#8

#9

#9

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.0.5

1.1.0

1.1.1

1.1.2

1.1.3

1.1.4

1.2.0

2.0.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.0.6

2.1.0

2.1.1

2.1.2

2.1.3

2.1.4

2.1.5

2.2.0

2.2.1

2.2.2

2.2.3

2.3.0

2.3.1

2.3.2

2.3.3

2.4.0

2.4.1

Mono Color

• ca6145fd8a
  Merge 16cdc04bad into c47d6161be #14 John Hammond 2023-05-03 10:52:48 -0700
• 16cdc04bad
  fix: requirements.txt to reduce vulnerabilities #14 snyk-fix-9e4741652a6b84d1ce8b42958c1f9131 snyk-bot 2023-05-03 17:52:40 +0000
• 957a5019a1
  Merge 7388a0cba9 into c47d6161be #13 Snyk bot 2023-02-16 02:19:14 +0000
• 7388a0cba9
  fix: requirements.txt to reduce vulnerabilities #13 snyk-fix-28f8c905d85740d8cb0f227e2f526343 snyk-bot 2023-02-16 02:19:12 +0000
• 4071232c51
  Merge 0545893b23 into c47d6161be #12 Snyk bot 2023-02-10 16:52:11 -0500
• 0545893b23
  fix: Dockerfile to reduce vulnerabilities #12 snyk-fix-e44d6ffdbac4d7925987881639ba1e20 snyk-bot 2023-02-09 23:20:07 +0000
• 381c1818e6
  Merge 50176c64bc into c47d6161be #11 Snyk bot 2022-11-04 15:07:08 +0200
• 50176c64bc
  fix: requirements.txt to reduce vulnerabilities #11 snyk-fix-01db22ad98fc211deb7f51194e5f3e03 snyk-bot 2022-11-04 13:07:03 +0000
• f9a24b2ed0
  Merge 438a21065c into c47d6161be #10 John Hammond 2022-10-27 21:17:49 +0200
• 438a21065c
  fix: Dockerfile to reduce vulnerabilities #10 snyk-fix-360a0892266ffed44ffd36b936f1e486 snyk-bot 2022-10-27 19:05:51 +0000
• 15940f0708
  Merge 3db00af002 into c47d6161be #9 Snyk bot 2022-07-04 17:57:10 -0400
• 3db00af002
  fix: requirements.txt to reduce vulnerabilities #9 snyk-fix-d4426f7cdb30767e4252b5a6d73a2f7c snyk-bot 2022-07-04 21:57:06 +0000
• 65b6ac448b
  Merge d1c69acd6b into c47d6161be #8 Snyk bot 2022-02-20 23:48:42 +0200
• d1c69acd6b
  fix: Dockerfile to reduce vulnerabilities #8 snyk-fix-771fb15a1ef1faf37d4abc9a28db5fe3 snyk-bot 2022-02-20 21:48:40 +0000
• c480b30150
  Merge 5706aad81f into c47d6161be #7 Snyk bot 2022-01-24 23:44:23 +0000
• 5706aad81f
  fix: Dockerfile to reduce vulnerabilities #7 snyk-fix-832f1d103bac4fdd1438f1bd89ae932c snyk-bot 2022-01-24 23:44:21 +0000
• f230763a41
  Merge 17390f8a4c into c47d6161be #6 Snyk bot 2022-01-20 19:02:21 -0500
• 17390f8a4c
  fix: Dockerfile to reduce vulnerabilities #6 snyk-fix-600e51cd85ee2219525f18f7935f1860 snyk-bot 2022-01-19 23:45:04 +0000
• baa8c331a1
  Merge bbb2a83ce0 into c47d6161be #5 Snyk bot 2022-01-19 01:57:29 +0000
• bbb2a83ce0
  fix: Dockerfile to reduce vulnerabilities #5 snyk-fix-ec2d9ccaf4ac8c8c3337740041d9a27f snyk-bot 2022-01-19 01:57:27 +0000
• 8229075e23
  Merge 6d26b91192 into c47d6161be #4 Snyk bot 2021-12-31 02:18:30 +0000
• 6d26b91192
  fix: requirements.txt to reduce vulnerabilities #4 snyk-fix-d9ddd63ed2f26932646cb62d8da620f2 snyk-bot 2021-12-31 02:18:28 +0000
• 6256be61b2
  fix: requirements.txt to reduce vulnerabilities snyk-fix-077ee7646b92258147761458ad8b3133 snyk-bot 2021-12-03 22:23:36 +0000
• 827abfe4fd
  Merge 08f6bd8159 into c47d6161be #3 Snyk bot 2021-11-12 03:58:45 +0100
• 08f6bd8159
  fix: Dockerfile to reduce vulnerabilities #3 snyk-fix-5bf5e5ae56c1d7a75cab74d5ccc3892e snyk-bot 2021-11-12 02:58:42 +0000
• 26f06434ad
  Merge 197164bcc5 into c47d6161be #2 Snyk bot 2021-09-09 18:39:02 -0400
• 197164bcc5
  fix: requirements.txt to reduce vulnerabilities #2 snyk-fix-b3bde7060d7d2d0fe1b8f565cc7765d2 snyk-bot 2021-09-09 22:38:58 +0000
• a13d3a94d7
  Merge 09cc6c3b8e into c47d6161be #1 Snyk bot 2021-05-09 04:37:36 -0400
• 09cc6c3b8e
  fix: upgrade @babel/polyfill from 7.2.5 to 7.12.1 #1 snyk-upgrade-82e1ee576d4276bd2da1295f2c2228eb snyk-bot 2021-05-09 08:37:32 +0000
• c47d6161be Made get_configurable_plugins work nicely with config.jsons that include multiple plugin entries as a list master John Hammond 2020-05-06 20:28:00 -0400
• d29f5aaf44 Made prepare.sh install requirements from loaded plugins John Hammond 2020-05-06 20:26:24 -0400
• 930da02231 Run formatter 1386-proper-deletion-constraint-for-dynamics Kevin Chung 2020-05-06 16:43:56 -0400
• 364273f1f1 Add cascading delete constraint to DynamicChallenge Kevin Chung 2020-05-06 12:46:51 -0400
• 818a4568a3
  Merge pull request #1385 from CTFd/mark-2.4.1 2.4.1 Kevin Chung 2020-05-06 01:00:23 -0400
• 1d28016424 Mark v2.4.1 mark-2.4.1 Kevin Chung 2020-05-05 23:33:06 -0400
• 2cfc89d4c2
  Merge pull request #1384 from ilanarbi/admin-theme-successful-email-fix Kevin Chung 2020-05-05 23:26:44 -0400
• 77afae2a4a
  Merge branch 'master' into admin-theme-successful-email-fix ilanarbi 2020-05-06 05:22:35 +0300
• 6a785f1095
  Merge pull request #1383 from CTFd/fix-invalid-session-situation Kevin Chung 2020-05-05 22:18:31 -0400
• 2c563a7b84 admin theme successful confirmation email fix Ilan 2020-05-06 04:46:48 +0300
• ecec8592dc
  Merge branch 'master' into fix-invalid-session-situation fix-invalid-session-situation Kevin Chung 2020-05-05 21:20:03 -0400
• 05da93b4f6
  Merge pull request #1380 from CTFd/add-sqlalchemy-engine-options Kevin Chung 2020-05-05 21:19:46 -0400
• 97a221aa24 Fix an issue where session id no longer exists Kevin Chung 2020-05-05 19:41:45 -0400
• 2f6ee65f33 Only add SQLALCHEMY_ENGINE_OPTIONS under production databases Kevin Chung 2020-05-05 19:39:36 -0400
• 4b54789c14
  Merge branch 'master' into add-sqlalchemy-engine-options Kevin Chung 2020-05-05 19:28:02 -0400
• 287cb2f263
  Merge pull request #1382 from CTFd/node-modules-docker-ignore Kevin Chung 2020-05-05 19:14:43 -0400
• 9e158749f0
  Merge branch 'master' into node-modules-docker-ignore Kevin Chung 2020-05-05 18:31:07 -0400
• 55d96b1c1d
  Merge pull request #1381 from CTFd/fix-submission-type-pagination Kevin Chung 2020-05-05 17:44:25 -0400
• f1008a812e Add node_modules/ to .dockerignore Kevin Chung 2020-05-05 16:46:16 -0400
• 565b218ebc Run format Kevin Chung 2020-05-05 16:45:22 -0400
• 197cfc3cf2 Run formatter fix-submission-type-pagination Kevin Chung 2020-05-05 16:44:31 -0400
• 73e387524a Fix url_for for admin panel submission pagination Kevin Chung 2020-05-05 15:52:45 -0400
• ca65d01f1a Add SQLALCHEMY_ENGINE_OPTIONS with a slightly higher default max_overflow Kevin Chung 2020-05-05 15:42:59 -0400
• dcfa02877d
  Merge pull request #1378 from CTFd/bulk-clear-sessions 2.4.0 Kevin Chung 2020-05-04 12:02:19 -0400
• 8b2c75761b
  Merge branch 'master' into bulk-clear-sessions bulk-clear-sessions Kevin Chung 2020-05-04 10:53:33 -0400
• 5dc7fc6434
  Merge pull request #1376 from CTFd/dependabot/npm_and_yarn/lodash-4.17.15 Kevin Chung 2020-05-04 10:53:18 -0400
• 83f3f5d28a
  Merge branch 'master' into dependabot/npm_and_yarn/lodash-4.17.15 Kevin Chung 2020-05-04 09:50:41 -0400
• 66109629a3
  Merge pull request #1377 from CTFd/dependabot/npm_and_yarn/eslint-utils-1.4.3 Kevin Chung 2020-05-04 09:50:28 -0400
• f0921f42f5 Run format Kevin Chung 2020-05-04 09:49:31 -0400
• 49816c730b
  Merge branch 'master' into dependabot/npm_and_yarn/eslint-utils-1.4.3 Kevin Chung 2020-05-04 04:08:51 -0400
• 7646707b8a
  Merge branch 'master' into bulk-clear-sessions Kevin Chung 2020-05-04 04:06:43 -0400
• 672798ece6 Add a test for clear_all_user_sessions Kevin Chung 2020-05-04 04:06:29 -0400
• 056ba7e189
  Merge branch 'master' into dependabot/npm_and_yarn/lodash-4.17.15 Kevin Chung 2020-05-04 03:53:50 -0400
• 8e53db1617
  Merge pull request #1375 from CTFd/dependabot/npm_and_yarn/acorn-5.7.4 Kevin Chung 2020-05-04 03:53:33 -0400
• e65d60bed1 Add function mass clear user/team sessions Kevin Chung 2020-05-04 03:44:02 -0400
• 2b958c3a82
  Bump eslint-utils from 1.3.1 to 1.4.3 dependabot[bot] 2020-05-04 06:26:13 +0000
• 02f0f28365
  Bump lodash from 4.17.11 to 4.17.15 dependabot[bot] 2020-05-04 06:26:13 +0000
• ddfa337ef3
  Bump acorn from 5.7.3 to 5.7.4 dependabot[bot] 2020-05-04 06:26:13 +0000
• bd4900b896
  Merge pull request #1361 from CTFd/2.4.0-dev Kevin Chung 2020-05-04 02:25:26 -0400
• fb6b30ab1b Fix lint 2.4.0-dev Kevin Chung 2020-05-04 01:29:28 -0400
• 2c4259c999 Bump release date Kevin Chung 2020-05-04 01:04:37 -0400
• 625c17db30 Invalidate any previously cached attributes on user login Kevin Chung 2020-05-03 20:47:25 -0400
• 7779175eea Set date Kevin Chung 2020-05-03 03:22:43 -0400
• f559c7d8fc
  Merge pull request #1373 from CTFd/bulk-table-profile-actions Kevin Chung 2020-05-03 01:10:35 -0400
• 1befbedee0 Fix lints bulk-table-profile-actions Kevin Chung 2020-05-02 23:57:54 -0400
• ba4fce4736 Update changelog Kevin Chung 2020-05-02 23:18:54 -0400
• 0ff9d142f7 Use sessionStorage to store most recently used tabs instead of the location hash Kevin Chung 2020-05-02 23:04:58 -0400
• 494052fb44 Bump min-vh Kevin Chung 2020-05-02 20:38:15 -0400
• 0d904d0628 Run yarn build Kevin Chung 2020-05-02 19:37:26 -0400
• a2e5aa4b9e Add team mark missing Kevin Chung 2020-05-02 15:04:04 -0400
• 76bd626c36 Make bulk mark correct work for users Kevin Chung 2020-05-02 14:35:47 -0400
• c101204879 Add bulk user page actions Kevin Chung 2020-05-02 14:23:15 -0400
• 5a9d79f2bb Add bulk table actions for team page Kevin Chung 2020-05-02 14:09:47 -0400
• 735faf0e23 Mark new version and add rough changelog Kevin Chung 2020-05-02 02:49:03 -0400
• 073c8c713d Remove small Kevin Chung 2020-05-01 21:10:10 -0400
• 3d652a968e Clean up some ui interactions Kevin Chung 2020-05-01 21:03:15 -0400
• 9003c29846 Fix up some of the tables when data is too long Kevin Chung 2020-05-01 17:26:06 -0400
• fe97385f69
  Merge pull request #1371 from CTFd/ip-address-admin-modal Kevin Chung 2020-05-01 02:44:33 -0400
• 512a7d546b
  Merge pull request #1372 from CTFd/better-spacing-without-solves Kevin Chung 2020-05-01 02:34:50 -0400
• 0614bc9cf2 Run make format and yarn build better-spacing-without-solves Kevin Chung 2020-04-30 22:23:14 -0400
• 95d581ed33 Add better spacing for when there aren't solves to populate dtta Kevin Chung 2020-04-30 22:14:32 -0400
• c47955ff4f Always record IP usage on non-GET and clean up HTML ip-address-admin-modal Kevin Chung 2020-04-30 21:10:43 -0400
• e5814592c4 Run yarn build and add empty line to end of files Kevin Chung 2020-04-30 20:36:57 -0400
• 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 -0400
• 1c10643537
  Merge pull request #1367 from CTFd/cache-user-ips-for-tracker Kevin Chung 2020-04-30 16:04:46 -0400
• b4f39e843d
  Merge pull request #1368 from CTFd/update-jquery-3.5.0 Kevin Chung 2020-04-30 15:57:33 -0400
• 2f1b3265f8 Run make lint cache-user-ips-for-tracker Kevin Chung 2020-04-30 14:39:42 -0400
• 7d35e552bc Merge remote-tracking branch 'origin/2.4.0-dev' into update-jquery-3.5.0 update-jquery-3.5.0 Kevin Chung 2020-04-30 14:34:47 -0400
• c69633b479 Remove testing data Kevin Chung 2020-04-30 03:33:55 -0400
• b3b654bf03 Rebase 2.4.0-dev Kevin Chung 2020-04-30 03:21:13 -0400
• 0bd6c0d958 Merge remote-tracking branch 'origin/2.4.0-dev' into cache-user-ips-for-tracker Kevin Chung 2020-04-30 03:10:31 -0400