Code

Feature/new.html#208

Code

Open

Hakim-Kay wants to merge 241 commits intomakersacademy:mainmakersacademy/acebook-java-template:mainfrom

The-Socialites:feature/new.htmlThe-Socialites/Socialites:feature/new.htmlCopy head branch name to clipboard

Commits

Commits on Jun 17, 2024

• Setting up project

  Umi007

  committed
  0acc267

  Copy full SHA for 0acc267

• Update README.md

  Umi007

  authored
  709f08e

  Copy full SHA for 709f08e

Commits on Jun 18, 2024

• Created Dockerfile

  Umi007

  committed
  d9870f6

  Copy full SHA for d9870f6

• Merge remote-tracking branch 'refs/remotes/origin/main'

  Umi007

  committed
  91f21eb

  Copy full SHA for 91f21eb

• Create ci.yml

  Umi007

  authored
  40a901f

  Copy full SHA for 40a901f

• Connected to cloud db

  Umi007

  committed
  dbbd359

  Copy full SHA for dbbd359

• commented out singuptest for pipeline

  Umi007

  committed
  6688319

  Copy full SHA for 6688319

• Merge pull request #1 from The-Socialites/Umi007-ci/cd

  Show description for 405120c
  Umi007

  authored
  405120c

  Copy full SHA for 405120c

• Create cd.yml

  Umi007

  authored
  5b53565

  Copy full SHA for 5b53565

• Merge pull request #2 from The-Socialites/Umi007-cd

  Show description for 2656c81
  Umi007

  authored
  2656c81

  Copy full SHA for 2656c81

• Update cd.yml

  Umi007

  authored
  2f158e6

  Copy full SHA for 2f158e6

• Update cd.yml

  Umi007

  authored
  8fe9186

  Copy full SHA for 8fe9186

• reset up cloud db

  Umi007

  committed
  5191218

  Copy full SHA for 5191218

• Merge remote-tracking branch 'refs/remotes/origin/main'

  Umi007

  committed
  e8a03d1

  Copy full SHA for e8a03d1

• test

  Umi007

  committed
  8b67d17

  Copy full SHA for 8b67d17

• Update cd.yml

  Umi007

  authored
  83ec66b

  Copy full SHA for 83ec66b

• updated index.html

  Umi007

  committed
  97412eb

  Copy full SHA for 97412eb

• testing

  Umi007

  committed
  d902e39

  Copy full SHA for d902e39

Commits on Jun 19, 2024

• updated git ignore

  Umi007

  committed
  c5a6c4f

  Copy full SHA for c5a6c4f

• Delete AWSCLIV2.pkg

  Umi007

  authored
  7cc2c33

  Copy full SHA for 7cc2c33

• db migrations

  EthanDunwiddie

  committed
  2cf332c

  Copy full SHA for 2cf332c

Commits on Jun 20, 2024

• add user login form and google login

  liuyuanmeng

  committed
  0e3a541

  Copy full SHA for 0e3a541

• Merge pull request #4 from The-Socialites/feature_google

  Show description for 14a053a
  Umi007

  authored
  14a053a

  Copy full SHA for 14a053a

• added events

  EthanDunwiddie

  committed
  410d4eb

  Copy full SHA for 410d4eb

• reseolved merge conflicts

  EthanDunwiddie

  committed
  fe3a295

  Copy full SHA for fe3a295

• update properties

  Umi007

  committed
  c0ee5da

  Copy full SHA for c0ee5da

• updated aws db

  EthanDunwiddie

  committed
  bec5774

  Copy full SHA for bec5774

• Merge pull request #5 from The-Socialites/events

  Show description for 3ecdb3a
  Umi007

  authored
  3ecdb3a

  Copy full SHA for 3ecdb3a

• removed extra input

  EthanDunwiddie

  committed
  9ec364c

  Copy full SHA for 9ec364c

• fixed bugs

  EthanDunwiddie

  committed
  ed92f5c

  Copy full SHA for ed92f5c

• add login-signup css

  liuyuanmeng

  committed
  b3e57fa

  Copy full SHA for b3e57fa

• add nav

  liuyuanmeng

  committed
  0e70776

  Copy full SHA for 0e70776

• dedicated events page

  EthanDunwiddie

  committed
  f19fbb2

  Copy full SHA for f19fbb2

• sorting out properties

  Umi007

  committed
  8683770

  Copy full SHA for 8683770

• Merge remote-tracking branch 'refs/remotes/origin/main'

  Umi007

  committed
  ec12a3e

  Copy full SHA for ec12a3e

Commits on Jun 21, 2024

• add movie api

  liuyuanmeng

  committed
  e38a832

  Copy full SHA for e38a832

• Merge pull request #6 from The-Socialites/feature_google

  Show description for ec556c8
  Rachel853

  authored
  ec556c8

  Copy full SHA for ec556c8

• Styling

  Hakim-Kay

  committed
  f004880

  Copy full SHA for f004880

• Added navbar links work

  Hakim-Kay

  committed
  ca5b709

  Copy full SHA for ca5b709

• Change UserController to LandingPageController

  Hakim-Kay

  committed
  b5f14d7

  Copy full SHA for b5f14d7

• add events to the landing page

  liuyuanmeng

  committed
  a404e96

  Copy full SHA for a404e96

• basics working with events API with data coming through to frontend

  

  Rachel Roberts

  committed
  39d3634

  Copy full SHA for 39d3634

• updated events

  EthanDunwiddie

  committed
  c7fc96f

  Copy full SHA for c7fc96f

• link fixed, thumbnail added, date formatted, API key env.var utilised

  

  Rachel Roberts

  committed
  4b9702b

  Copy full SHA for 4b9702b

• Merge pull request #7 from The-Socialites/thirdPartyAPI

  Show description for 57c837b
  Rachel853

  authored
  57c837b

  Copy full SHA for 57c837b

• Update Dockerfile

  Umi007

  authored
  99631fe

  Copy full SHA for 99631fe

• Update Dockerfile

  Umi007

  authored
  4ae4f2d

  Copy full SHA for 4ae4f2d

• Update ci.yml

  Umi007

  authored
  0a6d68a

  Copy full SHA for 0a6d68a

• Update Dockerfile

  Umi007

  authored
  d9275e3

  Copy full SHA for d9275e3

• Update ci.yml

  Umi007

  authored
  3ac4f72

  Copy full SHA for 3ac4f72

• Update Dockerfile

  Umi007

  authored
  438e654

  Copy full SHA for 438e654

• Update Dockerfile

  Umi007

  authored
  166fc39

  Copy full SHA for 166fc39

• Update Dockerfile

  Umi007

  authored
  4ec16f4

  Copy full SHA for 4ec16f4

• Update pom.xml

  Umi007

  authored
  d958ddd

  Copy full SHA for d958ddd

• Update pom.xml

  Umi007

  authored
  9aae3a6

  Copy full SHA for 9aae3a6

• Update Dockerfile

  Umi007

  authored
  1751a1f

  Copy full SHA for 1751a1f

• Update pom.xml

  Umi007

  authored
  910e5e6

  Copy full SHA for 910e5e6

• Update Dockerfile

  Umi007

  authored
  fad1810

  Copy full SHA for fad1810

• Update pom.xml

  Umi007

  authored
  416fb35

  Copy full SHA for 416fb35

• Update pom.xml

  Umi007

  authored
  3d8023b

  Copy full SHA for 3d8023b

• Update Dockerfile

  Umi007

  authored
  cd4601c

  Copy full SHA for cd4601c

• Update Dockerfile

  Umi007

  authored
  70b5cd0

  Copy full SHA for 70b5cd0

• Update pom.xml

  Umi007

  authored
  e66a703

  Copy full SHA for e66a703

• Update pom.xml

  Umi007

  authored
  b475983

  Copy full SHA for b475983

• Update Dockerfile

  Umi007

  authored
  5cfdb6f

  Copy full SHA for 5cfdb6f

• Update pom.xml

  Umi007

  authored
  f7e6226

  Copy full SHA for f7e6226

• Update Dockerfile

  Umi007

  authored
  439744c

  Copy full SHA for 439744c

• Update cd.yml

  Umi007

  authored
  ea95951

  Copy full SHA for ea95951

• Update Dockerfile

  Umi007

  authored
  fb50098

  Copy full SHA for fb50098

• Update ThirdPartyEventController.java

  Umi007

  authored
  3d7f234

  Copy full SHA for 3d7f234

• Update pom.xml

  Umi007

  authored
  d3fea3d

  Copy full SHA for d3fea3d

• new db

  Umi007

  committed
  45792e3

  Copy full SHA for 45792e3

• Merge remote-tracking branch 'refs/remotes/origin/main'

  Umi007

  committed
  a388acb

  Copy full SHA for a388acb

• dealing with CORS error

  Umi007

  committed
  9f6af84

  Copy full SHA for 9f6af84

Commits on Jun 23, 2024

• first commit

  Umi007

  committed
  c03581d

  Copy full SHA for c03581d

• second commit

  Umi007

  committed
  af80217

  Copy full SHA for af80217

• Integrated filter for events

  Umi007

  committed
  c7c000e

  Copy full SHA for c7c000e

• Merge pull request #8 from The-Socialites/uh-branch

  Show description for 793ee80
  Umi007

  authored
  793ee80

  Copy full SHA for 793ee80

Commits on Jun 24, 2024

• sorting out properties

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  83b5a00

  Copy full SHA for 83b5a00

• fixed bugs

  EthanDunwiddie

  committed
  239367d

  Copy full SHA for 239367d

• add login-signup css

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  9bc46ae

  Copy full SHA for 9bc46ae

• add movie api

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  05d2901

  Copy full SHA for 05d2901

• basics working with events API with data coming through to frontend

  

  Rachel Roberts

  authored and

  EthanDunwiddie

  committed
  e392966

  Copy full SHA for e392966

• link fixed, thumbnail added, date formatted, API key env.var utilised

  

  Rachel Roberts

  authored and

  EthanDunwiddie

  committed
  48cdd28

  Copy full SHA for 48cdd28

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  69b596f

  Copy full SHA for 69b596f

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  2f36d01

  Copy full SHA for 2f36d01

• Update ci.yml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  b983db4

  Copy full SHA for b983db4

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  d85e338

  Copy full SHA for d85e338

• Update ci.yml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  bb08d24

  Copy full SHA for bb08d24

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  7d971ba

  Copy full SHA for 7d971ba

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  2249e92

  Copy full SHA for 2249e92

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  5c0c88c

  Copy full SHA for 5c0c88c

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  6303b43

  Copy full SHA for 6303b43

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  7a57cdb

  Copy full SHA for 7a57cdb

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  a45fdcd

  Copy full SHA for a45fdcd

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  74d35e6

  Copy full SHA for 74d35e6

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  b4b1336

  Copy full SHA for b4b1336

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  acb75ca

  Copy full SHA for acb75ca

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  d65a5fe

  Copy full SHA for d65a5fe

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  bde42f0

  Copy full SHA for bde42f0

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  e96dc22

  Copy full SHA for e96dc22

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  9d2b95e

  Copy full SHA for 9d2b95e

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  b519c4f

  Copy full SHA for b519c4f

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  40366e0

  Copy full SHA for 40366e0

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  4e69b10

  Copy full SHA for 4e69b10

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  393533f

  Copy full SHA for 393533f

• Update cd.yml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  b5d0c48

  Copy full SHA for b5d0c48

• Update Dockerfile

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  8208876

  Copy full SHA for 8208876

• Update ThirdPartyEventController.java

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  e6baae7

  Copy full SHA for e6baae7

• Update pom.xml

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  d971531

  Copy full SHA for d971531

• dealing with CORS error

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  076fc3f

  Copy full SHA for 076fc3f

• Fixed merge conflicts

  EthanDunwiddie

  committed
  0e25c8c

  Copy full SHA for 0e25c8c

• fixed merge conflicts

  EthanDunwiddie

  committed
  8f71ece

  Copy full SHA for 8f71ece

• add page for each event

  EthanDunwiddie

  committed
  ed94eb8

  Copy full SHA for ed94eb8

• add user account

  liuyuanmeng

  committed
  e7040df

  Copy full SHA for e7040df

• Merge branch 'main' into events

  Umi007

  authored
  605d047

  Copy full SHA for 605d047

• Merge pull request #9 from The-Socialites/events

  Show description for 47641aa
  Umi007

  authored
  47641aa

  Copy full SHA for 47641aa

• fixed indexing

  Umi007

  committed
  2be4176

  Copy full SHA for 2be4176

• fixed db routing

  Umi007

  committed
  e40a872

  Copy full SHA for e40a872

• Updated app-dev properties

  Umi007

  committed
  2028945

  Copy full SHA for 2028945

• create and view comments functionality all created

  

  Rachel Roberts

  committed
  065dbf1

  Copy full SHA for 065dbf1

• create and view comments functionality all created

  

  Rachel Roberts

  committed
  dfd170f

  Copy full SHA for dfd170f

• merged with Ethan and Umi's work

  

  Rachel Roberts

  committed
  5dc6e73

  Copy full SHA for 5dc6e73

• fixed routing

  Umi007

  committed
  ae8b7ef

  Copy full SHA for ae8b7ef

• Merge pull request #10 from The-Socialites/Fixing-routing

  Show description for 1392496
  Umi007

  authored
  1392496

  Copy full SHA for 1392496

• removed debugging lines

  Umi007

  committed
  07ac19f

  Copy full SHA for 07ac19f

• sec config

  Umi007

  committed
  a7b548f

  Copy full SHA for a7b548f

• update config

  Umi007

  committed
  56d4811

  Copy full SHA for 56d4811

• sec config

  Umi007

  committed
  05df8df

  Copy full SHA for 05df8df

• updated application properties

  Umi007

  committed
  cad4465

  Copy full SHA for cad4465

• add account and events show on landing page

  liuyuanmeng

  committed
  a132165

  Copy full SHA for a132165

• Update Dockerfile

  Umi007

  authored
  9c0c4b1

  Copy full SHA for 9c0c4b1

• Update Dockerfile

  Umi007

  authored
  b219844

  Copy full SHA for b219844

• Update Dockerfile

  Umi007

  authored
  6f2bde5

  Copy full SHA for 6f2bde5

• change endpoint

  liuyuanmeng

  committed
  a7c5d27

  Copy full SHA for a7c5d27

• Update Dockerfile

  Umi007

  authored
  44b46b5

  Copy full SHA for 44b46b5

• fix conflicts

  liuyuanmeng

  committed
  bbfe632

  Copy full SHA for bbfe632

• Update cd.yml

  Umi007

  authored
  1fb53cd

  Copy full SHA for 1fb53cd

• bugs fixed after merging

  

  Rachel Roberts

  committed
  6f07be1

  Copy full SHA for 6f07be1

• Update cd.yml

  Umi007

  authored
  e75aeee

  Copy full SHA for e75aeee

• move events filert to landling page

  liuyuanmeng

  committed
  84778e6

  Copy full SHA for 84778e6

• Update Dockerfile

  Umi007

  authored
  73d57ea

  Copy full SHA for 73d57ea

• Merge pull request #14 from The-Socialites/feature/account

  Show description for 3e62a4f
  Umi007

  authored
  3e62a4f

  Copy full SHA for 3e62a4f

• Merge branch 'main' into backendComments

  Umi007

  authored
  8b17530

  Copy full SHA for 8b17530

• Merge pull request #13 from The-Socialites/backendComments

  Show description for b25ee20
  Umi007

  authored
  b25ee20

  Copy full SHA for b25ee20

• debugging

  Umi007

  committed
  95d457a

  Copy full SHA for 95d457a

• Update cd.yml

  Umi007

  authored
  ea378bf

  Copy full SHA for ea378bf

• Update cd.yml

  Umi007

  authored
  2aae54c

  Copy full SHA for 2aae54c

• Update cd.yml

  Umi007

  authored
  a9f66de

  Copy full SHA for a9f66de

• Update cd.yml

  Umi007

  authored
  64f76ce

  Copy full SHA for 64f76ce

• Update cd.yml

  Umi007

  authored
  e153a48

  Copy full SHA for e153a48

• Update cd.yml

  Umi007

  authored
  6ac58a8

  Copy full SHA for 6ac58a8

• Update cd.yml

  Umi007

  authored
  030915a

  Copy full SHA for 030915a

• added request mapping

  Umi007

  committed
  0227bdf

  Copy full SHA for 0227bdf

• added request mapping

  Umi007

  committed
  c7b6972

  Copy full SHA for c7b6972

• third-party events now searchable by date

  

  Rachel Roberts

  committed
  be31edd

  Copy full SHA for be31edd

• Merge branch 'main' into backendComments

  Show description for f717b91
  

  Rachel Roberts

  committed
  f717b91

  Copy full SHA for f717b91

• fix nav

  liuyuanmeng

  committed
  c82ae05

  Copy full SHA for c82ae05

• Debugging

  Umi007

  committed
  7b8dba9

  Copy full SHA for 7b8dba9

• debug

  Umi007

  committed
  757ce31

  Copy full SHA for 757ce31

• fix nav bar and add api events css

  liuyuanmeng

  committed
  9aeb804

  Copy full SHA for 9aeb804

• pom.xml bugs fixed from Daisy's code

  

  Rachel Roberts

  committed
  b1f0b26

  Copy full SHA for b1f0b26

• Merge branch 'main' into backendComments

  Rachel853

  authored
  2b248da

  Copy full SHA for 2b248da

• integrated s3

  Umi007

  committed
  fa7d813

  Copy full SHA for fa7d813

• Merge pull request #15 from The-Socialites/backendComments

  Show description for 2e666c4
  Umi007

  authored
  2e666c4

  Copy full SHA for 2e666c4

• Merge pull request #17 from The-Socialites/actual-s3-integration

  Show description for 3008793
  Umi007

  authored
  3008793

  Copy full SHA for 3008793

• push again

  liuyuanmeng

  committed
  daa3697

  Copy full SHA for daa3697

• Merge branch 'main' into feature/account

  liuyuanmeng

  authored
  7f1fa8d

  Copy full SHA for 7f1fa8d

• Merge pull request #18 from The-Socialites/feature/account

  Show description for 38ec389
  liuyuanmeng

  authored
  38ec389

  Copy full SHA for 38ec389

• fix account css and add search for api events

  liuyuanmeng

  committed
  bb0d443

  Copy full SHA for bb0d443

Commits on Jun 25, 2024

• add link to events list

  liuyuanmeng

  committed
  0f4f703

  Copy full SHA for 0f4f703

• Merge pull request #19 from The-Socialites/feature/account

  Show description for 1e5c09d
  Umi007

  authored
  1e5c09d

  Copy full SHA for 1e5c09d

• add search for event's location, owner, title, add logo

  liuyuanmeng

  committed
  fee2c68

  Copy full SHA for fee2c68

• Merge pull request #20 from The-Socialites/feature/account

  Show description for 437ca45
  Umi007

  authored
  437ca45

  Copy full SHA for 437ca45

• added db migration

  Umi007

  committed
  1864193

  Copy full SHA for 1864193

• test in google

  liuyuanmeng

  committed
  35d40c5

  Copy full SHA for 35d40c5

• Merge remote-tracking branch 'origin/main' into feature/account

  liuyuanmeng

  committed
  36e51e3

  Copy full SHA for 36e51e3

• cleverly created frontend and backend 'Attending' functionality in Main :)

  

  Rachel Roberts

  committed
  337dc9a

  Copy full SHA for 337dc9a

• Merge branch 'main' into AttendingFunctionality

  Rachel853

  authored
  7ce4cbe

  Copy full SHA for 7ce4cbe

• allow google login user to see account page

  liuyuanmeng

  committed
  ba86f75

  Copy full SHA for ba86f75

• Merge pull request #21 from The-Socialites/AttendingFunctionality

  Show description for d60c85d
  Umi007

  authored
  d60c85d

  Copy full SHA for d60c85d

• imports for landingPageController

  

  Rachel Roberts

  committed
  f34b687

  Copy full SHA for f34b687

• merged with main

  

  Rachel Roberts

  committed
  13941b6

  Copy full SHA for 13941b6

• events/attend/** removed from authorizeReqs in Security Config

  

  Rachel Roberts

  committed
  c599654

  Copy full SHA for c599654

• Merge pull request #22 from The-Socialites/bug/non-logged-in-users-selecting-attending

  Show description for d030f82
  Umi007

  authored
  d030f82

  Copy full SHA for d030f82

• changed user journey after logging in

  Umi007

  committed
  d61800c

  Copy full SHA for d61800c

Commits on Jun 26, 2024

• add isAuthenticated checker

  liuyuanmeng

  committed
  74019b0

  Copy full SHA for 74019b0

• Merge remote-tracking branch 'origin/main' into feature/account

  liuyuanmeng

  committed
  d325a0f

  Copy full SHA for d325a0f

• added encryption, updated update account feature

  EthanDunwiddie

  committed
  c4e85d6

  Copy full SHA for c4e85d6

• add logout

  liuyuanmeng

  committed
  bfa0f6e

  Copy full SHA for bfa0f6e

• Merge pull request #23 from The-Socialites/feature/account

  Show description for 7925f43
  Umi007

  authored
  7925f43

  Copy full SHA for 7925f43

• dealing with CORS issue

  Umi007

  committed
  b770bb6

  Copy full SHA for b770bb6

• Merge remote-tracking branch 'refs/remotes/origin/main'

  Umi007

  committed
  d870e18

  Copy full SHA for d870e18

• Update README.md

  Umi007

  authored
  a42dc3a

  Copy full SHA for a42dc3a

• fixed mapping issue

  Umi007

  committed
  5b787eb

  Copy full SHA for 5b787eb

• updated password check for google login users

  EthanDunwiddie

  committed
  dd840ac

  Copy full SHA for dd840ac

• A whole load of styling

  Hakim-Kay

  committed
  e9edf77

  Copy full SHA for e9edf77

• Merge pull request #24 from The-Socialites/feature/new.html

  Show description for 3d741c2
  Hakim-Kay

  authored
  3d741c2

  Copy full SHA for 3d741c2

• imports for landingPageController

  

  Rachel Roberts

  authored and

  EthanDunwiddie

  committed
  990314f

  Copy full SHA for 990314f

• changed user journey after logging in

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  f72e0b9

  Copy full SHA for f72e0b9

• dealing with CORS issue

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  a3f287e

  Copy full SHA for a3f287e

• fixed event details

  Umi007

  committed
  3e81fe8

  Copy full SHA for 3e81fe8

• nothing to commit

  liuyuanmeng

  committed
  f2d2d42

  Copy full SHA for f2d2d42

• test in google

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  d0e0344

  Copy full SHA for d0e0344

• allow google login user to see account page

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  fcf590d

  Copy full SHA for fcf590d

• add isAuthenticated checker

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  5b2ac54

  Copy full SHA for 5b2ac54

• add logout

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  568805d

  Copy full SHA for 568805d

• Update README.md

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  6db5e80

  Copy full SHA for 6db5e80

• fixed mapping issue

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  da2fde0

  Copy full SHA for da2fde0

• fix conflicts

  liuyuanmeng

  committed
  d18f875

  Copy full SHA for d18f875

• added encryption, updated update account feature

  EthanDunwiddie

  committed
  4703fa2

  Copy full SHA for 4703fa2

• updated account details for OAuth2 users

  EthanDunwiddie

  committed
  d5bee05

  Copy full SHA for d5bee05

• adjusted app-dev-properties comments

  EthanDunwiddie

  committed
  d67d63d

  Copy full SHA for d67d63d

• imports for landingPageController

  

  Rachel Roberts

  authored and

  EthanDunwiddie

  committed
  e3cbcc0

  Copy full SHA for e3cbcc0

• events/attend/** removed from authorizeReqs in Security Config

  

  Rachel Roberts

  authored and

  EthanDunwiddie

  committed
  f6bd42c

  Copy full SHA for f6bd42c

• test in google

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  cb9bd3d

  Copy full SHA for cb9bd3d

• allow google login user to see account page

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  bdf84ca

  Copy full SHA for bdf84ca

• A whole load of styling

  

  Hakim-Kay

  authored and

  EthanDunwiddie

  committed
  1f9a183

  Copy full SHA for 1f9a183

• fixed event details

  

  Umi007

  authored and

  EthanDunwiddie

  committed
  7c6f461

  Copy full SHA for 7c6f461

• added encryption, updated update account feature

  EthanDunwiddie

  committed
  722aa64

  Copy full SHA for 722aa64

• test in google

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  28c8d82

  Copy full SHA for 28c8d82

• allow google login user to see account page

  

  liuyuanmeng

  authored and

  EthanDunwiddie

  committed
  60198b2

  Copy full SHA for 60198b2

• added encryption, updated update account feature

  EthanDunwiddie

  committed
  b94f7e3

  Copy full SHA for b94f7e3

• fixed merge conflicts

  EthanDunwiddie

  committed
  8bad661

  Copy full SHA for 8bad661

• Merge branch 'main' into password_encoding

  EthanDunwiddie

  authored
  d7d37fe

  Copy full SHA for d7d37fe

• Merge pull request #25 from The-Socialites/password_encoding

  Show description for 23f91de
  EthanDunwiddie

  authored
  23f91de

  Copy full SHA for 23f91de

• save my work

  liuyuanmeng

  committed
  2b5dd5f

  Copy full SHA for 2b5dd5f

• fix

  liuyuanmeng

  committed
  6208ab7

  Copy full SHA for 6208ab7

• fixed id

  EthanDunwiddie

  committed
  2242649

  Copy full SHA for 2242649

• updated user controller

  EthanDunwiddie

  committed
  c71195f

  Copy full SHA for c71195f

• add external links

  liuyuanmeng

  committed
  bc3f9e0

  Copy full SHA for bc3f9e0

• Merge pull request #26 from The-Socialites/feature/landingPage

  Show description for ee8ebc8
  EthanDunwiddie

  authored
  ee8ebc8

  Copy full SHA for ee8ebc8

• nothing

  Umi007

  committed
  57321d6

  Copy full SHA for 57321d6

• Merge remote-tracking branch 'refs/remotes/origin/main'

  Umi007

  committed
  17013c9

  Copy full SHA for 17013c9

• custom error handler

  EthanDunwiddie

  committed
  02aabf8

  Copy full SHA for 02aabf8

• Merge pull request #28 from The-Socialites/errorHandling

  Show description for fc3aae6
  Umi007

  authored
  fc3aae6

  Copy full SHA for fc3aae6

• reverted to before password encoding

  Umi007

  committed
  59396e8

  Copy full SHA for 59396e8

• Merge pull request #29 from The-Socialites/fixing-account-page

  Show description for 64ef403
  Umi007

  authored
  64ef403

  Copy full SHA for 64ef403

• Update UserController.java

  Umi007

  authored
  c35f070

  Copy full SHA for c35f070

• A whole load of styling

  Hakim-Kay

  committed
  db9c844

  Copy full SHA for db9c844

Commits on Jun 27, 2024

• old details page

  Hakim-Kay

  committed
  2b158c9

  Copy full SHA for 2b158c9