Code

Don't merge - Review monday#35

Code

Open

stevecass wants to merge 185 commits intoreview-basenyc-island-foxes-2016/kiwi-overflow:review-basefrom review-mondaynyc-island-foxes-2016/kiwi-overflow:review-mondayCopy head branch name to clipboard

+1,831-43

Commits

Commits on Jan 22, 2016

• Create db table for answers. Include db validations

  zlschatz

  committed
  d9805ce

• Generate Answers model. Validate presence of table fields

  zlschatz

  committed
  6071304

• Include association to comments and votes

  zlschatz

  committed
  ef85c67

• Revise as: :commentable

  zlschatz

  committed
  af1057f

• Merge pull request #3 from nyc-island-foxes-2016/answers-setup

  Show description for 7738cea
  deweydell

  committed
  7738cea

• Generate questions migration and model with assocations

  

  Nicola Beuscher

  committed
  6caba9f

• Add database constraints and model validations

  

  Nicola Beuscher

  committed
  9e7a2d3

• Fix assocations for polymorphism

  

  Nicola Beuscher

  committed
  649d4ed

• Merge pull request #4 from nyc-island-foxes-2016/question-migration-model

  Show description for 7a9d7f3
  webdevjeffus

  committed
  7a9d7f3

• Generate Migrations Votes Comments

  luisplaz

  committed
  cfcb12e

• Create migration for comments

  luisplaz

  committed
  f8ef1e2

• Add migration for votes

  luisplaz

  committed
  83043f4

• Add Models for Votes Comments

  luisplaz

  committed
  6d294b5

• Add comment model associatons and validations

  luisplaz

  committed
  f43a713

• Add votes model associatons and validations

  luisplaz

  committed
  15f6464

• Complete migrations information comment and votes

  luisplaz

  committed
  d2cb130

• Merge pull request #5 from nyc-island-foxes-2016/Add-Comments-Votes

  Show description for 91eb7f9
  webdevjeffus

  committed
  91eb7f9

• Create User model and users_table migration

  webdevjeffus

  committed
  b0d8fa7

• Resolve merge conflict and fixed typos in migrations and models

  webdevjeffus

  committed
  1db8748

• Merge pull request #6 from nyc-island-foxes-2016/user-model

  Show description for d7648ab
  luisplaz

  committed
  d7648ab

• Add main and normalize css files

  

  Nicola Beuscher

  committed
  6686044

• Write seeds for users, questions, answers, and comments

  

  Nicola Beuscher

  committed
  30a7099

• Write migration file to add user id to comments table

  

  Nicola Beuscher

  committed
  907b998

• New schema file created from added migration

  

  Nicola Beuscher

  committed
  3cef0c7

• Merge pull request #7 from nyc-island-foxes-2016/seeds-css

  Show description for 61ad7d4
  webdevjeffus

  committed
  61ad7d4

• Add std_format_date helper to application_helper.rb

  webdevjeffus

  committed
  947cb4a

• Add current_user helpers to application_controller

  webdevjeffus

  committed
  757c2cb

• Implement sessions_controller

  webdevjeffus

  committed
  2a8daad

• Edit invalid login info flash notice

  webdevjeffus

  committed
  994e9a7

• Create users_controller.rb

  webdevjeffus

  committed
  e0f1559

• Implement sessions#new form

  webdevjeffus

  committed
  e214f94

• Implement users#new form

  webdevjeffus

  committed
  b593d2f

Commits on Jan 23, 2016

• Implement sessions#new and users#new forms and routes

  webdevjeffus

  committed
  d66f7c8

• Merge pull request #8 from nyc-island-foxes-2016/user-session

  Show description for b412f30
  zlschatz

  committed
  b412f30

• Add routes for users, questions & answers

  luisplaz

  committed
  830abbb

• Include controller methods for questions

  luisplaz

  committed
  847b418

• Add index and new views for questions

  luisplaz

  committed
  4c77c66

• Minor CSS adjustments for questions form

  luisplaz

  committed
  2fdb95f

• Included files during controller generation

  luisplaz

  committed
  45f4d4f

• Include :answers and :users in Question query

  luisplaz

  committed
  6ad6f90

• Reorganize divs & associations

  luisplaz

  committed
  ab5dcc5

• Change css setting

  luisplaz

  committed
  891973c

• Merge pull request #9 from nyc-island-foxes-2016/setup-routes

  Show description for 49442f7
  deweydell

  committed
  49442f7

• Add basic nav bar to layout

  

  Nicola Beuscher

  committed
  58a2721

• Fix login, add nav bar, remove binding prys

  

  Nicola Beuscher

  committed
  1b2d3b8

• Merge pull request #10 from nyc-island-foxes-2016/layout-branch

  Show description for f6e655d
  webdevjeffus

  committed
  f6e655d

• Add line to assign current_user to question.user in questions#create

  webdevjeffus

  committed
  deaf06d

• Fix bug in questions#create: pass new question id as parameter with redirect

  webdevjeffus

  committed
  87ac103

• Reformat questions#show view

  webdevjeffus

  committed
  eb765ab

• Implement questions#edit and #update routes and view

  webdevjeffus

  committed
  5742be2

• Add delete question link to questions#show view; debug questions#destroy route

  webdevjeffus

  committed
  35d9d43

• Implement partial for questions#new and #edit

  webdevjeffus

  committed
  71a5794

• Merge pull request #11 from nyc-island-foxes-2016/questions-routes

  Show description for ce92965
  deweydell

  committed
  ce92965

• Hide new question link on questions/index from non-logged-in visitors

  webdevjeffus

  committed
  d374e72

• Remove binding.pry in questions_controller

  webdevjeffus

  committed
  8767439

• Hide edit and delete questions links on qeustions/show view from all users except question owner

  webdevjeffus

  committed
  d0b2a78

• Merge pull request #12 from nyc-island-foxes-2016/hide-question-links

  Show description for 897ecaf
  zlschatz

  committed
  897ecaf

• Update readme to include link to our trello board

  deweydell

  committed
  9793f83

• Add font and css for main index page and nav bar

  deweydell

  committed
  6bec1e8

• Add font link and reformat layout for navbar

  deweydell

  committed
  6a2319d

• New question link was moved to nav bar

  deweydell

  committed
  9d30f88

• Move post question link to nabber

  deweydell

  committed
  6ec6bf9

• Move post questions to navbar (removed from index page)

  deweydell

  committed
  9337260

• Update form css

  deweydell

  committed
  8e819cf

• Merge pull request #13 from nyc-island-foxes-2016/more-css

  Show description for 5d3cf93
  zlschatz

  committed
  5d3cf93

• Add comments, answers, and links to question show page

  deweydell

  committed
  c5e8edb

• Merge pull request #14 from nyc-island-foxes-2016/css-questions-show-index

  Show description for 8693aed
  luisplaz

  committed
  8693aed

• Add css for new question view

  luisplaz

  committed
  76ea99c

• Add css for login view

  luisplaz

  committed
  bb67641

• Merge pull request #15 from nyc-island-foxes-2016/AddingCss

  Show description for 6da05a9
  webdevjeffus

  committed
  6da05a9

• Create comments_controller; begin writing routes

  webdevjeffus

  committed
  a10188d

• In questions/_form, change id='input-option' to class

  webdevjeffus

  committed
  5c3fa2d

• Remove binding.pry from users#create

  webdevjeffus

  committed
  e890ef6

• Add temporary link to comments#new

  webdevjeffus

  committed
  51f58de

• Implement comments#new route through to form view

  webdevjeffus

  committed
  833c04f

• Remove bindings from new comments view and _form

  webdevjeffus

  committed
  8dfd0ed

• Implement comments#create route; working for questions, not tested for answers

  webdevjeffus

  committed
  3fec32c

• Add link to comments#new from questions#show

  webdevjeffus

  committed
  a1c1fdc

• Remove binding.pry in questions#create

  webdevjeffus

  committed
  e320aa0

• Add non-nested routes for comments#edit, #update, and #destroy

  webdevjeffus

  committed
  16477ec

• Implement comments#destroy

  webdevjeffus

  committed
  b27dc33

• Begin work on comments#edit

  webdevjeffus

  committed
  c95f50f

• Merge pull request #16 from nyc-island-foxes-2016/comments-route

  Show description for b0c8ea2
  deweydell

  committed
  b0c8ea2

Commits on Jan 24, 2016

• Repair questions/edit view effed-up in previous merge. Sorry.

  webdevjeffus

  committed
  8efe7cc

• Merge pull request #17 from nyc-island-foxes-2016/questions-edit-fix

  Show description for 5c43232
  webdevjeffus

  committed
  5c43232

• Implement comments#edit and #update routes

  webdevjeffus

  committed
  26aac07

• Attempted to recast comments/_form to work for both comments#new and #edit; failed.

  webdevjeffus

  committed
  7778185

• Add conditionals in questions#show to hide links from wrong users

  webdevjeffus

  committed
  0f38710

• Remove binding.pry from comments#edit

  webdevjeffus

  committed
  16e3d00

• Merge pull request #18 from nyc-island-foxes-2016/comments-edit-2

  Show description for 4f1b415
  deweydell

  committed
  4f1b415

• Add register, login, and logout paths to routes and layout

  deweydell

  committed
  9eca689

• Add css and labels for votes, answers, views on index

  deweydell

  committed
  5ef77a7

• Merge pull request #19 from nyc-island-foxes-2016/index-css-votes-answers-views

  Show description for ccfd015
  deweydell

  committed
  ccfd015

• Add rspec-rails and shoulda-matchers gems to gemfile

  deweydell

  committed
  e0605f4

• Add format documentation to .rspec file so tests are easy to read

  deweydell

  committed
  85dd70f

• Generate spec helper and rails helper files

  deweydell

  committed
  70a83d3

• Create controller folder and questions controller spec file

  deweydell

  committed
  656b501

• Create factories file with user and question

  deweydell

  committed
  1649a81

• Require rails_helper instead of spec_helper in QuestionsController spec

  deweydell

  committed
  d10448c

• Add work on questions controller spec for create route

  deweydell

  committed
  17c1c05

• Move some gems to specific test area per everyday rails article

  deweydell

  committed
  fa3a8af

• Require capybara in rails helper

  deweydell

  committed
  df815c3

• Write get index spec for questions controller

  deweydell

  committed
  0f452ff

• Rewrite factory for question

  deweydell

  committed
  7340e09

• Write basic specs for question model

  deweydell

  committed
  eb0161c

• Add belongs to user test to question model spec

  deweydell

  committed
  f356970

• Add get #show and post #create tests to QuestionsController spec

  deweydell

  committed
  a2fdc87

• Merge pull request #20 from nyc-island-foxes-2016/spec-questions-controller

  Show description for 7507c7c
  zlschatz

  committed
  7507c7c

• Create answers controller, setup view to add answers form

  zlschatz

  committed
  3871293

• Include answers controller to create answer, and add new answer to question show

  zlschatz

  committed
  37a7435

• Revise show page to include form

  zlschatz

  committed
  5669258

• Edit routes

  zlschatz

  committed
  4112f8d

• Redirect to login_path if user is not logged in

  zlschatz

  committed
  64e7da3

• Create answer form partial & remove answer link on show page

  zlschatz

  committed
  99067af

• Merge pull request #21 from nyc-island-foxes-2016/user-posts-answers

  Show description for a243642
  webdevjeffus

  committed
  a243642

• Working to implement votes for question

  zlschatz

  committed
  7a7c31c

• Remove test directory files since we are using rspec

  

  Nicola Beuscher

  committed
  b8b8601

• Move faker gem into development and test group

  

  Nicola Beuscher

  committed
  f65b324

• Create longer content for questions and more answers in seeds

  

  Nicola Beuscher

  committed
  cbb5742

• Make question show page easier to read with more css

  

  Nicola Beuscher

  committed
  18897f7

• Merge pull request #22 from nyc-island-foxes-2016/remove-test-dir

  Show description for d514835
  zlschatz

  committed
  d514835

• Fix merge conflict with Nicolas show user-time class

  luisplaz

  committed
  b6d2ef6

• Create working upvote button

  luisplaz

  committed
  9c7c13d

• Merge pull request #23 from nyc-island-foxes-2016/Fix-votes

  Show description for b3b2440
  deweydell

  committed
  b3b2440

• Implement new_answer_comment_path

  webdevjeffus

  committed
  196bfc9

• Remove comments, bindings from comment_controller

  webdevjeffus

  committed
  8bc456f

• Add links to edit and delete answer comments on questions#show

  webdevjeffus

  committed
  ebc20ea

• Add confirm alert to delete comments links

  webdevjeffus

  committed
  747894a

• Merge pull request #24 from nyc-island-foxes-2016/comments-edit-2

  Show description for 4dc391c
  deweydell

  committed
  4dc391c

• Write factory for answer

  

  Nicola Beuscher

  committed
  b227a5a

• Create user factory, add basic answer model specs

  

  Nicola Beuscher

  committed
  00af283

• Merge pull request #25 from nyc-island-foxes-2016/answer-specs

  Show description for 27989bf
  webdevjeffus

  committed
  27989bf

• Make changes to votable_type assignment

  luisplaz

  committed
  360ef4b

• Fix answers resources routes to nest comments and votes

  luisplaz

  committed
  bbe0512

• Implement vote count on questions index page

  luisplaz

  committed
  c633f1c

• Merge pull request #26 from nyc-island-foxes-2016/vote-answers-comments

  Show description for c829dd9
  webdevjeffus

  committed
  c829dd9

• Start method to avoid user revotes

  luisplaz

  committed
  ba50eb3

• Merge pull request #27 from nyc-island-foxes-2016/Refactoring

  Show description for 94c6b70
  deweydell

  committed
  94c6b70

• Fix merging problems

  luisplaz

  committed
  6bf44ee

• Fix votable module

  luisplaz

  committed
  693a187

• Add Sorting filter in question controller

  luisplaz

  committed
  830df83

• Merge pull request #28 from nyc-island-foxes-2016/Order_by

  Show description for c79975c
  webdevjeffus

  committed
  c79975c

• Update readme in main kiwi overflow dir

  

  Nicola Beuscher

  committed
  284a4f6

• Update vote button css and add answers js file

  

  Nicola Beuscher

  committed
  13645d6

• Update seeds file so that questions are 3 sentences each

  

  Nicola Beuscher

  committed
  0a2d328

• Prevent default of add answer form

  

  Nicola Beuscher

  committed
  d221b03

• Work on ajax request for post answers form

  

  Nicola Beuscher

  committed
  a5f6b52

• Progress on ajax, comments out JS so it all still works.

  

  Nicola Beuscher

  committed
  a039465

• Merge pull request #29 from nyc-island-foxes-2016/readme-ajax

  Show description for 85fe1d4
  webdevjeffus

  committed
  85fe1d4

• Implement comments_controller_spec with first test

  webdevjeffus

  committed
  b3fbc88

• Add FactoryGirl objects to comments_controller_spec

  webdevjeffus

  committed
  407adf2

• Add factory for comments in factories.rb

  webdevjeffus

  committed
  fccf496

• Implement 4 tests in comments_controller_spec.rb

  webdevjeffus

  committed
  2ae9bf0

Commits on Jan 25, 2016

• Merge pull request #30 from nyc-island-foxes-2016/comments-spec

  Show description for 1abd3f0
  zlschatz

  committed
  1abd3f0

• Create _answer_show partial to render in question view

  deweydell

  committed
  232c3c0

• Finish writing js ajax request for posting answer to question

  deweydell

  committed
  d5e8b7b

• Remove binding.pry

  deweydell

  committed
  4d3f962

• Remove Binding.pry

  deweydell

  committed
  169718a

• Move answer html from question page into partial

  deweydell

  committed
  f348256

• Account for xhr request for posting answer

  deweydell

  committed
  04f2f4d

• Add error handling for non-ajax requests to post answer

  deweydell

  committed
  bcec917

• Add JS to clear text area after submit answer post form

  deweydell

  committed
  47790cc

• Remove error handling, not sure how to do it.

  deweydell

  committed
  e265309

• Merge pull request #31 from nyc-island-foxes-2016/ajaxbranch

  Show description for 0714f46
  webdevjeffus

  committed
  0714f46

• Finish Order Filter

  luisplaz

  committed
  8976284

• Add trial ajax for view count update

  luisplaz

  committed
  fe3b20d

• Merge pull request #32 from nyc-island-foxes-2016/finish-filter

  Show description for 13a8e04
  zlschatz

  committed
  13a8e04

• User can only vote once per question and/or answer

  zlschatz

  committed
  5cceade

• Remove comment voting from Votes Controller

  zlschatz

  committed
  58042f2

• Indent fix

  zlschatz

  committed
  d2e88ae

• Merge pull request #33 from nyc-island-foxes-2016/user-voting

  Show description for d44573c
  webdevjeffus

  committed
  d44573c

• Add best_answer_path to routes

  webdevjeffus

  committed
  c5e7adf

• Add bottom margin to .vote-container in main.css

  webdevjeffus

  committed
  0c8417f

• Implement best_answer_path and answers#best route; user can choose best answer

  webdevjeffus

  committed
  18e7f83

• Add best_answer getter method to Question model

  webdevjeffus

  committed
  6104893

• Pull best answer out of order and display as first answer in list

  webdevjeffus

  committed
  d1ce905

• Implement sorting of answers on questions#show view, with best answer first

  webdevjeffus

  committed
  3318368

• Sort comments by created_at on questions#show

  webdevjeffus

  committed
  bc8878d

• Fix bug with answer comments in comments#create

  webdevjeffus

  committed
  4db0dc6

• Fix bug with answer comments in comments#update

  webdevjeffus

  committed
  02294dc

• Implement #redirect_to_question_path in comments_controller; refactor comments#create, #update and #destroy

  webdevjeffus

  committed
  ab7c4a5

• Fix indenting and missing div tag in questions/index view

  webdevjeffus

  committed
  f3c16cd

• Add views column to questions table

  webdevjeffus

  committed
  37bbd0d

• Implement display of views count on questions/index view

  webdevjeffus

  committed
  7b3117c

• Merge pull request #34 from nyc-island-foxes-2016/best-answer

  Show description for 2a61226
  zlschatz

  committed
  2a61226