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

Issue#34 researcher preferences should be put apart #42

Open
wants to merge 24 commits into
base: main
Choose a base branch
from

Conversation

SamuelVch98
Copy link
Collaborator

I've removed the ‘preferences’ tab from the profile and incorporated it into a new page. I only display the preferences for this year in the profile

@anthonygego
Copy link
Member

The diff seems to include code from #32. I'll wait for the review.

@anthonygego
Copy link
Member

Can you solve conflicts ?

SamuelVch98 and others added 8 commits October 17, 2024 15:45
# Conflicts:
#	config.py
#	course.py
#	templates/layout.html
#	util.py
…ers)

Display the following preferences on the profile

# Conflicts:
#	templates/user_profile.html
#	user.py

# Conflicts:
#	templates/user_profile.html
#	user.py
templates/layout.html Outdated Show resolved Hide resolved
course_preference.py Outdated Show resolved Hide resolved
course_preference.py Outdated Show resolved Hide resolved
course_preference.py Outdated Show resolved Hide resolved
course_preference.py Outdated Show resolved Hide resolved
user.py Outdated Show resolved Hide resolved
user.py Outdated Show resolved Hide resolved
templates/user_profile.html Outdated Show resolved Hide resolved
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.

2 participants