Code

Bootstrap#1322

Code

Open

NenehB wants to merge 50 commits intomakersacademy:mainmakersacademy/acebook-rails-template:mainfrom NenehB:bootstrapNenehB/acebook-Snails_On_Rails:bootstrapCopy head branch name to clipboard

+1,337-20

Commits

Commits on Nov 22, 2021

• Set up complete

  Beckyrose200

  committed
  e19ecb5

  Copy full SHA for e19ecb5

Commits on Nov 24, 2021

• Test for likes

  Beckyrose200

  committed
  84b6fff

  Copy full SHA for 84b6fff

• devise login

  NenehB

  committed
  a569b20

  Copy full SHA for a569b20

• added signout function and change database

  NenehB

  committed
  e068843

  Copy full SHA for e068843

• Merge pull request #1 from NenehB/user_sign_in

  Show description for df4c849
  Beckyrose200

  authored
  df4c849

  Copy full SHA for df4c849

• sign function added

  NenehB

  committed
  86801ef

  Copy full SHA for 86801ef

• 24.11.21 changes made by Marc

  mbrosch3-ford

  committed
  c1a1857

  Copy full SHA for c1a1857

• login details set as home root

  NenehB

  committed
  9d937c8

  Copy full SHA for 9d937c8

Commits on Nov 25, 2021

• Trying to get button to work

  Beckyrose200

  committed
  eb4341a

  Copy full SHA for eb4341a

• Like Button Working

  Beckyrose200

  committed
  c34d8a9

  Copy full SHA for c34d8a9

• Merge branch 'master' into creating_likes

  RJ21BL

  authored
  ef8a5f5

  Copy full SHA for ef8a5f5

• Merge pull request #2 from NenehB/creating_likes

  Show description for 76c953a
  RJ21BL

  authored
  76c953a

  Copy full SHA for 76c953a

• User login complete

  NenehB

  committed
  2420020

  Copy full SHA for 2420020

Commits on Nov 26, 2021

• Merge branch 'master' into users

  RJ21BL

  authored
  81eeb39

  Copy full SHA for 81eeb39

• Merge pull request #3 from NenehB/users

  Show description for ee65c38
  RJ21BL

  authored
  ee65c38

  Copy full SHA for ee65c38

• Posts in descending order

  mbrosch3-ford

  committed
  f67dc0a

  Copy full SHA for f67dc0a

• User can like a post - Test implemented

  mbrosch3-ford

  committed
  31f2cfe

  Copy full SHA for 31f2cfe

• Solved testing for post to be in desc order

  mbrosch3-ford

  committed
  4cbc9b6

  Copy full SHA for 4cbc9b6

• Changed db migration to remove a duplicate column

  Beckyrose200

  committed
  b055066

  Copy full SHA for b055066

• New table for comments

  Beckyrose200

  committed
  141070a

  Copy full SHA for 141070a

• User log in feature test

  RJ21BL

  committed
  645f68b

  Copy full SHA for 645f68b

• Adding styling

  Beckyrose200

  committed
  213f580

  Copy full SHA for 213f580

Commits on Nov 29, 2021

• WIP comments featrue

  mbrosch3-ford

  committed
  eb0a6c5

  Copy full SHA for eb0a6c5

• wip user can submit a comment

  mbrosch3-ford

  committed
  bb71beb

  Copy full SHA for bb71beb

• Added comments onto main timeline

  Beckyrose200

  committed
  34b6a88

  Copy full SHA for 34b6a88

• Comments working

  Beckyrose200

  committed
  87147eb

  Copy full SHA for 87147eb

• Added some CSS for the comments

  Beckyrose200

  committed
  7e3cbca

  Copy full SHA for 7e3cbca

Commits on Nov 30, 2021

• Merge pull request #4 from NenehB/user_feature_test

  Show description for a186061
  RJ21BL

  authored
  a186061

  Copy full SHA for a186061

• personal details incomplete

  NenehB

  committed
  3a78772

  Copy full SHA for 3a78772

• removed p

  Beckyrose200

  committed
  09d5de0

  Copy full SHA for 09d5de0

• Posts/comments tests passing

  mbrosch3-ford

  committed
  f2e69f1

  Copy full SHA for f2e69f1

• Post/comments test passing

  mbrosch3-ford

  committed
  1ffb740

  Copy full SHA for 1ffb740

• Merge branch 'master' into adding_comments

  Beckyrose200

  authored
  a0c308f

  Copy full SHA for a0c308f

• Merge pull request #5 from NenehB/adding_comments

  Show description for 9f2b5f9
  Beckyrose200

  authored
  9f2b5f9

  Copy full SHA for 9f2b5f9

• Dates displaying

  Beckyrose200

  committed
  1deb20a

  Copy full SHA for 1deb20a

• Merge branch 'master' into personal_details

  NenehB

  authored
  509bcf2

  Copy full SHA for 509bcf2

• Merge pull request #6 from NenehB/personal_details

  Show description for e65ac58
  NenehB

  authored
  e65ac58

  Copy full SHA for e65ac58

• name of user who made comment

  NenehB

  committed
  fc3fbe7

  Copy full SHA for fc3fbe7

• Removed P

  Beckyrose200

  committed
  5ec52f2

  Copy full SHA for 5ec52f2

• Search function working

  Beckyrose200

  committed
  968a894

  Copy full SHA for 968a894

Commits on Dec 1, 2021

• Comments show the proper username

  mbrosch3-ford

  committed
  27e8587

  Copy full SHA for 27e8587

• Styling added for more then 1 user

  Beckyrose200

  committed
  13f2c0e

  Copy full SHA for 13f2c0e

• Sorted out case sensitivity for the search results

  Beckyrose200

  committed
  6251bc7

  Copy full SHA for 6251bc7

• Added styling to the search bar and removed redundant search bar

  Beckyrose200

  committed
  bee634a

  Copy full SHA for bee634a

• All bugs fixed

  Beckyrose200

  committed
  fdd2190

  Copy full SHA for fdd2190

• All features working

  Beckyrose200

  committed
  f156994

  Copy full SHA for f156994

• All tests passing for search function

  Beckyrose200

  committed
  9c303d2

  Copy full SHA for 9c303d2

• Merge pull request #7 from NenehB/search_bar

  Show description for f9df0ce
  mbrosch3-ford

  authored
  f9df0ce

  Copy full SHA for f9df0ce

• Bootstrap

  NenehB

  committed
  e0bbbb9

  Copy full SHA for e0bbbb9

• Merge branch 'master' into bootstrap

  Beckyrose200

  authored
  d0d2781

  Copy full SHA for d0d2781