Code

made a teeny weeny css change #515

Code

Open

emmadavids wants to merge 232 commits intomakersacademy:mainmakersacademy/acebook-node-template:mainfrom Loo-Ashworth:seeds2Loo-Ashworth/acebook-poke:seeds2Copy head branch name to clipboard

+7,306-8,394

Commits

Commits on Jun 12, 2023

• Updated Readme

  Loo-Ashworth

  committed
  ad1dd33

  Copy full SHA for ad1dd33

• Merge pull request #1 from Loo-Ashworth/ReadmeInitial

  Show description for 71cfbe6
  adrianHards

  authored
  71cfbe6

  Copy full SHA for 71cfbe6

• basic links to navigate site

  adrianHards

  committed
  3424dce

  Copy full SHA for 3424dce

• add basic seed file and structure

  adrianHards

  committed
  faa41bc

  Copy full SHA for faa41bc

• es6 refactor

  adrianHards

  committed
  f7a6855

  Copy full SHA for f7a6855

• Cypress version updated

  Joecunliffe98

  committed
  039134e

  Copy full SHA for 039134e

• Merge pull request #2 from Loo-Ashworth/seed

  Show description for 7bb1db2
  emmadavids

  authored
  7bb1db2

  Copy full SHA for 7bb1db2

Commits on Jun 13, 2023

• added message to inform user of login

  emmadavids

  committed
  a647b68

  Copy full SHA for a647b68

• merge with main

  adrianHards

  committed
  c3811b9

  Copy full SHA for c3811b9

• Merge pull request #3 from Loo-Ashworth/cypress_V2

  Show description for b6ae009
  adrianHards

  authored
  b6ae009

  Copy full SHA for b6ae009

• updating config stuff

  emmadavids

  committed
  d3e1f17

  Copy full SHA for d3e1f17

• add additional post unit tests

  adrianHards

  committed
  637292e

  Copy full SHA for 637292e

• refactored post unit tests

  adrianHards

  committed
  095324b

  Copy full SHA for 095324b

• remove posts reverse test from unit test

  adrianHards

  committed
  c83287e

  Copy full SHA for c83287e

• use class not text to select new post link

  adrianHards

  committed
  436277c

  Copy full SHA for 436277c

• posts show in reverse order

  adrianHards

  committed
  c36ed9d

  Copy full SHA for c36ed9d

• remove commented out test

  adrianHards

  committed
  7af047a

  Copy full SHA for 7af047a

• Merge pull request #5 from Loo-Ashworth/posts

  Show description for 36b1188
  adrianHards

  authored
  36b1188

  Copy full SHA for 36b1188

• added user logic

  emmadavids

  committed
  b6dadfa

  Copy full SHA for b6dadfa

• merge with main

  emmadavids

  committed
  c065748

  Copy full SHA for c065748

• fixed config typo

  emmadavids

  committed
  e12a696

  Copy full SHA for e12a696

• fixed test typo

  emmadavids

  committed
  8be0875

  Copy full SHA for 8be0875

• Merge pull request #6 from Loo-Ashworth/emmad

  Show description for 1b082ce
  emmadavids

  authored
  1b082ce

  Copy full SHA for 1b082ce

• fix post model and unit tests

  adrianHards

  committed
  b33ce83

  Copy full SHA for b33ce83

• update seed file

  adrianHards

  committed
  d13a4ee

  Copy full SHA for d13a4ee

• remove unnecessary imports

  adrianHards

  committed
  28171ce

  Copy full SHA for 28171ce

• unique post and user id for a like

  adrianHards

  committed
  586bb07

  Copy full SHA for 586bb07

• Merge pull request #7 from Loo-Ashworth/add-user-to-post

  Show description for 2489a4e
  lisaoausb

  authored
  2489a4e

  Copy full SHA for 2489a4e

• danger do not use this code

  emmadavids

  committed
  014b475

  Copy full SHA for 014b475

• likes are unique and can be toggled by user for a specific post

  adrianHards

  committed
  e2f73f6

  Copy full SHA for e2f73f6

• modify eslint rules

  adrianHards

  committed
  461c98c

  Copy full SHA for 461c98c

• refactor

  adrianHards

  committed
  0529c5b

  Copy full SHA for 0529c5b

Commits on Jun 14, 2023

• update seed file to drop Likes; add username to User

  adrianHards

  committed
  d315867

  Copy full SHA for d315867

• update seed file to include username

  adrianHards

  committed
  6b974dc

  Copy full SHA for 6b974dc

• comment out username

  adrianHards

  committed
  02eeec3

  Copy full SHA for 02eeec3

• remove username

  adrianHards

  committed
  a640ca5

  Copy full SHA for a640ca5

• show liked by users on hover

  adrianHards

  committed
  c6d50e4

  Copy full SHA for c6d50e4

• fixed controller issue.

  emmadavids

  committed
  1fb1f67

  Copy full SHA for 1fb1f67

• Merge pull request #8 from Loo-Ashworth/likes

  Show description for 5c1a8ea
  lisaoausb

  authored
  5c1a8ea

  Copy full SHA for 5c1a8ea

• fix post unit tests for multiple posts

  adrianHards

  committed
  1338f71

  Copy full SHA for 1338f71

• add unit tests for likes

  adrianHards

  committed
  4831034

  Copy full SHA for 4831034

• add unit tests for likes

  adrianHards

  committed
  406b4f9

  Copy full SHA for 406b4f9

• added error handling for duplicate email

  emmadavids

  committed
  11795a0

  Copy full SHA for 11795a0

• commenting out failing test

  emmadavids

  committed
  d6f69f4

  Copy full SHA for d6f69f4

• Merge pull request #9 from Loo-Ashworth/likes-unit-tests

  Show description for aa21c24
  adrianHards

  authored
  aa21c24

  Copy full SHA for aa21c24

• Merge branch 'main' of https://github.com/Loo-Ashworth/acebook-poke into emmad

  emmadavids

  committed
  e8ea256

  Copy full SHA for e8ea256

• fixed session controller pw logic

  emmadavids

  committed
  9eb3ba5

  Copy full SHA for 9eb3ba5

• Update users.js

  Show description for fa59ae8
  adrianHards

  authored
  fa59ae8

  Copy full SHA for fa59ae8

• Merge branch 'main' of https://github.com/Loo-Ashworth/acebook-poke into emmad

  emmadavids

  committed
  1e64167

  Copy full SHA for 1e64167

• cloudinary setup

  emmadavids

  committed
  44b8684

  Copy full SHA for 44b8684

• wahh

  emmadavids

  committed
  6da1bed

  Copy full SHA for 6da1bed

• Merge pull request #11 from Loo-Ashworth/emmad

  Show description for b4ab720
  adrianHards

  authored
  b4ab720

  Copy full SHA for b4ab720

• setup friends page, friends model, routes and controller

  adrianHards

  committed
  08f319a

  Copy full SHA for 08f319a

• testing in progress

  emmadavids

  committed
  72715e1

  Copy full SHA for 72715e1

• add ability to add a friend

  adrianHards

  committed
  381a678

  Copy full SHA for 381a678

• Refactored E2E Specs into Site Object

  Loo-Ashworth

  committed
  45fa498

  Copy full SHA for 45fa498

• pending friendships can be accepted or rejected

  adrianHards

  committed
  ce672d8

  Copy full SHA for ce672d8

• Adjusted to Include Username Entry

  Loo-Ashworth

  committed
  7b2ef39

  Copy full SHA for 7b2ef39

• list pending friendships

  adrianHards

  committed
  00401d0

  Copy full SHA for 00401d0

• add link to friends; show sent friend requests

  adrianHards

  committed
  3f1adb9

  Copy full SHA for 3f1adb9

Commits on Jun 15, 2023

• send a friend request

  adrianHards

  committed
  5185f26

  Copy full SHA for 5185f26

• show username of poster

  adrianHards

  committed
  3196e48

  Copy full SHA for 3196e48

• prevent users from befriending themselves

  adrianHards

  committed
  4f7b9bc

  Copy full SHA for 4f7b9bc

• refactor stylesheets

  adrianHards

  committed
  0f363bf

  Copy full SHA for 0f363bf

• wrote some more tests for user

  emmadavids

  committed
  9c4995e

  Copy full SHA for 9c4995e

• added tests for user

  emmadavids

  committed
  200d7e8

  Copy full SHA for 200d7e8

• small change to email whitespace test

  emmadavids

  committed
  65a82d3

  Copy full SHA for 65a82d3

• resolved conflict

  emmadavids

  committed
  1f0d766

  Copy full SHA for 1f0d766

• Moved File Locations to Improve Cypress Run

  Loo-Ashworth

  committed
  8b7653a

  Copy full SHA for 8b7653a

• Merge pull request #12 from Loo-Ashworth/befriend

  Show description for b42b21c
  Joecunliffe98

  authored
  b42b21c

  Copy full SHA for b42b21c

• Merge branch 'main' into e2e_refactor

  Loo-Ashworth

  committed
  0d81155

  Copy full SHA for 0d81155

• Refresh Directories

  Loo-Ashworth

  committed
  1ce65f8

  Copy full SHA for 1ce65f8

• Deleted pageClassTestSpec.js

  Joecunliffe98

  committed
  bdf6a3b

  Copy full SHA for bdf6a3b

• user stays logged in even after encountering bug

  adrianHards

  committed
  4083acb

  Copy full SHA for 4083acb

• Added Can See Likes Count On Post Test - Fixed formatting issue with posts/index.hbs

  Joecunliffe98

  committed
  59b93fa

  Copy full SHA for 59b93fa

• Moved likes test file to redundant

  Joecunliffe98

  committed
  bf5ad09

  Copy full SHA for bf5ad09

• Added test for likes when multiple posts are made

  Joecunliffe98

  committed
  0c62c8c

  Copy full SHA for 0c62c8c

• add a drop db script

  adrianHards

  committed
  c33d202

  Copy full SHA for c33d202

• Merge pull request #14 from Loo-Ashworth/session-persistance-bug

  Show description for 74d73cc
  Loo-Ashworth

  authored
  74d73cc

  Copy full SHA for 74d73cc

• render new message when validation error

  adrianHards

  committed
  cbb99c2

  Copy full SHA for cbb99c2

• shift enter no longer opens a new window

  adrianHards

  committed
  7fc12a2

  Copy full SHA for 7fc12a2

• Test added for seeing posts in reverse order & multiple posts like count

  Joecunliffe98

  committed
  d19e198

  Copy full SHA for d19e198

• add timestamps to posts

  adrianHards

  committed
  98a37f2

  Copy full SHA for 98a37f2

• format timestamps

  adrianHards

  committed
  3d1ec38

  Copy full SHA for 3d1ec38

• added functionality to write comments under a post, also displays author of post, added some CSS in a separate file for comment section. comments required to edit posts.js, index.hbs of posts views…

  Show description for 7c2690d
  lisaoausb

  committed
  7c2690d

  Copy full SHA for 7c2690d

• refactor posts page

  adrianHards

  committed
  8781b97

  Copy full SHA for 8781b97

• Users can see posts in reverse order moved to redundant folder

  Joecunliffe98

  committed
  00aa506

  Copy full SHA for 00aa506

• Added logout feature to site object model & Added user can like another users post and likes add up test

  Joecunliffe98

  committed
  62a2a7a

  Copy full SHA for 62a2a7a

• add message when successfully signed in

  adrianHards

  committed
  247490e

  Copy full SHA for 247490e

• add message when successfully signed out

  adrianHards

  committed
  a41e049

  Copy full SHA for a41e049

• refactor drop

  adrianHards

  committed
  93cfa3a

  Copy full SHA for 93cfa3a

• added tests for comments

  lisaoausb

  committed
  4a4a36e

  Copy full SHA for 4a4a36e

• Added shouldContain method, changed likePost method so a post ID can be used instead of just liking the first post

  Joecunliffe98

  committed
  1eb29ec

  Copy full SHA for 1eb29ec

• trying to resolve error when posting spaces as a comment

  lisaoausb

  committed
  f2eded4

  Copy full SHA for f2eded4

• Merge pull request #15 from Loo-Ashworth/render-new-on-error

  Show description for de74aa5
  lisaoausb

  authored
  de74aa5

  Copy full SHA for de74aa5

• resolved merge conflicts

  lisaoausb

  committed
  1db95d1

  Copy full SHA for 1db95d1

• rewrote tests - some need review still broken

  emmadavids

  committed
  849a3c6

  Copy full SHA for 849a3c6

• reset files to how they were to find why route is not going back to posts

  lisaoausb

  committed
  a1a904a

  Copy full SHA for a1a904a

• playing with cloudinary configg

  emmadavids

  committed
  7f9ec3a

  Copy full SHA for 7f9ec3a

• playing with cloudinary config part 2

  emmadavids

  committed
  ef38e80

  Copy full SHA for ef38e80

• Merge branch 'main' of into testing-user

  emmadavids

  committed
  32f1ad9

  Copy full SHA for 32f1ad9

Commits on Jun 16, 2023

• enforce unique username and email

  adrianHards

  committed
  2f34dfe

  Copy full SHA for 2f34dfe

• refactor notes

  adrianHards

  committed
  d5b4243

  Copy full SHA for d5b4243

• cloudinary in progress

  emmadavids

  committed
  358ac57

  Copy full SHA for 358ac57

• let a user sign out

  adrianHards

  committed
  ec15707

  Copy full SHA for ec15707

• fix sign up bug

  adrianHards

  committed
  56a151c

  Copy full SHA for 56a151c

• Merge pull request #16 from Loo-Ashworth/testing-user-adrian

  Show description for 296185d
  emmadavids

  authored
  296185d

  Copy full SHA for 296185d

• Merge pull request #13 from Loo-Ashworth/testing-user

  Show description for f87ba58
  adrianHards

  authored
  f87ba58

  Copy full SHA for f87ba58

• error message displays when people enter spaces only

  lisaoausb

  committed
  5b9dcee

  Copy full SHA for 5b9dcee

• comment functionality

  lisaoausb

  committed
  fc3ee34

  Copy full SHA for fc3ee34

• cloudinary still in progress..

  emmadavids

  committed
  97a7684

  Copy full SHA for 97a7684

• cloudinary still in progress

  emmadavids

  committed
  a31404a

  Copy full SHA for a31404a

• Redundant folder removed

  Joecunliffe98

  committed
  12d8838

  Copy full SHA for 12d8838

• Create main.yml

  Show description for 7211510
  adrianHards

  authored
  7211510

  Copy full SHA for 7211510

• Merge pull request #17 from Loo-Ashworth/comments

  Show description for ea3dfe4
  adrianHards

  authored
  ea3dfe4

  Copy full SHA for ea3dfe4

• merge with main

  adrianHards

  committed
  8f45838

  Copy full SHA for 8f45838

• Merge remote-tracking branch 'origin' into e2e_refactor

  Joecunliffe98

  committed
  6564ff9

  Copy full SHA for 6564ff9

• Site object model changed to reflect new posts page

  Joecunliffe98

  committed
  f7a2b73

  Copy full SHA for f7a2b73

• Merge pull request #20 from Loo-Ashworth/e2e_refactor

  Show description for bce2d87
  Loo-Ashworth

  authored
  bce2d87

  Copy full SHA for bce2d87

• merge with main

  adrianHards

  committed
  d6ed7b2

  Copy full SHA for d6ed7b2

• Merge pull request #19 from Loo-Ashworth/github-action

  Show description for 8a0fcb7
  Loo-Ashworth

  authored
  8a0fcb7

  Copy full SHA for 8a0fcb7

• cloudinary tinkering

  emmadavids

  committed
  0524d8d

  Copy full SHA for 0524d8d

• tinkering

  emmadavids

  committed
  0e5f9ae

  Copy full SHA for 0e5f9ae

• remove images

  adrianHards

  committed
  c5814c2

  Copy full SHA for c5814c2

• resolve merge conflict

  adrianHards

  committed
  ade1eb0

  Copy full SHA for ade1eb0

• update package lock

  adrianHards

  committed
  ac432d4

  Copy full SHA for ac432d4

• hide api keys

  adrianHards

  committed
  956cde8

  Copy full SHA for 956cde8

• Added Performance Testing

  Loo-Ashworth

  committed
  da1483d

  Copy full SHA for da1483d

• multer woes

  adrianHards

  committed
  1a5d302

  Copy full SHA for 1a5d302

• Merge pull request #21 from Loo-Ashworth/performance

  Show description for 4576d7b
  Lmason14

  authored
  4576d7b

  Copy full SHA for 4576d7b

• finally upload to cloudinary

  adrianHards

  committed
  b698686

  Copy full SHA for b698686

• hide api keys

  adrianHards

  committed
  699b9e6

  Copy full SHA for 699b9e6

• merge with main

  adrianHards

  committed
  ac17911

  Copy full SHA for ac17911

• image is null

  adrianHards

  committed
  a9f6740

  Copy full SHA for a9f6740

• remove flash

  adrianHards

  committed
  1f84bc0

  Copy full SHA for 1f84bc0

• Merge pull request #22 from Loo-Ashworth/cloudinary-adrian

  Show description for 00ba44b
  adrianHards

  authored
  00ba44b

  Copy full SHA for 00ba44b

• add photos to posts

  adrianHards

  committed
  3331d43

  Copy full SHA for 3331d43

• change to input

  adrianHards

  committed
  5ae9453

  Copy full SHA for 5ae9453

• Merge pull request #23 from Loo-Ashworth/add-photo-to-post

  Show description for a7ce750
  Loo-Ashworth

  authored
  a7ce750

  Copy full SHA for a7ce750

Commits on Jun 18, 2023

• break index into partials

  adrianHards

  committed
  add8919

  Copy full SHA for add8919

• ajax for posts

  adrianHards

  committed
  d52a910

  Copy full SHA for d52a910

Commits on Jun 19, 2023

• abstract away code from the posts controller

  adrianHards

  committed
  78ce04f

  Copy full SHA for 78ce04f

• abstract away code from other controllers

  adrianHards

  committed
  a688b85

  Copy full SHA for a688b85

• refactor posts to ajax comment

  adrianHards

  committed
  6a855e6

  Copy full SHA for 6a855e6

• refactor partials

  adrianHards

  committed
  b8e6fcc

  Copy full SHA for b8e6fcc

• move ajax js in to public folder

  adrianHards

  committed
  b316f86

  Copy full SHA for b316f86

• ajax working for comments

  adrianHards

  committed
  f59b761

  Copy full SHA for f59b761

• add id to new post to enable comments on that post

  adrianHards

  committed
  52ed202

  Copy full SHA for 52ed202

• ajax comments

  adrianHards

  committed
  29aec5e

  Copy full SHA for 29aec5e

• remove unncessary files

  adrianHards

  committed
  c9ce8eb

  Copy full SHA for c9ce8eb

• new posts aren't pokeable

  adrianHards

  committed
  7149e84

  Copy full SHA for 7149e84

• ajax of likes works on existing posts

  adrianHards

  committed
  41cfbf4

  Copy full SHA for 41cfbf4

• ajax of likes for a new post

  adrianHards

  committed
  8cb72bd

  Copy full SHA for 8cb72bd

• pass unit tests

  adrianHards

  committed
  a5a7ca9

  Copy full SHA for a5a7ca9

• added edit/delete functionality to post

  emmadavids

  committed
  9a98c3c

  Copy full SHA for 9a98c3c

• create new post

  adrianHards

  committed
  0e512bf

  Copy full SHA for 0e512bf

• refactor code

  adrianHards

  committed
  800005d

  Copy full SHA for 800005d

Commits on Jun 20, 2023

• refactor ajax js code into diff files

  adrianHards

  committed
  d684d12

  Copy full SHA for d684d12

• prettier

  adrianHards

  committed
  6e991fd

  Copy full SHA for 6e991fd

• redirect to sign in if not before visiting posts

  adrianHards

  committed
  333bb03

  Copy full SHA for 333bb03

• Merge pull request #27 from Loo-Ashworth/editdeletepost

  Show description for e01c5a7
  emmadavids

  authored
  e01c5a7

  Copy full SHA for e01c5a7

• added confirm msg

  emmadavids

  committed
  b1340a8

  Copy full SHA for b1340a8

• reset form on submit

  adrianHards

  committed
  125d768

  Copy full SHA for 125d768

• remove lines from e2e

  adrianHards

  committed
  74d097f

  Copy full SHA for 74d097f

• add user who liked post even if new post

  adrianHards

  committed
  bdcb3b3

  Copy full SHA for bdcb3b3

• failing e2e edits

  adrianHards

  committed
  fd824fe

  Copy full SHA for fd824fe

• fix handler and refactor target

  adrianHards

  committed
  0925666

  Copy full SHA for 0925666

• remove spacing around 0

  adrianHards

  committed
  8cbe5ed

  Copy full SHA for 8cbe5ed

• passing 4 and 7

  adrianHards

  committed
  191e831

  Copy full SHA for 191e831

• passing all tests

  adrianHards

  committed
  f1022d6

  Copy full SHA for f1022d6

• merge edit and delete

  adrianHards

  committed
  bf80e02

  Copy full SHA for bf80e02

• Merge pull request #28 from Loo-Ashworth/editdeletepost

  Show description for 7aac94d
  adrianHards

  authored
  7aac94d

  Copy full SHA for 7aac94d

• merge with main

  adrianHards

  committed
  c5a7356

  Copy full SHA for c5a7356

• add delete

  adrianHards

  committed
  f7c98c5

  Copy full SHA for f7c98c5

• Merge pull request #25 from Loo-Ashworth/partials

  Show description for f846ab3
  adrianHards

  authored
  f846ab3

  Copy full SHA for f846ab3

• add photos to posts and user

  adrianHards

  committed
  4c3746b

  Copy full SHA for 4c3746b

• Merge pull request #30 from Loo-Ashworth/avatar

  Show description for 9fc1ced
  lisaoausb

  authored
  9fc1ced

  Copy full SHA for 9fc1ced

• show modal on edit

  adrianHards

  committed
  f80f821

  Copy full SHA for f80f821

• add id to comment

  adrianHards

  committed
  e0e8ef3

  Copy full SHA for e0e8ef3

• added delete button to comments

  emmadavids

  committed
  a0b02ee

  Copy full SHA for a0b02ee

• unable to pass updated message

  adrianHards

  committed
  d520a1b

  Copy full SHA for d520a1b

• ajax edit a post

  adrianHards

  committed
  c0cdb35

  Copy full SHA for c0cdb35

• refactor js code

  adrianHards

  committed
  d94440d

  Copy full SHA for d94440d

Commits on Jun 21, 2023

• Merge pull request #31 from Loo-Ashworth/delete-fix

  Show description for 2677c05
  Loo-Ashworth

  authored
  2677c05

  Copy full SHA for 2677c05

• Merge branch 'main' into edit-delete-comment

  emmadavids

  committed
  85dc2fb

  Copy full SHA for 85dc2fb

• deleted commented out code

  emmadavids

  committed
  3f4adf1

  Copy full SHA for 3f4adf1

• add delete button to comment

  emmadavids

  committed
  4043d28

  Copy full SHA for 4043d28

• alert on delete, ajax delete

  adrianHards

  committed
  0d495c9

  Copy full SHA for 0d495c9

• testing tests

  emmadavids

  committed
  cf461a9

  Copy full SHA for cf461a9

• Merge pull request #32 from Loo-Ashworth/edit-delete-comment

  Show description for 27ed70f
  emmadavids

  authored
  27ed70f

  Copy full SHA for 27ed70f

• added burger menu

  emmadavids

  committed
  fb92904

  Copy full SHA for fb92904

• styling so far, this is specifically to fix like button ajax

  lisaoausb

  committed
  3f4d86b

  Copy full SHA for 3f4d86b

• merge with latest

  adrianHards

  committed
  1dd5df2

  Copy full SHA for 1dd5df2

• fix indentation

  adrianHards

  committed
  8b2c881

  Copy full SHA for 8b2c881

• fix post time

  adrianHards

  committed
  b7c0896

  Copy full SHA for b7c0896

• a few amendments to get things working

  lisaoausb

  committed
  9ba1d75

  Copy full SHA for 9ba1d75

• add adrian s fixes

  lisaoausb

  committed
  eb2a4f8

  Copy full SHA for eb2a4f8

• fix user image

  adrianHards

  committed
  78c282c

  Copy full SHA for 78c282c

• Merge pull request #33 from Loo-Ashworth/user-image-fix

  Show description for b98a2e1
  Loo-Ashworth

  authored
  b98a2e1

  Copy full SHA for b98a2e1

• almost final changes for styling

  lisaoausb

  committed
  12dd352

  Copy full SHA for 12dd352

• fixed friends request display

  lisaoausb

  committed
  febc964

  Copy full SHA for febc964

• merge with main

  adrianHards

  committed
  95e8fa1

  Copy full SHA for 95e8fa1

• fix title

  adrianHards

  committed
  c08d55d

  Copy full SHA for c08d55d

• changes to core features spec because of different class names

  lisaoausb

  committed
  0d50d35

  Copy full SHA for 0d50d35

• added user data

  emmadavids

  committed
  5961bc6

  Copy full SHA for 5961bc6

• added post seed data

  emmadavids

  committed
  e73a0a0

  Copy full SHA for e73a0a0

• removed duplicate id from modal to get all tests to pass, all issues should be resolved and styling should work nicely

  lisaoausb

  committed
  7445750

  Copy full SHA for 7445750

• added seed data

  emmadavids

  committed
  0b5c059

  Copy full SHA for 0b5c059

• Merge pull request #35 from Loo-Ashworth/seeds2

  Show description for cf33a1d
  Loo-Ashworth

  authored
  cf33a1d

  Copy full SHA for cf33a1d

• Merge branch 'main' into nav-bar-fix

  emmadavids

  authored
  78165a6

  Copy full SHA for 78165a6

• Merge pull request #34 from Loo-Ashworth/nav-bar-fix

  Show description for 5613a31
  Loo-Ashworth

  authored
  5613a31

  Copy full SHA for 5613a31

• merge with main, add name to new post

  adrianHards

  committed
  86b6277

  Copy full SHA for 86b6277

Commits on Jun 22, 2023

• added bad puns/jokes to seeds

  emmadavids

  committed
  b2f6162

  Copy full SHA for b2f6162

• Merge pull request #36 from Loo-Ashworth/styling

  Show description for 4d6239d
  lisaoausb

  authored
  4d6239d

  Copy full SHA for 4d6239d

• Merge branch 'main' into seeds2

  emmadavids

  committed
  cf8f9a3

  Copy full SHA for cf8f9a3

• run seed on start

  adrianHards

  committed
  92c322c

  Copy full SHA for 92c322c

• modify test script

  adrianHards

  committed
  301e0f3

  Copy full SHA for 301e0f3

• Merge pull request #37 from Loo-Ashworth/seeds2

  Show description for 425cc0d
  adrianHards

  authored
  425cc0d

  Copy full SHA for 425cc0d

• modify test script

  adrianHards

  committed
  29c4ec1

  Copy full SHA for 29c4ec1

• merge main

  adrianHards

  committed
  dc00504

  Copy full SHA for dc00504

• remove unnecessary files

  adrianHards

  committed
  3f273a3

  Copy full SHA for 3f273a3

• edit e2e to run empty seed

  adrianHards

  committed
  2b968a0

  Copy full SHA for 2b968a0

• Merge pull request #38 from Loo-Ashworth/run-seed-on-start

  Show description for f18bafd
  emmadavids

  authored
  f18bafd

  Copy full SHA for f18bafd

• stop double image upload to cloudinary

  adrianHards

  committed
  a01c8b3

  Copy full SHA for a01c8b3

• fix ternary

  adrianHards

  committed
  1b4a439

  Copy full SHA for 1b4a439

• teeny tiny css change

  emmadavids

  committed
  1235843

  Copy full SHA for 1235843

• Merge pull request #39 from Loo-Ashworth/stop-double-image-upload

  Show description for f078fb9
  emmadavids

  authored
  f078fb9

  Copy full SHA for f078fb9

• merging main into seeds2

  emmadavids

  committed
  a88f0a9

  Copy full SHA for a88f0a9

• see new friends in both recipient and requester

  adrianHards

  committed
  d11595c

  Copy full SHA for d11595c

• remove unnecessary import

  adrianHards

  committed
  ddb3089

  Copy full SHA for ddb3089

• Merge pull request #40 from Loo-Ashworth/poke-friends

  Show description for 17dd31f
  emmadavids

  authored
  17dd31f

  Copy full SHA for 17dd31f

• Merge branch 'main' into seeds2

  emmadavids

  committed
  3c03e35

  Copy full SHA for 3c03e35