Code

Team Turing Whiteboard final version#241

Code

Open

isilien wants to merge 142 commits intoprofessor:masterprofessor/whiteboard:masterfrom TeamTuring:masterTeamTuring/whiteboard:masterCopy head branch name to clipboard

+7,963-519

Commits

Commits on Oct 17, 2013

• Add personal information in db/seed.rb

  real-davidcs

  committed
  f302e33

Commits on Oct 19, 2013

• Add accordion to grading queue

  real-davidcs

  committed
  a0b98c8

• Model for filter by my teams

  

  Isil Demir

  committed
  91f7162

• Merge remote branch 'origin/master'

  

  Isil Demir

  committed
  8f714c6

Commits on Oct 20, 2013

• Model and view for 'Filter by my teams'

  

  Isil Demir

  committed
  d3d44ce

• Add test case for filtering by MY teams/students

  real-davidcs

  committed
  d2d3fae

Commits on Oct 21, 2013

• Admin should be able to see every deliverable in a course

  

  Isil Demir

  committed
  6311da3

• Changing notifiers for Travis

  metorino

  committed
  460ea92

• Adding comment just to sync with Travis

  metorino

  committed
  ba27ee5

Commits on Oct 22, 2013

• Adding team turing for build notifications

  metorino

  committed
  3bc5b82

• Adding comment just to sync with Travis

  metorino

  committed
  6f8c430

• Adding each team turing members for build notifications

  metorino

  committed
  076c205

Commits on Oct 23, 2013

• Service test code for spec_no_rails

  metorino

  committed
  a55beaf

• Updated gitignore to exclude 'logfile'

  metorino

  committed
  d62ea71

Commits on Oct 24, 2013

• Refactoring on filter by teams story. Changing SQL to active record. Not finished yet

  metorino

  committed
  5e0e8a7

• Defining GrandingQueue empty class. Otherwise is failing

  metorino

  committed
  7fa5a9d

• Refactoring deliverables controller spec to match the model refactoring and removing invalid grading queue service

  metorino

  committed
  5501632

• Refactoring deliverables controller spec to match the model refactoring and removing invalid grading queue service

  metorino

  committed
  42769ad

• Refactored 'filter by my teams' to use ActiveRecord instead of SQL. Refactored according to @professor suggestions.

  

  Isil Demir

  committed
  193536d

• Refactor the accordion panel of grading queue page

  real-davidcs

  committed
  f065d8e

• Adding pending tests for grading queue

  metorino

  committed
  d4b24a2

Commits on Oct 28, 2013

• Adding filter by my students

  metorino

  committed
  2d03c9e

• Intent of test for filter by my students individual deliverables

  metorino

  committed
  4ee3929

• Individual Deliverable, filtered by teams

  

  Isil Demir

  committed
  94c2531

• Check variable 'queue' with empty? instead of nil?

  

  Isil Demir

  committed
  1251471

• Adding team assignment

  metorino

  committed
  985c909

• Merge branch 'master' of http://github.com/TeamTuring/whiteboard

  

  Isil Demir

  committed
  087085d

• Created tests for 'filter by individual deliverables' when there are teams in course

  

  Isil Demir

  committed
  04217b5

• Fixed broken Travis due to merge conlict

  

  Isil Demir

  committed
  7321fde

Commits on Oct 29, 2013

• Professor should be able to see both team deliverables and individual deliverables in their teams

  

  Isil Demir

  committed
  6bc2d43

Commits on Oct 30, 2013

• Refactoring getting default deliverables from helper method

  metorino

  committed
  481678d

• Adding pending tests for filtering deliverables

  metorino

  committed
  969a4c5

• preparing test data

  metorino

  committed
  201fed2

• Filtering deliverables by ungraded by default

  metorino

  committed
  d8a8a7a

Commits on Oct 31, 2013

• Filtering by ungraded

  metorino

  committed
  1a5c1ec

Commits on Nov 1, 2013

• Merge grading page into grading queue w/o testing

  real-davidcs

  committed
  34826a0

• Filtering by other criterias

  metorino

  committed
  2367543

• Merge grading page into grading queue w/o test - conflict resolved

  real-davidcs

  committed
  6c5965f

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  real-davidcs

  committed
  8bece92

• Deliverables filtered by a criterion. Tests added for graded only

  

  Isil Demir

  committed
  df94a1f

Commits on Nov 2, 2013

• Retrieving assignment names to populate drop down list

  metorino

  committed
  459667f

• Solve capybara double thread issue

  real-davidcs

  committed
  937eeda

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  real-davidcs

  committed
  a58b62f

• Adding migration to add last graded by to grades table

  metorino

  committed
  00e2e8b

• Update view for grading queue and deliverables_spec.rb

  mia-m

  committed
  f4fab4c

• Getting grading status from page

  metorino

  committed
  7c50fb9

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  5f4c6a7

• Adding test for filtering by grading status + schema

  metorino

  committed
  51063c2

• Filter deliverables by name tests

  

  Isil Demir

  committed
  4c02fdd

• Merging the view and the controller for filter by deliverables

  

  Isil Demir

  committed
  afeb903

• Adding filtering by assignment name

  metorino

  committed
  088f812

• Bootstrap javascript library added

  

  Isil Demir

  committed
  82dcdeb

• Merge branch 'master' of http://github.com/TeamTuring/whiteboard

  

  Isil Demir

  committed
  103d8ff

• Draft: All filtering logic with AJAX missing

  

  Isil Demir

  committed
  08bbd6a

• Test for filter by delierable name

  metorino

  committed
  a4cfee0

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  3e34fc0

Commits on Nov 3, 2013

• Merge grading page into grading queue page w/ tests

  real-davidcs

  committed
  5fa4a62

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  real-davidcs

  committed
  a3ca835

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  cf89635

• Improved user interface for grading queue for course

  

  Isil Demir

  committed
  7b68456

Commits on Nov 4, 2013

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  08d0d85

Commits on Nov 5, 2013

• Integrate last graded by

  real-davidcs

  committed
  a261f7f

• Removing hardcoded data from deliverables controler + hiting the model to filter everytime unttilfiguring out in js

  metorino

  committed
  1a19f9f

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  0582ed6

• Default deliverables assignation

  metorino

  committed
  876eb61

Commits on Nov 7, 2013

• Removing attachments versions from deliverables factories as were creating issues + refactoring deliverables controller for checking params in a better way

  metorino

  committed
  9deaba3

• Working javascript for filters in grading page, modified style for the grading page view

  

  Isil Demir

  committed
  e6656e6

• Add draft for checking tooltip

  mia-m

  committed
  6c9f4fc

• Merged last graded by and filtering grading queue

  

  Isil Demir

  committed
  b5b0150

• Migration for last graded by

  

  Isil Demir

  committed
  1b92ecf

• Merge branch 'master' of http://github.com/TeamTuring/whiteboard

  

  Isil Demir

  committed
  1f7fac4

• Added sorting for deliverables by task number

  

  Isil Demir

  committed
  ce96056

• Added filter by assignment name in drop down menu

  

  Isil Demir

  committed
  7c0ea2e

• Filter by 'everyone' implemented

  

  Isil Demir

  committed
  4b315ae

Commits on Nov 8, 2013

• Last graded by with link to profile

  IraJain

  committed
  e169505

Commits on Nov 11, 2013

• Added loading indicator view for AJAX requests

  

  Isil Demir

  committed
  83143e3

Commits on Nov 12, 2013

• Grading queue and grading page views merged and styled

  

  Isil Demir

  committed
  ccf50bd

• Added danger labels to indicate late submissions

  

  Isil Demir

  committed
  de0b52a

• Overriding Bootstraps 'box-sizing: border-box' set via universal selector for #topnav and #logo

  

  Isil Demir

  committed
  9bcabf2

Commits on Nov 13, 2013

• Adding skeleton for test to see the last filter options after grading on the queue

  metorino

  committed
  d02b243

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  f4100c3

• AJAX requests are done 'onclick' rather than using the submit button

  

  Isil Demir

  committed
  9989478

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  

  Isil Demir

  committed
  ee2149f

• Keeping filtering options in session

  metorino

  committed
  e5ac9fb

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  b1a8092

• Fixing typo

  metorino

  committed
  51339dd

Commits on Nov 14, 2013

• AJAX call instead of page refresh whenever user hits the save button

  

  Isil Demir

  committed
  1a763e6

• Update deliverables_spec to update the expectation, and move task_number to assignments.rb

  mia-m

  committed
  126c0a3

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  mia-m

  committed
  1396736

• Save and Finalize button behavior corrected

  

  Isil Demir

  committed
  a9e89eb

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  mia-m

  committed
  aa597f5

• Fixed issue with sliding up panels

  

  Isil Demir

  committed
  3d207b7

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  

  Isil Demir

  committed
  f72c533

Commits on Nov 16, 2013

• Last graded by student view

  IraJain

  committed
  ec60523

• adding last graded by test

  metorino

  committed
  3f96eaf

• Adding tests for link to last graded by to people link + refactoring linking mechanism in view

  metorino

  committed
  403135a

• Fixing bug, inverting if/else logic :) on checking for nil grading

  metorino

  committed
  0c6ed63

Commits on Nov 20, 2013

• Enhanced grading queue page view

  

  Isil Demir

  committed
  9e50c6b

• Removing Not graded yet as default message for ungraded deliverables

  metorino

  committed
  f5138d7

• Removing pending tests from deliverables controller

  metorino

  committed
  6e29f2e

• Fixing failing tests

  metorino

  committed
  485d09e

• Firts graded by patch

  IraJain

  committed
  ed4628f

• removing save_and_open_page

  metorino

  committed
  9d0514c

• Grade Book- Last graded by

  IraJain

  committed
  fec3b8d

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  IraJain

  committed
  983fa20

Commits on Nov 21, 2013

• Add grade book confirm box, checkbox and modify button label and position

  mia-m

  committed
  c9398f7

• Cont. redesign of grading queue

  

  Isil Demir

  committed
  5d009a6

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  

  Isil Demir

  committed
  b4617b6

Commits on Nov 22, 2013

• Modifying travis configuration file to run firefox

  metorino

  committed
  b863f3c

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  ac3d49c

• Implement search function w/o test

  real-davidcs

  committed
  2acff4b

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  real-davidcs

  committed
  fb6d52e

• Grading queue interface changes. Default grading queue behavior changed to ungraded + drafted.

  

  Isil Demir

  committed
  a3fab98

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  

  Isil Demir

  committed
  bbe1ce8

• Updating tests to meet latest functionality. Hopefully Travis is green now :)

  metorino

  committed
  1fb5556

Commits on Nov 23, 2013

• Include professor in grade email for Grade Book and Grade Page

  mia-m

  committed
  b7df9e8

Commits on Nov 25, 2013

• fixing bug of rendering deliverables partial not being updated properly

  metorino

  committed
  535e608

• Merging edit student feedback file

  metorino

  committed
  5335c01

• Adding js for ajax request on updating feedback

  metorino

  committed
  311eb07

• New style for Grade Book buttons/import/export sections

  

  Isil Demir

  committed
  4daf341

Commits on Nov 26, 2013

• Modify Deliverable Controller: Show everything when no filter options is selected

  real-davidcs

  committed
  05e3072

• Adding filtering by assignment when updating feedback

  metorino

  committed
  e91f1eb

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  ddac28c

• Changing deliverable controller tests to use get_deliverables instead of filter_deliverables

  metorino

  committed
  0ee75f0

• Ajax loading gif for retina display

  

  Isil Demir

  committed
  2d434ce

• Removing filter_deliverables action + adding tests in the deliverables controller to return all deliverables when no filter is pressed

  metorino

  committed
  8e5b857

• Refactoring duplicated code for filtering deliverables in get_deliverables and update_feedback deliverables_controller actions

  metorino

  committed
  8442e8b

Commits on Nov 27, 2013

• Refactorinf deliverables_controller

  metorino

  committed
  45ae4a6

• Refactorinf deliverables_controller. Removing unnecesary return statement

  metorino

  committed
  98014ad

• Add search deliverables using Andrew ID

  real-davidcs

  committed
  ba5d0a7

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  real-davidcs

  committed
  b23c8d5

• Change checkbox default to unchecked for Send Copy to Myself in grade page and grade book

  mia-m

  committed
  44530d7

• Applying Tushar's fix to reminder hanlder tests

  metorino

  committed
  bc7737f

• Merge branch 'master' of https://github.com/TeamTuring/whiteboard

  metorino

  committed
  bdfd835

Commits on Dec 2, 2013

• Implement test cases for searching deliverables

  real-davidcs

  committed
  4c75ab9

Commits on Dec 4, 2013

• Fixed the problem of Bootstrap CSS breaking the entire website

  

  Isil Demir

  committed
  7482b74

• Fixed CSS issue of Bootstrap breaking the entire website's style

  

  Isil Demir

  committed
  3edf67e

• Improve search function performance

  real-davidcs

  committed
  360863b

• Merge branch 'master' of github.com:TeamTuring/whiteboard

  real-davidcs

  committed
  760c061

Commits on Dec 5, 2013

• Fixed bug in deliverables controller: My teams option not sticking if default value is not changed. Code clean up in grading queue view

  

  Isil Demir

  committed
  11eb85e

• Fixed bug in deliverables controller: My teams option not sticking if default value is not changed.

  

  Isil Demir

  committed
  7fc9830

Commits on Dec 6, 2013

• Latest refactorin. Just style and variables names. Will miss you whiteboard, but will miss more my great team Turing

  metorino

  committed
  0513f07