Code

Queues- Anna Barklund- TaskList#35

Code

Open

amb54 wants to merge 23 commits intoAda-C7:masterAda-C7/TaskList:masterfrom amb54:masteramb54/TaskList:masterCopy head branch name to clipboard

+10,941-10

Commits

Commits on Mar 20, 2017

• created a new rails

  amb54

  committed
  c943bb8

Commits on Mar 21, 2017

• Finished with Wave1

  amb54

  committed
  f3526da

Commits on Mar 22, 2017

• Finished with Wave2 and Wave3, basics

  amb54

  committed
  23eecfb

Commits on Mar 23, 2017

• updated the html.erb files with sections and id's and subsequently worked with the tasks.css and application.css files.

  amb54

  committed
  d7dcef0

• Added new-task-buttn. Changed header background to green

  amb54

  committed
  0919496

Commits on Mar 24, 2017

• Added a delete button with confirmation pop up box. Dried the code for new and edit by using a partial view _form

  amb54

  committed
  68a39d8

• Finished first version of task completed with date. Un-commented rest of README

  amb54

  committed
  24fa8dc

Commits on Mar 26, 2017

• Reworked application header: New color scheme, home-link that links to welcome page. Rearanged test and link to list on the welcome page

  amb54

  committed
  cb5f975

• Changed naming of method task_completed to status with subsequent changes in routes.rb and index.html.erb

  amb54

  committed
  16c2fc7

• Rearranged the index view. Sectioned the header h1 and the add-button together and put them on the same row. h1 to the left and the add-button to the right.

  amb54

  committed
  6489339

• Rearranged the nav section in index.html.erb and tasks.css.

  amb54

  committed
  94e7735

• Additional rearrangement to nav

  amb54

  committed
  ff46f73

Commits on Mar 27, 2017

• rearranged pages new and edit. Added new images for add, edit and delete. Changed image for link to new.

  amb54

  committed
  4537dbf

• Additional changes to the view (index and task.css)

  amb54

  committed
  cf73e86

• Two images for to list ( back and go) added to images. show updated with link images

  amb54

  committed
  b0466d8

• Added image for go to list link on welcome page

  amb54

  committed
  54fa38b

• Added image for go to list link to _font.html.erb

  amb54

  committed
  8032091

• Created two methods in task.rb (status_change and status_info). Subsequently changed the method status in the controller as well as row 31 in the index.

  amb54

  committed
  1d2aba0

• Developed status_info in task.rb to return an array with elements used in the view

  amb54

  committed
  b69d68c

• Added two status images and updated index and task.rb to use these images instead of text.

  amb54

  committed
  ca8d71a

• Added status buttons to show

  amb54

  committed
  f2bff81

• Specified hover for text links in the tasks list. Cleaned up the code (removed not used code).

  amb54

  committed
  c6493de

• Ready to submit.

  amb54

  committed
  c83c7eb