Code

Final Project Submission - Group #21#32

Code

Open

hellofellowkids wants to merge 55 commits intocs4241-21a:maincs4241-21a/final_project:mainfrom hellofellowkids:mainhellofellowkids/final_project:mainCopy head branch name to clipboard

+752-51

Commits

Commits on Sep 26, 2021

• initial proposal

  hellofellowkids

  committed
  4d4c334

• proposal edit

  hellofellowkids

  committed
  084aa20

Commits on Sep 27, 2021

• Added more detail to proposal.md

  Matthew7758

  committed
  f56cd47

• Added basic server.js script to save time.

  Matthew7758

  committed
  e789691

• Added basic server.js script to save time.

  Matthew7758

  committed
  e582e0f

Commits on Oct 4, 2021

• Upload image and load into canvas works.

  Matthew7758

  committed
  0b018f8

• Download works.

  Matthew7758

  committed
  1efd37f

• Figured out how to add text. Added favicon.

  Matthew7758

  committed
  25e4a39

• Line wrap works.

  Matthew7758

  committed
  29275b4

Commits on Oct 5, 2021

• Removed useless lines of code.

  Matthew7758

  committed
  ea659aa

• imported cropper

  Matthew7758

  committed
  890776f

• Cropper should work now.

  Matthew7758

  committed
  24b8696

• Created a new branch, now without the sudden deletion of everything important

  willwht

  committed
  391304e

• Basic CSS styling of most elements, Bootstrap import

  willwht

  committed
  b20d0fe

• Cropper should work now.

  Matthew7758

  committed
  55e3552

• buttons enable/disable as needed.

  Matthew7758

  committed
  03881fa

Commits on Oct 6, 2021

• Added new controls.

  Matthew7758

  committed
  7f8f09d

• Fixed flip buttons.

  Matthew7758

  committed
  f2ec307

• Added caman to project.

  Matthew7758

  committed
  bd9b311

• Added caman to project.

  Matthew7758

  committed
  f0b1420

• Merge branch 'main' into css

  willwht

  committed
  5c0a6e7

• Updated CSS to match main index file

  willwht

  committed
  a8f3722

• greyscale and compress feature

  hellofellowkids

  committed
  5c264c7

• CSS Styling updates, restructured index.html slightly

  willwht

  committed
  6a602af

• Merge pull request #1 from hellofellowkids/css

  Show description for a752f72
  hellofellowkids

  authored
  a752f72

• Merge branch 'main' into akumar6

  hellofellowkids

  authored
  f4ddc8c

• Merge pull request #2 from hellofellowkids/akumar6

  Show description for 43d2d7a
  hellofellowkids

  authored
  43d2d7a

• updated styling on compress and greyscale buttons

  willwht

  committed
  f396a07

• Why

  Matthew7758

  committed
  ddb76de

• Quick addition of font size option.

  Matthew7758

  committed
  d5e4158

• Updated .gitignore (sorry)

  willwht

  committed
  0b9aa41

• Merge branch 'main' into css

  willwht

  committed
  e408f8b

• Recolored some parts of the app to be more easily visible

  willwht

  committed
  26c7186

• Added reload button.

  Matthew7758

  committed
  9966669

• Updated styling to look prettier

  willwht

  committed
  a28f5c2

• Merge branch 'main' into css

  willwht

  committed
  8329b2b

• Replaced grayscale function to use caman.

  Matthew7758

  committed
  522f527

• Merge branch 'css' of https://github.com/hellofellowkids/final_project into main

  Matthew7758

  committed
  9522e16

• Greyscale button updated.

  Matthew7758

  committed
  e16a21b

• Added a few more filters.

  Matthew7758

  committed
  67beee0

• Separated effect buttons into types

  willwht

  committed
  6efbc6f

• Changed filter area background color

  willwht

  committed
  032b85d

Commits on Oct 7, 2021

• small change to CSS

  Matthew7758

  committed
  fb87fe4

• Alerts to large images being uploaded + a little padding around canvas

  hellofellowkids

  committed
  89fec74

• sliders for adjusting the picture

  hellofellowkids

  committed
  5bafeef

• more sliders initial implementation

  hellofellowkids

  committed
  feeec31

• Added CSS positioning for sliders

  willwht

  committed
  4d61412

• Added captions to each section

  willwht

  committed
  dad2a39

• Updated README.md

  Matthew7758

  committed
  d275a7d

• Updated README.md

  Matthew7758

  committed
  9a15333

• Updated README.md

  Matthew7758

  committed
  0447034

• Multiple sliders now work in combination.

  Matthew7758

  committed
  7f40bf6

• Updated README.md

  Matthew7758

  committed
  1e71830

• Styled the sliders

  willwht

  committed
  32f4f38

Commits on Oct 8, 2021

• Added link to video

  hellofellowkids

  authored
  966e397