-
Notifications
You must be signed in to change notification settings - Fork 975
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
Visitor hostel #1513
base: os-1-final
Are you sure you want to change the base?
Visitor hostel #1513
Conversation
* Added start date display in pre registration (FusionIIIT#1063) * Major changes in Visitor's Hostel --------- Co-authored-by: A Anunaya <[email protected]>
* Booking form integrated with Front End * OS-1 week 7 issue resolve * Bill structured properly, updated room availability, meal record fixed, url fixed * Indentaion problems fixed * database changed * More indentations issues resolved * More indentations issues resolved * Next button issue resolved * Database Changed, inventory functionality added * Database conflict resolved * Minor issues resolved * Final changes made --------- Co-authored-by: Akshat Nema <[email protected]>
OS1 - visitor hostel
* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * refactored and corrected booking issues * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * added form * Fixing ui bugs (FusionIIIT#1335) --------- Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: SukulSarve <[email protected]>
added necessary migration files
mobile api changes
resolved the merge-conflicts. PTAL @ChaudharyRaman |
@@ -72,3 +72,18 @@ node_modules/ | |||
|
|||
FusionIIIT/static/ | |||
package-lock.json | |||
|
|||
|
|||
docker-entrypoint.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why these changes are in gitignore?
@Shivkant-Chauhan @varunraj03 .github and .idea files is being deleted. Can you please check. |
…into visitor_hostel
@prabhatsuman @anudeeps0306 Can you please confirm whether this PR is ready to merge... |
@ChaudharyRaman There are so many wrong file changes in this PR, we cannot proceed |
@varunraj03 Please sync with the branch |
Issue that this pull request solves
Closes: # (issue number)
Proposed changes
Brief description of what is fixed or changed
Types of changes
Put an
x
in the boxes that applyChecklist
Put an
x
in the boxes that applyScreenshots
Please attach the screenshots of the changes made in case of change in user interface
Other information
Any other information that is important to this pull request