Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Staged: The main working branch of Team NapTime #254

Open
wants to merge 268 commits into
base: master
Choose a base branch
from
Open

Staged: The main working branch of Team NapTime #254

wants to merge 268 commits into from

Conversation

ShishirSK
Copy link

A pull request for Whiteboard's grading queue implementation by Team NapTime.

anirudhbhargava7 and others added 30 commits October 19, 2013 05:13
@anirudhbhargava7
New Setup
0f24141
@ShishirSK
Rebased the RoughUI branch
e1c0884
@ShishirSK
Placeholder UI for grading queue
0e63586
@ShishirSK
Added Capybara test cases
7c3e3be
@ShishirSK
Changes to avoid git conflict on grading_queue_spec
12ddf1e
@ShishirSK
Merging master and RoughUI
3895362
@anirudhbhargava7
Seeds from Professor/whiteboard
518dfc5
@anirudhbhargava7
Changes in the Seeds and views/deliverable/_deliverable...
a4d0357
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into s…
00e0db5 
…taged

Conflicts:
	app/controllers/application_controller.rb
	app/models/peer_evaluation_learning_objective.rb
	spec/models/peer_evaluation_learning_objective_spec.rb
rm tmpdir
6205b6e
@qiao
Ignore vim swap files
223a508
@qiao
Merge branch 'staged' of github.com:Gonghan/whiteboard into staged
cfa60a0
@qiao
Ignore tmpdir
581d05d
@qiao
Remove tmpdir
654181f
@Gonghan
update
344c185
@Gonghan
update
78eb73b
@Gonghan
update
f2f89a9
Merge branch 'sort_task_number' of https://github.com/Gonghan/whiteboard
0698a70 
 into sort_task_number

Conflicts:
	app/controllers/application_controller.rb
	app/models/peer_evaluation_learning_objective.rb
	spec/models/peer_evaluation_learning_objective_spec.rb
Have a partially written rspec test for sorting by task number
9e18c18 
Currently just populates the grading queue with a single submission
@qiao
Added rough grading queue UI
ba7f7d2
Added grading_queue_sort_by_task_spec for our added spec
4650a91
Removing
765d2b0
Removing strong_parameters stuff
851a342
Commented out specs failing specs for mass assignment
0fa69e6
@qiao
Revert modification of current_user
afca916
@qiao
mod: application_controller
3081ea6
@qiao
Only run Travis builds on master and staged branch
1f8e8f5
effort_log and effort_log_line_items are protected against mass
002baea 
assignment - done until possibly after our meeting with Todd tomorrow
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into m…
ae083a4 
…ass_assignment
Merge branch 'mass_assignment' into staged
31bd647 
Conflicts:
	app/models/effort_log.rb
	app/models/effort_log_line_item.rb
qiao and others added 30 commits November 25, 2013 15:20
@qiao
Modified Team Member UI
d551e59
@qiao
Added Collapse Button
71af3ba
@qiao
Added Nothing-To-Show Indicator
72bd70d
@qiao
Remove extraneous bottom border of deliverables list
bfed064
@qiao
Added Form Submission Indicator
a97f2f9
@qiao
Commented out current_user
384e35d
@qiao
Added New Submission Indicator
6c36e1e
@qiao
Tweaked Form Content
31c02b4
Merge branch 'new-ui' of https://github.com/Gonghan/whiteboard into n…
87b2566 
…ew-ui
Merge branch 'update_specs' into new-ui
8074b98
Updated sort specs
7bd0506
Merge branch 'update_specs' into new-ui
e24e9cf
Fixed sort spec
f807c51
@anirudhbhargava7
Switching to filter_all_branch
68a914c
@anirudhbhargava7
all_teams made
ad6ed9a
@anirudhbhargava7
styling for the button added
ce32a44
@anirudhbhargava7
filter-all teams done
34338b0
@anirudhbhargava7
All-Teams drafted left
7723fd9
@qiao
Fixed: team grade should only be shown if is team deliverable
384353f
@anirudhbhargava7
before removing draft buttons for teams not under primary faculty
120cd1b
@Gonghan
fix a bug of all assignments
b478e80
@Gonghan
fix a bug of showing all assignment in all team
e4cf4c4
@Gonghan
fix grade model bug
505ed97
@Gonghan
fix grading_queue_spec bug
c95b096
@qiao
Merge branch 'new-ui' of github.com:Gonghan/whiteboard into new-ui
04be5a7
@qiao
Merge branch 'new-ui' into staged
c025c33
@qiao
Removed Border Radius of OnOffSwitch
2c14ad8
@ShishirSK
Verifying the build is successful
9d784b6
@qiao
Merge branch 'staged' of github.com:Gonghan/whiteboard into staged
8efe8da
@qiao
Removed temporary files
e881bc7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ShishirSK @anirudhbhargava7 @qiao @Gonghan @professor