Staged: The main working branch of Team NapTime#254

Open

ShishirSK wants to merge 268 commits intoprofessor:masterfrom

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

Commits on Oct 19, 2013

New Setup
anirudhbhargava7
committed

Commits on Oct 20, 2013

Commits on Oct 21, 2013

Commits on Oct 22, 2013

Seeds from Professor/whiteboard
anirudhbhargava7
committed
Changes in the Seeds and views/deliverable/_deliverable...
anirudhbhargava7
committed
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into staged
nelson pollard
committed
rm tmpdir
nelson pollard
committed
Ignore vim swap files
qiao
committed
Merge branch 'staged' of github.com:Gonghan/whiteboard into staged
qiao
committed
Ignore tmpdir
qiao
committed
Remove tmpdir
qiao
committed
update
Gonghan
committed
update
Gonghan
committed
update
Gonghan
committed
Merge branch 'sort_task_number' of https://github.com/Gonghan/whiteboard into sort_task_number
nelson pollard
committed

Commits on Oct 23, 2013

Have a partially written rspec test for sorting by task number
nelson pollard
committed
Added rough grading queue UI
qiao
committed
Added grading_queue_sort_by_task_spec for our added spec
nelson pollard
committed
Removing
nelson pollard
committed
Removing strong_parameters stuff
nelson pollard
committed
Commented out specs failing specs for mass assignment
nelson pollard
committed
Revert modification of current_user
qiao
committed
mod: application_controller
qiao
committed
Only run Travis builds on master and staged branch
qiao
committed
effort_log and effort_log_line_items are protected against mass
nelson pollard
committed
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into mass_assignment
nelson pollard
committed
Merge branch 'mass_assignment' into staged
nelson pollard
committed
Set half of the deliverables to be ungraded
qiao
committed
Implement graded filter for deliverables
qiao
committed
Implement graded filter for deliverables
qiao
committed
Merge branch 'grading_queue_ui' of github.com:Gonghan/whiteboard into grading_queue_ui
qiao
committed

Commits on Oct 25, 2013

Removed attr_accessible from our mass assignment models
nelson pollard
committed
Removed tests against mass assignment in models
nelson pollard
committed
Modified effort_logs_controller_spec to not feed effort_logs a sum directly
nelson pollard
committed
Working on roughUI test cases
anirudhbhargava7
committed
Modified version of exception-notification gem
qiao
committed

Commits on Oct 28, 2013

Commits on Oct 29, 2013

Protected effort_log_line_items from mass assignment. Weeee!
nelson pollard
committed
Protected effort_logs from mass assignment
nelson pollard
committed
Protected job_employees and job_supervisors from mass assignment.
nelson pollard
committed
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into staged
nelson pollard
committed
Merge branch 'mass_assignment' into staged
nelson pollard
committed
teams.rb fixed
anirudhbhargava7
committed
Pulled and merged staged branch
ShishirSK
committed
Gemfileand Gemfile.lock updates
anirudhbhargava7
committed
strong_parameters and cocaine added
anirudhbhargava7
committed

Commits on Oct 30, 2013

Commits on Oct 31, 2013

Finished sort by task test. Hooray!
nelson pollard
committed

Commits on Nov 1, 2013

Now tracking database_cleaner file
nelson pollard
committed

Commits on Nov 3, 2013

Commits on Nov 4, 2013

Commits on Nov 5, 2013

Fixed update show status
qiao
committed
Merge branch 'grading_queue_ui' into staged
qiao
committed
Added Filter by My Team, To-Do: Filter by Individuals
ShishirSK
committed
Finished sort by task test. Hooray!

nelson pollard
authored and
ShishirSK
committed
Now tracking database_cleaner file

nelson pollard
authored and
ShishirSK
committed
Partially implemented grading queue accordion

qiao
authored and
ShishirSK
committed
Fixed update show status

qiao
authored and
ShishirSK
committed

Commits on Nov 6, 2013

Added tests against mass assignment for effort_logs
nelson pollard
committed
Added strong_parameters gem for mass assignment protection
nelson pollard
committed
Added tests for effort_log_line_items against mass assignment
nelson pollard
committed
Added tests for peer_evaluation_learning_objectives against mass
nelson pollard
committed
Added tests for peer_evaluation_reviews against mass assignment
nelson pollard
committed
Protected peer evaluation stuff (learning_objectives,
nelson pollard
committed
About to switch to master
nelson pollard
committed
Added tests for job_employees and job_supervisors
nelson pollard
committed
Peer evaluation report/review/learning objective protected.
nelson pollard
committed
New Setup

anirudhbhargava7
authored and
nelson pollard
committed
Seeds from Professor/whiteboard

anirudhbhargava7
authored and
nelson pollard
committed
Ignore vim swap files

qiao
authored and
nelson pollard
committed
Ignore tmpdir

qiao
authored and
nelson pollard
committed
update

Gonghan
authored and
nelson pollard
committed
update

Gonghan
authored and
nelson pollard
committed
update

Gonghan
authored and
nelson pollard
committed
Have a partially written rspec test for sorting by task number
nelson pollard
committed
Added rough grading queue UI

qiao
authored and
nelson pollard
committed
Added grading_queue_sort_by_task_spec for our added spec
nelson pollard
committed
Removing
nelson pollard
committed
Removing strong_parameters stuff
nelson pollard
committed
Commented out specs failing specs for mass assignment
nelson pollard
committed
Revert modification of current_user

qiao
authored and
nelson pollard
committed
mod: application_controller

qiao
authored and
nelson pollard
committed
effort_log and effort_log_line_items are protected against mass
nelson pollard
committed
Improved readability

professor
authored and
nelson pollard
committed
Thanks team turing. Addding in Isil's indexes

professor
authored and
nelson pollard
committed
Set half of the deliverables to be ungraded

qiao
authored and
nelson pollard
committed
Implement graded filter for deliverables

qiao
authored and
nelson pollard
committed
Implement graded filter for deliverables

qiao
authored and
nelson pollard
committed
Added capybara-webkit

qiao
authored and
nelson pollard
committed
Removed attr_accessible from our mass assignment models
nelson pollard
committed
Removed tests against mass assignment in models
nelson pollard
committed
Modified effort_logs_controller_spec to not feed effort_logs a sum directly
nelson pollard
committed
In process of writing mass assignment test for jobs
nelson pollard
committed
Added cocaine gem
nelson pollard
committed
Protected job_supervisors from mass assignment,
nelson pollard
committed
Removed jobs_controller_spec
nelson pollard
committed
Protected job_employees and job_supervisors from mass assignment
nelson pollard
committed
Protected effort_log_line_items from mass assignment. Weeee!
nelson pollard
committed
Protected effort_logs from mass assignment
nelson pollard
committed
Protected job_employees and job_supervisors from mass assignment.
nelson pollard
committed
Added include ActiveModel::ForbiddenAttributesProtection
nelson pollard
committed
Modifying files to match professor/whiteboard
nelson pollard
committed
Modifying files to match professor/whiteboard
nelson pollard
committed
Merge https://github.com/professor/whiteboard into mass_assignment
nelson pollard
committed
Cleaning up files to match professor/whiteboard
nelson pollard
committed
Added strong_parameters gem
nelson pollard
committed
Removed sort by task spec
nelson pollard
committed
before update of rough UI
anirudhbhargava7
committed
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into staged
anirudhbhargava7
committed

Commits on Nov 7, 2013

Removed some sensitive swap files
nelson pollard
committed
Removed blank last line to closer match professor/whiteboard
nelson pollard
committed
Edited seeds to match professor/whiteboard
nelson pollard
committed
Reverted .travis.yml to professor/whiteboard version
nelson pollard
committed
Removed grading_queue_spec: not present in professor/whiteboard
nelson pollard
committed

Commits on Nov 8, 2013

No errors in grading_queue_sort_by_task spec
anirudhbhargava7
committed
Merge branch 'staged' into mass_assignment
nelson pollard
committed
Added needed grade1 factory
nelson pollard
committed

Commits on Nov 9, 2013

Headless added
anirudhbhargava7
committed

Commits on Nov 11, 2013

Commits on Nov 12, 2013

Commits on Nov 13, 2013

Commits on Nov 14, 2013

Commits on Nov 18, 2013

Replaced capybara-webkit with selenium-webdriver
nelson pollard
committed
Merge branch 'spec_refactor' into staged
nelson pollard
committed
Removed latest deliverable - can get that from deliverable history
nelson pollard
committed

Commits on Nov 20, 2013

UI updates - Added buttons, modified search + full width table
ShishirSK
committed

Commits on Nov 22, 2013

Set Filter spec as pending. To Refactor to work with UI updates
ShishirSK
committed

Commits on Nov 23, 2013

Set skip_on_build_machine true for all js tests
nelson pollard
committed
Trying to fix failing travis build
nelson pollard
committed
Removed skip_on_build_machine for grading queue specs
nelson pollard
committed
Combined Task and Assignment columns
nelson pollard
committed
Recommented current_user
nelson pollard
committed
Merge branch 'task_assg' into staged
nelson pollard
committed
Refactored spec to use combined task/assg
nelson pollard
committed
Implemented Team Ruby Racer's time zone bug fix
nelson pollard
committed
Marked selenium tests skip_on_build_machine
nelson pollard
committed
Updates the UI buttons and effects
ShishirSK
committed
Merge branch 'UIUpdates' into staged
ShishirSK
committed

Commits on Nov 24, 2013

Commits on Nov 25, 2013

modify two files
Gonghan
committed
Merged New Submission + Drafted Deliverables + UI Updates. One sort test spec set as pending
ShishirSK
committed
Rewrite Grading Queue
qiao
committed
Added AJAX Loading Indicator
qiao
committed
Added highlight when hovering on deliverables
qiao
committed
Refactored styling out of view and into css file
nelson pollard
committed
Colorified grade status
nelson pollard
committed
Reinstated hover over grading queue rows
nelson pollard
committed
Recommented current_user
nelson pollard
committed
Modified dropdown padding bottom
qiao
committed
Modified text area width
qiao
committed
Implemented JavaScript filter
qiao
committed
Implemented filters
qiao
committed
Added SearchBox
qiao
committed
Added Colors to Statuses
qiao
committed
Fixed team member photo width
qiao
committed
Added Team Grade
qiao
committed
Moved CSS into public/stylesheets
qiao
committed
Added Comments to grading queue
qiao
committed
Added Team Grade Live Update
qiao
committed
Merge branch 'new-ui' of https://github.com/Gonghan/whiteboard into new-ui
nelson pollard
committed
Added Deliverable Maximum Score
qiao
committed
Added Grade Validator
qiao
committed
Test filter defaults and filtering by team or individual
nelson pollard
committed
Spec for filter team/individuals
nelson pollard
committed
Modified Team Member UI
qiao
committed
Added Collapse Button
qiao
committed
Added Nothing-To-Show Indicator
qiao
committed
Remove extraneous bottom border of deliverables list
qiao
committed

Commits on Nov 26, 2013

Added Form Submission Indicator
qiao
committed
Commented out current_user
qiao
committed
Added New Submission Indicator
qiao
committed
Tweaked Form Content
qiao
committed
Merge branch 'new-ui' of https://github.com/Gonghan/whiteboard into new-ui
nelson pollard
committed
Merge branch 'update_specs' into new-ui
nelson pollard
committed
Updated sort specs
nelson pollard
committed
Merge branch 'update_specs' into new-ui
nelson pollard
committed
Fixed sort spec
nelson pollard
committed

Commits on Nov 28, 2013

Switching to filter_all_branch
anirudhbhargava7
committed

Commits on Dec 1, 2013

Commits on Dec 2, 2013

Removed Border Radius of OnOffSwitch
qiao
committed

Commits on Dec 7, 2013

Verifying the build is successful
ShishirSK
committed

Commits on Dec 8, 2013