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.

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

Pull Request: C2_Rania_470_profile_progress_2.12 #601

Closed
wants to merge 31 commits into from

Conversation

Rania-Abdel-Fattah
Copy link
Collaborator

Rania Abdel Fattah added 30 commits April 20, 2014 13:51
…nto C2_Rania_255_edit_solutions_constraints
…nto C2_Rania_283_remove_solutions_constraints
…nto C2_Rania_283_remove_solutions_constraints
<ul class="nav nav-tabs">
<li class="active"><a href="#a" data-toggle="tab">Course</a></li>
<li><a href="#b" data-toggle="tab">Contest</a></li>
</ul>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix indentation

@Rania-Abdel-Fattah Rania-Abdel-Fattah self-assigned this May 18, 2014
<% next_problems_to_solve = current_student.get_next_problems_to_solve %>
<% next_problems_to_solve.each do |key , value| %>
<%= link_to value.title,
controller: "/problems",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix indentation

@AhmedOsam
Copy link
Collaborator

please resolve conflicts @Rania-Abdel-Fattah

@ahmad-elassuty
Copy link
Collaborator

@Rania-Abdel-Fattah please resolve conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants