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

C3 fadel 211 remove helping hints 4.21 #307

Closed
wants to merge 19 commits into from

Conversation

mohamedfadel
Copy link
Collaborator

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 u cannot merge branch that is not hrs in your branch

# @hints: All the previous hints that had been entered before.
# @hints_check: All the previous hints that had been entered before to check if it is a hint or a tip.
# Return : table with all previous hints
# Author: Nadine Adel
Copy link
Collaborator

Choose a reason for hiding this comment

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

@fadel1493 You can't make a pull request of other peoples' methods. Apply this to the rest of the file.

@Ahmed-Moataz
Copy link
Collaborator

@fadel1493 Please see the previous comments. Doc. reopen.

# category: states whether it is a hint or tip
# Returns:
# Redirects to edit page on success, refreshes on failure
# Author: Mohamed Fadel
Copy link
Collaborator

Choose a reason for hiding this comment

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

# [Adding Helping Hints - 4.12]
# Creates a new record to Hint Table
# Parameters:
#   owner_id: ID of the hint owner
#   owner type: type of hint owner
#   category: states whether it is a hint or tip
# Returns: 
#   Redirects to edit page on success, refreshes on failure
# Author: Mohamed Fadel

@fadel1493 It should be like that. Please apply this to the rest of the file.

@Ahmed-Moataz
Copy link
Collaborator

@fadel1493 Please check the previous comments. Doc. reopen.

@Rania-Abdel-Fattah
Copy link
Collaborator

remove Nadine's code first


@@answer_id = nil

#[Adding Helping Hints - 4.12]
Copy link
Collaborator

Choose a reason for hiding this comment

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

@fadel1493 Please add a space after the hash when there is no tab.

@Ahmed-Moataz
Copy link
Collaborator

@fadel1493 Please check the previous comments. Doc. reopen.

@Ahmed-Moataz
Copy link
Collaborator

@fadel1493 Please remove Nadine's code from your branch.

@Ahmed-Moataz
Copy link
Collaborator

@fadel1493 Unmergeable code cannot be reviewed. Please update with the master and fix the conflicts.

@mohamedfadel mohamedfadel deleted the C3_Fadel_211_remove_helping_hints_4.21 branch April 22, 2014 22:44
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.

4 participants