Code

Feedback#1

Code

Open

jacobpaine wants to merge 136 commits intofeedbacknss-evening-cohort-13/chatty-delta:feedbackfrom masternss-evening-cohort-13/chatty-delta:masterCopy head branch name to clipboard

+779-143

Commits

Commits on Sep 8, 2020

• Setting up GitHub Classroom Feedback

  jacobpaine

  committed
  086c586

  Copy full SHA for 086c586

• Update README.md

  drteresavasquez

  authored
  fcf4ae0

  Copy full SHA for fcf4ae0

Commits on Sep 9, 2020

• Update README.md

  drteresavasquez

  authored
  33964df

  Copy full SHA for 33964df

• added a development branch

  BaileyEDennis

  committed
  ae1b562

  Copy full SHA for ae1b562

• Merge pull request #21 from nss-evening-cohort-13/development

  Show description for 2acde21
  BaileyEDennis

  authored
  2acde21

  Copy full SHA for 2acde21

• fixed?

  BaileyEDennis

  committed
  c0c449d

  Copy full SHA for c0c449d

• Merge branch 'development' into setup

  BaileyEDennis

  authored
  36e89d5

  Copy full SHA for 36e89d5

• Merge pull request #22 from nss-evening-cohort-13/setup

  Show description for df9fd6c
  BaileyEDennis

  authored
  df9fd6c

  Copy full SHA for df9fd6c

• Update README.md

  Show description for 37d8d08
  chris-calhoun

  authored
  37d8d08

  Copy full SHA for 37d8d08

• updated index.html title and added author/description info to package.json.

  chris-calhoun

  committed
  8c1889b

  Copy full SHA for 8c1889b

• added array of objects for the initial messages that will be displayed in chat area.

  

  Chris Calhoun

  committed
  b278de6

  Copy full SHA for b278de6

• added issue and pull request templates.

  

  Chris Calhoun

  committed
  41414b4

  Copy full SHA for 41414b4

• Merge pull request #24 from nss-evening-cohort-13/seed-data

  Show description for 32d3cfb
  JSmith989

  authored
  32d3cfb

  Copy full SHA for 32d3cfb

• Added some file structure

  BaileyEDennis

  committed
  8418436

  Copy full SHA for 8418436

• Merge pull request #25 from nss-evening-cohort-13/themes

  Show description for f43dea7
  JSmith989

  authored
  f43dea7

  Copy full SHA for f43dea7

Commits on Sep 10, 2020

• added button to display dropdown characters

  JSmith989

  committed
  2640b38

  Copy full SHA for 2640b38

• Merge pull request #26 from nss-evening-cohort-13/multiUsers

  Show description for abe19ba
  JSmith989

  authored
  abe19ba

  Copy full SHA for abe19ba

• added images, added theme changer, styled to look nice

  BaileyEDennis

  committed
  2479303

  Copy full SHA for 2479303

• fixed merging issues

  BaileyEDennis

  committed
  6bbb709

  Copy full SHA for 6bbb709

• Merge pull request #27 from nss-evening-cohort-13/themes

  Show description for f976565
  JSmith989

  authored
  f976565

  Copy full SHA for f976565

Commits on Sep 11, 2020

• navbar

  AutumnFoto

  committed
  ca4bb95

  Copy full SHA for ca4bb95

• navbar update

  AutumnFoto

  committed
  397821f

  Copy full SHA for 397821f

• Merge branch 'development' into navigation-AF

  AutumnFoto

  authored
  8f4897a

  Copy full SHA for 8f4897a

• didnt change anything, commented something out and accidentally saved, now it wants me to commit to change branches

  AutumnFoto

  committed
  8b83d79

  Copy full SHA for 8b83d79

• displaying 5 messages

  JSmith989

  committed
  1eddb1c

  Copy full SHA for 1eddb1c

• should work

  AutumnFoto

  committed
  68facc1

  Copy full SHA for 68facc1

• Merge branch 'navigation-AF' of https://github.com/nss-evening-cohort-13/chatty-delta into navigation-AF

  AutumnFoto

  committed
  9856c17

  Copy full SHA for 9856c17

• added a comment on my code

  JSmith989

  committed
  6033de8

  Copy full SHA for 6033de8

• navbar fixed

  AutumnFoto

  committed
  b9b8c27

  Copy full SHA for b9b8c27

Commits on Sep 12, 2020

• changed logo

  AutumnFoto

  committed
  c042d3d

  Copy full SHA for c042d3d

• Merge pull request #30 from nss-evening-cohort-13/navigation-AF

  Show description for 09355ae
  JSmith989

  authored
  09355ae

  Copy full SHA for 09355ae

• radio buttons working

  JSmith989

  committed
  d406660

  Copy full SHA for d406660

• update

  AutumnFoto

  committed
  c5a53e6

  Copy full SHA for c5a53e6

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into navigation-AF

  AutumnFoto

  committed
  ec347ea

  Copy full SHA for ec347ea

• here's push for chris

  JSmith989

  committed
  92236df

  Copy full SHA for 92236df

• readme

  AutumnFoto

  committed
  d9935c4

  Copy full SHA for d9935c4

• merge

  AutumnFoto

  committed
  fe1ae62

  Copy full SHA for fe1ae62

• Merge pull request #31 from nss-evening-cohort-13/multipleJordan

  Show description for 846f3ad
  JSmith989

  authored
  846f3ad

  Copy full SHA for 846f3ad

• merge

  

  Chris Calhoun

  committed
  f0a4d2a

  Copy full SHA for f0a4d2a

• working on messages

  JSmith989

  committed
  d938ed7

  Copy full SHA for d938ed7

• merge

  AutumnFoto

  committed
  3f73341

  Copy full SHA for 3f73341

• got button added and will switch, now to link up font sizing with components added by group

  BaileyEDennis

  committed
  18e32ee

  Copy full SHA for 18e32ee

• changed filename to scss rules

  BaileyEDennis

  committed
  58b4188

  Copy full SHA for 58b4188

• done fixing merging options

  BaileyEDennis

  committed
  e4b829f

  Copy full SHA for e4b829f

• got font size change working

  BaileyEDennis

  committed
  29ac803

  Copy full SHA for 29ac803

• adding to readme

  AutumnFoto

  committed
  84fa138

  Copy full SHA for 84fa138

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  7c67d2d

  Copy full SHA for 7c67d2d

• trying to attach the user choice to the message

  JSmith989

  committed
  8a490c2

  Copy full SHA for 8a490c2

• connected add message function to teammates code.

  

  Chris Calhoun

  committed
  e835c19

  Copy full SHA for e835c19

• updating read me

  AutumnFoto

  committed
  b605efb

  Copy full SHA for b605efb

• Merge pull request #32 from nss-evening-cohort-13/font-sizeBD

  Show description for 357108e
  JSmith989

  authored
  357108e

  Copy full SHA for 357108e

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  c5e0a65

  Copy full SHA for c5e0a65

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into displayJordan

  JSmith989

  committed
  5cab490

  Copy full SHA for 5cab490

• got new messages to be displayed.

  

  Chris Calhoun

  committed
  0d4a8ac

  Copy full SHA for 0d4a8ac

• new files

  

  Chris Calhoun

  committed
  e257326

  Copy full SHA for e257326

• merge.

  

  Chris Calhoun

  committed
  3878b87

  Copy full SHA for 3878b87

• had to clear DOM first when adding new message.

  

  Chris Calhoun

  committed
  efbe102

  Copy full SHA for efbe102

• Merge pull request #33 from nss-evening-cohort-13/add-message-cc

  Show description for f77cf5c
  JSmith989

  authored
  f77cf5c

  Copy full SHA for f77cf5c

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into displayJordan

  JSmith989

  committed
  604fb63

  Copy full SHA for 604fb63

Commits on Sep 13, 2020

• added id number to the delete button.

  

  Chris Calhoun

  committed
  38ae8db

  Copy full SHA for 38ae8db

• remove message from array when delete button is clicked. Used findIndex array method.

  

  Chris Calhoun

  committed
  6af038a

  Copy full SHA for 6af038a

Commits on Sep 14, 2020

• merge

  AutumnFoto

  committed
  0661af7

  Copy full SHA for 0661af7

• reversed chat display and added clear chat button

  JSmith989

  committed
  0790910

  Copy full SHA for 0790910

• Merge pull request #34 from nss-evening-cohort-13/delete-message-cc

  Show description for b7c6c37
  JSmith989

  authored
  b7c6c37

  Copy full SHA for b7c6c37

• merged successfully

  JSmith989

  committed
  7c65f53

  Copy full SHA for 7c65f53

• display cards change with dark mode

  JSmith989

  committed
  5edc9ee

  Copy full SHA for 5edc9ee

• transparent navbar

  AutumnFoto

  committed
  27e2705

  Copy full SHA for 27e2705

• message limit

  AutumnFoto

  committed
  312567d

  Copy full SHA for 312567d

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into msgLimit

  AutumnFoto

  committed
  4a2357a

  Copy full SHA for 4a2357a

• readme

  AutumnFoto

  committed
  3f4011e

  Copy full SHA for 3f4011e

• merge

  AutumnFoto

  committed
  5a86844

  Copy full SHA for 5a86844

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  4f3fb7c

  Copy full SHA for 4f3fb7c

• save point

  BaileyEDennis

  committed
  cacff11

  Copy full SHA for cacff11

• Merge pull request #36 from nss-evening-cohort-13/msgLimit

  Show description for 92a75ac
  JSmith989

  authored
  92a75ac

  Copy full SHA for 92a75ac

• Merge branch 'development' into displayJordan

  JSmith989

  committed
  6ffbffa

  Copy full SHA for 6ffbffa

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  9857699

  Copy full SHA for 9857699

• checkpoint

  BaileyEDennis

  committed
  67471b2

  Copy full SHA for 67471b2

Commits on Sep 15, 2020

• hold

  BaileyEDennis

  committed
  2f80f40

  Copy full SHA for 2f80f40

• Added time stamps, new dark and light modes

  BaileyEDennis

  committed
  5065cce

  Copy full SHA for 5065cce

• clear button almost working

  JSmith989

  committed
  31f2aaa

  Copy full SHA for 31f2aaa

• moment installed

  AutumnFoto

  committed
  19b1d85

  Copy full SHA for 19b1d85

• Merge pull request #38 from nss-evening-cohort-13/time-stamp-BD

  Show description for 2a4989e
  JSmith989

  authored
  2a4989e

  Copy full SHA for 2a4989e

• Merge branch 'development' into displayJordan

  JSmith989

  committed
  0a1d4f2

  Copy full SHA for 0a1d4f2

• enter message

  

  Chris Calhoun

  committed
  ea0ee80

  Copy full SHA for ea0ee80

• merged newest version of development branch

  

  Chris Calhoun

  committed
  72bc4ef

  Copy full SHA for 72bc4ef

• small change

  JSmith989

  committed
  d4baa97

  Copy full SHA for d4baa97

• changed column reverse on chat

  JSmith989

  committed
  dfbc4dd

  Copy full SHA for dfbc4dd

• moved drop down menu, cleaned up vestigial code

  BaileyEDennis

  committed
  398f0a2

  Copy full SHA for 398f0a2

• cleared input on submit.

  

  Chris Calhoun

  committed
  17444a0

  Copy full SHA for 17444a0

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  b4e198c

  Copy full SHA for b4e198c

• Merge pull request #40 from nss-evening-cohort-13/moving-dropdown-BD

  Show description for 1a7f7bc
  BaileyEDennis

  authored
  1a7f7bc

  Copy full SHA for 1a7f7bc

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into navbar

  AutumnFoto

  committed
  69e7554

  Copy full SHA for 69e7554

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  271f42c

  Copy full SHA for 271f42c

• fixed conflicts on merge.

  

  Chris Calhoun

  committed
  24fe68e

  Copy full SHA for 24fe68e

• fixed conflicts.

  

  Chris Calhoun

  committed
  5760bea

  Copy full SHA for 5760bea

• updated navbar

  AutumnFoto

  committed
  6036789

  Copy full SHA for 6036789

• donezo

  JSmith989

  committed
  9cd7321

  Copy full SHA for 9cd7321

• Merge pull request #41 from nss-evening-cohort-13/navbar

  Show description for cb7b530
  JSmith989

  authored
  cb7b530

  Copy full SHA for cb7b530

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  b098b0d

  Copy full SHA for b098b0d

• merged branch stuff

  JSmith989

  committed
  ecca6eb

  Copy full SHA for ecca6eb

• merged

  

  Chris Calhoun

  committed
  6d6a7e8

  Copy full SHA for 6d6a7e8

• Merge pull request #42 from nss-evening-cohort-13/enter-message-cc

  Show description for ab54a78
  JSmith989

  authored
  ab54a78

  Copy full SHA for ab54a78

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  473b854

  Copy full SHA for 473b854

• everything works

  JSmith989

  committed
  94f3965

  Copy full SHA for 94f3965

• Merge pull request #43 from nss-evening-cohort-13/displayJordan

  Show description for 373bfe1
  JSmith989

  authored
  373bfe1

  Copy full SHA for 373bfe1

• styling

  AutumnFoto

  committed
  767c23a

  Copy full SHA for 767c23a

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into styling

  AutumnFoto

  committed
  67d434d

  Copy full SHA for 67d434d

• delete button styled

  JSmith989

  committed
  3cbf95d

  Copy full SHA for 3cbf95d

• styled both buttons

  JSmith989

  committed
  f0797fd

  Copy full SHA for f0797fd

• stkying messages

  AutumnFoto

  committed
  2f16ed1

  Copy full SHA for 2f16ed1

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  2ba46a6

  Copy full SHA for 2ba46a6

• uploading giphy for read me

  AutumnFoto

  authored
  48fadb3

  Copy full SHA for 48fadb3

• better giphy

  AutumnFoto

  authored
  5a838f2

  Copy full SHA for 5a838f2

• Delete Animated GIF-downsized.gif

  AutumnFoto

  authored
  1383deb

  Copy full SHA for 1383deb

• Add files via upload

  AutumnFoto

  authored
  e1887e7

  Copy full SHA for e1887e7

• Add files via upload

  AutumnFoto

  authored
  6c7d18c

  Copy full SHA for 6c7d18c

• Update README.md

  AutumnFoto

  authored
  1fdea46

  Copy full SHA for 1fdea46

• Update README.md

  AutumnFoto

  authored
  52739a4

  Copy full SHA for 52739a4

• Update README.md

  AutumnFoto

  authored
  aa0d4e1

  Copy full SHA for aa0d4e1

• Update README.md

  AutumnFoto

  authored
  605b2d8

  Copy full SHA for 605b2d8

• Update README.md

  AutumnFoto

  authored
  6f8dab0

  Copy full SHA for 6f8dab0

• updating readme

  AutumnFoto

  committed
  7a5a403

  Copy full SHA for 7a5a403

• add gif

  AutumnFoto

  committed
  c2b0c82

  Copy full SHA for c2b0c82

• Merge branch 'update-readme' of https://github.com/nss-evening-cohort-13/chatty-delta into update-readme

  AutumnFoto

  committed
  b84e654

  Copy full SHA for b84e654

• done with read me

  AutumnFoto

  authored
  7fb70f1

  Copy full SHA for 7fb70f1

• Merge pull request #44 from nss-evening-cohort-13/styling

  Show description for 5cf0d94
  AutumnFoto

  authored
  5cf0d94

  Copy full SHA for 5cf0d94

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  925fd78

  Copy full SHA for 925fd78

• Merge pull request #45 from nss-evening-cohort-13/styling-JS

  Show description for 754e85b
  AutumnFoto

  authored
  754e85b

  Copy full SHA for 754e85b

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  25a13ad

  Copy full SHA for 25a13ad

• Merge pull request #37 from nss-evening-cohort-13/update-readme

  Show description for 7d5c058
  JSmith989

  authored
  7d5c058

  Copy full SHA for 7d5c058

• Merge branch 'development' of https://github.com/nss-evening-cohort-13/chatty-delta into development

  AutumnFoto

  committed
  5d56c11

  Copy full SHA for 5d56c11

• typo

  AutumnFoto

  committed
  6cbf566

  Copy full SHA for 6cbf566

• Merge pull request #46 from nss-evening-cohort-13/development

  Show description for d3a3c5f
  JSmith989

  authored
  d3a3c5f

  Copy full SHA for d3a3c5f

• Update README.md

  AutumnFoto

  authored
  b47377b

  Copy full SHA for b47377b

Commits on Sep 21, 2020

• Update README.md

  JSmith989

  authored
  ede860d

  Copy full SHA for ede860d

• Update README.md

  JSmith989

  authored
  15fb8ab

  Copy full SHA for 15fb8ab