Don't merge - Review weds#53

Open

stevecass wants to merge 258 commits intoreview-basefrom review-weds

+1,653-108

This pull request is big! We're only showing the most recent 250 commits

Commits on Jan 7, 2016

Commits on Jan 8, 2016

Commits on Jan 9, 2016

edit path to category_media_index_path
jhack32
committed
testing with jquery/js
jhack32
committed
local storage shows whether or not the user is logged into our app
jhack32
committed
remove the hello message
jhack32
committed
Add preference tests
Ryan Lesson
committed
Add stub current user!
Ryan Lesson
committed
Delete extra white space
Ryan Lesson
committed
Add rspec tests to preference controller
Ryan Lesson
committed
Merge pull request #21 from nyc-copperheads-2016/preference_controller_spec
elizaway
committed
Change media_controller_spec.rb to rid merge conflicts
Eliza Dunaway
committed
Change name of route path
Eliza Dunaway
committed
Change name of template
Eliza Dunaway
committed
Adds more tests for media and category controllers
Eliza Dunaway
committed
Correct mysterious ghost seed - category: move - beware
Eliza Dunaway
committed
Merge pull request #20 from nyc-copperheads-2016/media_controllers_spec
Bigless27
committed
Merge pull request #22 from nyc-copperheads-2016/extension-function
jhack32
committed
Add gems for bootstrap, add requires in app.js, add imports in scss
Eliza Dunaway
committed
Add MVC for javascript
Ryan Lesson
committed
Merge pull request #23 from nyc-copperheads-2016/bootstrap
jhack32
committed
Add initial movie search function
Ryan Lesson
committed

Commits on Jan 10, 2016

Add function to retrive credits
Ryan Lesson
committed
Add title to returned object
Ryan Lesson
committed
Merge pull request #24 from nyc-copperheads-2016/JSON
jhack32
committed
moved.
Arcangelo Petretta & Jack Huang
committed
create ability to toggle filter settings for user. ensures no double entries for single preference.
Arcangelo Petretta & Jack Huang
committed
redirect to user_path from creating preferences
Arcangelo Petretta & Jack Huang
committed
Merge pull request #25 from nyc-copperheads-2016/enable-disable-filters
arcpetretta
committed
Add bootstrap gem and req files
Eliza Dunaway
committed
Add bootstrap gem and req files
Eliza Dunaway
committed
Adds some bootstrap stying on layouts/application.html file
Eliza Dunaway
committed
Merge branch 'bootstrap' of https://github.com/nyc-copperheads-2016/unspoiled into bootstrap
Eliza Dunaway
committed
Merge pull request #26 from nyc-copperheads-2016/bootstrap
Bigless27
committed
add flash message for invalid login
Arcangelo Petretta & Jack Huang
committed

Commits on Jan 11, 2016

move flash message display to layout.
Arcangelo Petretta & Jack Huang
committed
Merge pull request #27 from nyc-copperheads-2016/flash-message-login
Bigless27
committed
Fix login error
Ryan Lesson
committed
Add functionality to categories with user not
Ryan Lesson
committed
Add ajax to clicking on a category
Ryan Lesson
committed
Change _new to new
Ryan Lesson
committed
Add ajax for adding a filter
Ryan Lesson
committed
Try to fix bootstrap file
Ryan Lesson
committed
Fixed error with media index
Ryan Lesson
committed
Add seed data for columns
Ryan Lesson
committed
Switch rspec test to account for AJAX
Ryan Lesson
committed
Merge pull request #28 from nyc-copperheads-2016/JSON
Bigless27
committed
Add error messages to create user
Ryan Lesson
committed
Fix flash messages!
Ryan Lesson
committed
Merge pull request #29 from nyc-copperheads-2016/formatting
Bigless27
committed
Fix path to users show page
Ryan Lesson
committed
Merge pull request #30 from nyc-copperheads-2016/formatting
elizaway
committed
add function to hide elements from an array (only from certain tags)
jhack32
committed
store whether or not filter is active to local storage
jhack32
committed
working oop to get filtered words for movies
jhack32
committed
uncomment line
jhack32
committed
add hidden value for title
jhack32
committed
create table to store filtered words
jhack32
committed
add api to get filtered words and create
jhack32
committed
remove line
jhack32
committed
grab filter words, search through words and dom elements, then hide
jhack32
committed
hardcoded words for demo
jhack32
committed
fix document.ready
jhack32
committed
Merge pull request #32 from nyc-copperheads-2016/extension-hide-elements
elizaway
committed
adds styling for layout and catergories
Eliza Dunaway
committed
Add styling for media/index and some ajax
Eliza Dunaway
committed
Merge pull request #31 from nyc-copperheads-2016/bootstrap
jhack32
committed
remove extra form_for and change form name for ajax
jhack32
committed
working for preview (hardcoded hide)
jhack32
committed
Merge pull request #33 from nyc-copperheads-2016/extension-function-01
Bigless27
committed
Add fixed ajax to the filter route
Ryan Lesson
committed
Change link_to to render the partial
Ryan Lesson
committed
Fix ajax problem with button
Ryan Lesson
committed
Have word belong to preference
Arcangelo Petretta & Jack Huang
committed
Don't crash on bad user id in session
Arcangelo Petretta & Jack Huang
committed
Move filtered_words route to users_controller
Arcangelo Petretta & Jack Huang
committed
Add httparty gem
Arcangelo Petretta & Jack Huang
committed
Add ajax to the my filters link
Ryan Lesson
committed
Error messages reveal more data about what's wrong
Ryan Lesson
committed
Remove tmdb gem
Arcangelo Petretta & Jack Huang
committed
Seed from tmdb
Arcangelo Petretta & Jack Huang
committed
local storage now gets the correct keywords
Arcangelo Petretta & Jack Huang
committed
Merge pull request #34 from nyc-copperheads-2016/switch-api-to-rails
elizaway
committed
Add ajax for my filter and add filter
Ryan Lesson
committed
Add rendering for my filter
Ryan Lesson
committed
Fix error with ajax to failing route
Ryan Lesson
committed
Merge pull request #35 from nyc-copperheads-2016/more_ajax
elizaway
committed
adds more styling on media index page
Eliza Dunaway
committed
Remove ajax functionality for media index page because media now indexed on category index
Eliza Dunaway
committed
Add another category 'Sports Teams' and one media belonging to sports teams
Eliza Dunaway
committed
Add styling of cat and media index views
Eliza Dunaway
committed
Merge pull request #36 from nyc-copperheads-2016/bootstrap
Bigless27
committed
Test
Arcangelo Petretta & Jack Huang
committed
Don't use FactoryGirl in seeds
Arcangelo Petretta & Jack Huang
committed
targets all elements except html, head, body and div
Arcangelo Petretta & Jack Huang
committed
Add error messages to preferences on right place
Ryan Lesson
committed
Merge pull request #37 from nyc-copperheads-2016/heroku-test
Bigless27
committed
FIx log out error
Ryan Lesson
committed
Add Sweet alerts, and there sweet
Ryan Lesson
committed
Fix error with rspec
Ryan Lesson
committed
Merge pull request #38 from nyc-copperheads-2016/error-fix
arcpetretta
committed
Change ID to Class
Ryan Lesson
committed
Get rid of debugger
Ryan Lesson
committed
Add spacing to Sweet Alert
Ryan Lesson
committed
Merge pull request #39 from nyc-copperheads-2016/error-fix
arcpetretta
committed

Commits on Jan 12, 2016

Show Filter
Ryan Lesson
committed
Merge pull request #40 from nyc-copperheads-2016/Even_more_ajax
elizaway
committed
Filter works if user.active is true and user is logged in
Arcangelo Petretta & Jack Huang
committed
remove add_filter_words
Arcangelo Petretta & Jack Huang
committed
create words, remove from media controller
Arcangelo Petretta & Jack Huang
committed
comment out controller
Arcangelo Petretta & Jack Huang
committed
comment out storage clear
Arcangelo Petretta & Jack Huang
committed
filtered words on/off feature
Arcangelo Petretta & Jack Huang
committed
get request to test on localhost
Arcangelo Petretta & Jack Huang
committed
Merge pull request #41 from nyc-copperheads-2016/toggle-user-filter-profile
elizaway
committed
add option to filter on/off
Arcangelo Petretta & Jack Huang
committed
add byebug history
Arcangelo Petretta & Jack Huang
committed
add production gem rails 12 factor
Arcangelo Petretta & Jack Huang
committed
add movies and tv
Arcangelo Petretta & Jack Huang
committed
move methods into model
Arcangelo Petretta & Jack Huang
committed
Merge pull request #42 from nyc-copperheads-2016/add-filter-on-off
Bigless27
committed
Add ajax to my filter on/off
Ryan Lesson
committed
Add ajax to the delete route
Ryan Lesson
committed
Add delete confirmation button
Ryan Lesson
committed
Merge pull request #43 from nyc-copperheads-2016/Even_more_ajax
jhack32
committed
add styling for home route
Eliza Dunaway
committed
Adds edits on cat index page
Eliza Dunaway
committed
adds style tweaks
Eliza Dunaway
committed
Add extension favicon
Eliza Dunaway
committed
adds style tweaks
Eliza Dunaway
committed
.DS_Store banished!
Eliza Dunaway
committed
adds logo centering
Eliza Dunaway
committed
Add style
Eliza Dunaway
committed
Merge pull request #44 from nyc-copperheads-2016/bootstrap
elizaway
committed
Bring back the buttons on home page
Eliza Dunaway
committed
add new logo
Eliza Dunaway
committed
Merge pull request #45 from nyc-copperheads-2016/bootstrap
elizaway
committed
start filtering people
Arcangelo Petretta & Jack Huang
committed
start on people filter
Arcangelo Petretta & Jack Huang
committed
add image to replace spoilers
Arcangelo Petretta & Jack Huang
committed
does not store word if it's empty
Arcangelo Petretta & Jack Huang
committed
stying of the layouts page
Ryan Lesson
committed
fixes layout
Ryan Lesson
committed
Delete commented out text
Ryan Lesson
committed
Make logo a link to go home
Ryan Lesson
committed
Add temp coloring to hover over logo
Ryan Lesson
committed
downcase when storing words
Arcangelo Petretta & Jack Huang
committed
add ability to reveal spoilers when clicked on.
Arcangelo Petretta & Jack Huang
committed
remove unnecessary prevHTML global variable
Arcangelo Petretta & Jack Huang
committed
Add ajax to user create account
Ryan Lesson
committed

Commits on Jan 13, 2016

Display error messages in create user
Ryan Lesson
committed
Merge pull request #46 from nyc-copperheads-2016/styling
arcpetretta
committed
Add styling of the login page
Eliza Dunaway
committed
inline style to hide spoilers
Arcangelo Petretta & Jack Huang
committed
Add tagline reformat and button reformat
Eliza Dunaway
committed
Revert to flat style logo on homepage
Eliza Dunaway
committed
hide words but need to fix filter function
Arcangelo Petretta & Jack Huang
committed
Merge pull request #47 from nyc-copperheads-2016/bootstrap
Bigless27
committed
Merge pull request #48 from nyc-copperheads-2016/optimization
Bigless27
committed
Add non-3D image back
Arcangelo Petretta & Jack Huang
committed
Color code tag line with footer
Arcangelo Petretta & Jack Huang
committed
Make colors more robust
Arcangelo Petretta & Jack Huang
committed
Move category table down a bit
Arcangelo Petretta & Jack Huang
committed
Fix white text in from
Arcangelo Petretta & Jack Huang
committed
Add initial code for adding buttons
Arcangelo Petretta & Jack Huang
committed
Merge pull request #49 from nyc-copperheads-2016/more_styling
jhack32
committed
working extension
Arcangelo Petretta & Jack Huang
committed
remove extra bracket, delete console.log
Arcangelo Petretta & Jack Huang
committed
change green to blue for primary button group
Eliza Dunaway
committed
Get rid of whitespace / uncommented stuff
Eliza Dunaway
committed
Replace old, blue logo with new, more purple logo- new_logo.png to sweetalert popup
Eliza Dunaway
committed
remove whitespace
Arcangelo Petretta & Jack Huang
committed
remove people category
Arcangelo Petretta & Jack Huang
committed
Merge pull request #50 from nyc-copperheads-2016/reliable-extension
elizaway
committed
Merge pull request #51 from nyc-copperheads-2016/bootstrap
Bigless27
committed