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

Merging the Development Branch from Our Fork #148

Merged
merged 37 commits into from
Jun 14, 2018

Conversation

edward0414
Copy link
Collaborator

Merging the instructor-switch feature and instructor landing page feature into a "development" branch

Rathu Kugan and others added 30 commits May 3, 2018 13:51
…erence

Revert "Revert "Instructor preference""
2. Instructor view now only shows the courses that are relevant(courses that will be taught by the instructor)
@edward0414 edward0414 changed the title Development Merging the Development Branch from Our Fork Jun 14, 2018
@nigef
Copy link
Collaborator

nigef commented Jun 14, 2018

Nice, just adding here what you @edward0414 @jsyoon01 already know,

Fixes the top bullet in #143, though the modal doesn't come up and my browser window freezes when clicking the last name. I haven't been able to spot the reason in the code, yet.

Fixes the fourth bullet in #144 for the unassigned-table. Would it be possible to also fix the alignment for the assigned-table?

Fixes #145.

@nigef
Copy link
Collaborator

nigef commented Jun 16, 2018

@jsyoon01, what do you think? I think this merge should be revered for two reasons:
• The modal bug causes the browser window to freeze.
• The instructor view search feature idea may have arisen due to a misunderstanding. Probably we should not have the search feature to switch utorid. Otherwise if the feature is useful, switching to another utorid should lock down to a read-only mode, or something like that, because we don't want users to morph into other users.

@edward0414
Copy link
Collaborator Author

@nigef I agree. I merged the branch at first because I thought it is just a small branch for Sungyoon and I. Now we figuring out the workflow and knowing that it's main branch for this summer group to push to, it is a good idea to not merge the PR until everything is working.

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.

4 participants