Skip to content

Staged: The main working branch of Team NapTime#254

Open
ShishirSK wants to merge 268 commits intoprofessor:masterfrom
Gonghan:staged
Open

Staged: The main working branch of Team NapTime#254
ShishirSK wants to merge 268 commits intoprofessor:masterfrom
Gonghan:staged

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
…taged

Conflicts:
	app/controllers/application_controller.rb
	app/models/peer_evaluation_learning_objective.rb
	spec/models/peer_evaluation_learning_objective_spec.rb
 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
Currently just populates the grading queue with a single submission
assignment - done until possibly after our meeting with Todd tomorrow
Conflicts:
	app/models/effort_log.rb
	app/models/effort_log_line_item.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants