Attempting to fix merge conflicts through github#62
Open
CodeMastr3 wants to merge 38 commits into
Open
Conversation
* Merge VioletInferno/ODIT:4aa6f225 into master - Add basic registration and login functionality. - Validate usernames/emails are unique. - Modify front-end to showcase current logged in user * Resolve issues ChicoState#24, ChicoState#28 - Add issue submission guide image - Ensure mobile browsers can view all pages correctly without odd margins - Add small tweaks to view submissions page to make it slightly prettier * Resolve issues ChicoState#24, ChicoState#28 - Add issue submission guide image - Ensure mobile browsers can view all pages correctly without odd margins - Add small tweaks to view submissions page to make it slightly prettier * Revert change to settings.py * Remove old database files Co-authored-by: John Higdon <jmhigdon@gmail.com>
…d issue assignment. Closes #1 Closes ChicoState#7 Closes ChicoState#8
Added edit profile page. Added pages to view other people's profiles. Made clear button work on search pages. Closed #3 Fixed ChicoState#49
* Merge VioletInferno/ODIT:4aa6f225 into master - Add basic registration and login functionality. - Validate usernames/emails are unique. - Modify front-end to showcase current logged in user * Resolve issues ChicoState#24, ChicoState#28 - Add issue submission guide image - Ensure mobile browsers can view all pages correctly without odd margins - Add small tweaks to view submissions page to make it slightly prettier * Resolve issues ChicoState#24, ChicoState#28 - Add issue submission guide image - Ensure mobile browsers can view all pages correctly without odd margins - Add small tweaks to view submissions page to make it slightly prettier * Revert change to settings.py * Remove old database files * Remove migrations and database file for merge * Add styling to user profile page, viewissues page - User can view their own issues and assigned issues here - Viewissues page has gotten a reformatting using Bootstrap cards * Add issue views on profile page, edit signup form appearance (resolve ChicoState#43, ChicoState#44) * mend * Add everything else that I didn't, apparently. * Fix broken viewmyissues page * Fix broken viewmysubmittedissues page Co-authored-by: John Higdon <jmhigdon@gmail.com>
…o search for technicians by location. Closes ChicoState#18.
This doesn't need to be hosted on github.
…names and emails on the edit profile page. Added boilerplate for ChicoState#41.
…ets and to resolve & add resolution notes. Minor front-end modificaitons added.
…ution for validation.
…ution for validation.
Collaborator
Author
|
We are choosing to leave this up until we figure out why Google only sometimes let's you choose a username |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.