Code

General Improvements Work#58

Code

Merged

FlorrieGirl merged 32 commits intomainSoCSTech/asgard:mainfrom josh-developSoCSTech/asgard:josh-developCopy head branch name to clipboardFeb 3, 2025

+9,774-1,249

Commits

Commits on Dec 19, 2024

• feat: begin work on display content - displays and media, add mailhog (untested

  cooperj

  committed
  39324c2

  Copy full SHA for 39324c2

• feat: create react router (remix) version

  cooperj

  committed
  73a0024

  Copy full SHA for 73a0024

Commits on Jan 6, 2025

• feat: added login page back to the new admin app

  cooperj

  committed
  1d0356e

  Copy full SHA for 1d0356e

Commits on Jan 25, 2025

• chore: del new admin

  cooperj

  committed
  c609db1

  Copy full SHA for c609db1

• fix: add mailhog and unauthed email

  cooperj

  committed
  e295508

  Copy full SHA for e295508

• feat: make the emails look prettier

  cooperj

  committed
  bb1057a

  Copy full SHA for bb1057a

• feat: add mail queue to prevent auto failures

  cooperj

  committed
  ce81cf1

  Copy full SHA for ce81cf1

• feat: add mail queue to prevent auto failures, resolves #50

  cooperj

  committed
  cde68da

  Copy full SHA for cde68da

• Merge branch 'josh-develop' of github.com:SoCSTech/asgard into josh-develop

  cooperj

  committed
  0d89015

  Copy full SHA for 0d89015

Commits on Jan 27, 2025

• feat: add campaign and carousel database tables with necessary constraints, fix Drop-In's resolving #57

  cooperj

  committed
  cc5ccd6

  Copy full SHA for cc5ccd6

• feat: add support session type

  cooperj

  committed
  cd8ea27

  Copy full SHA for cd8ea27

Commits on Jan 28, 2025

• feat: begin work on display content - displays and media, add mailhog (untested

  cooperj

  committed
  069119c

  Copy full SHA for 069119c

• feat: create react router (remix) version

  cooperj

  committed
  dc58804

  Copy full SHA for dc58804

• feat: added login page back to the new admin app

  cooperj

  committed
  21a808e

  Copy full SHA for 21a808e

• chore: del new admin

  cooperj

  committed
  7e6c454

  Copy full SHA for 7e6c454

• fix: add mailhog and unauthed email

  cooperj

  committed
  eb16c24

  Copy full SHA for eb16c24

• feat: make the emails look prettier

  cooperj

  committed
  aa51be3

  Copy full SHA for aa51be3

• feat: add mail queue to prevent auto failures, resolves #50

  cooperj

  committed
  9ec6559

  Copy full SHA for 9ec6559

• feat: add campaign and carousel database tables with necessary constraints, fix Drop-In's resolving #57

  cooperj

  committed
  1e9e1de

  Copy full SHA for 1e9e1de

• feat: add support session type

  cooperj

  committed
  9655457

  Copy full SHA for 9655457

• chore: bump time to wait to 20s from 5s when retrying emails

  cooperj

  committed
  3f03285

  Copy full SHA for 3f03285

• chore: bump time to wait to 20s from 5s when retrying emails

  cooperj

  committed
  cbf032a

  Copy full SHA for cbf032a

• chore: Merge branch 'main' into josh-develop

  cooperj

  committed
  1216ede

  Copy full SHA for 1216ede

Commits on Jan 30, 2025

• feat: add basic totp login to the api

  cooperj

  committed
  09c6676

  Copy full SHA for 09c6676

• feat: add jest configuration and tests for authentication

  cooperj

  committed
  e6c911a

  Copy full SHA for e6c911a

• fix: set working dir for api-test action

  cooperj

  committed
  61f5168

  Copy full SHA for 61f5168

• ci: prevent runs unless actual changes - or manual dispatch

  cooperj

  committed
  e0af323

  Copy full SHA for e0af323

Commits on Jan 31, 2025

• fix: remove hard coded totp secret, check user has both secret and totp enabled

  cooperj

  committed
  787d619

  Copy full SHA for 787d619

Commits on Feb 3, 2025

• fix: set default event name to "Busy" if no title is provided

  cooperj

  committed
  3f89f88

  Copy full SHA for 3f89f88

• feat: add 2fa support

  cooperj

  committed
  2e97bcf

  Copy full SHA for 2e97bcf

• feat: add basic 2fa support to admin panel

  cooperj

  committed
  a0fd2b2

  Copy full SHA for a0fd2b2

• chore: move colours file and remove warning from jobs docker file

  cooperj

  committed
  95a3f40

  Copy full SHA for 95a3f40