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

Visitor hostel #1513

Open
wants to merge 27 commits into
base: os-1-final
Choose a base branch
from
Open

Conversation

varunraj03
Copy link

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 apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Other (please describe):

Checklist

Put an x in the boxes that apply

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have created new branch for this pull request
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • My changes does not break the current system and it passes all the current test cases.

Screenshots

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

VedantJain1103 and others added 25 commits February 14, 2023 11:10
* 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]>
* 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]>
@Shivkant-Chauhan
Copy link

resolved the merge-conflicts. PTAL @ChaudharyRaman

@@ -72,3 +72,18 @@ node_modules/

FusionIIIT/static/
package-lock.json


docker-entrypoint.sh
Copy link
Contributor

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?

@ChaudharyRaman
Copy link
Contributor

@Shivkant-Chauhan @varunraj03 .github and .idea files is being deleted. Can you please check.

@ChaudharyRaman
Copy link
Contributor

@prabhatsuman @anudeeps0306 Can you please confirm whether this PR is ready to merge...

@prabhatsuman
Copy link

@ChaudharyRaman There are so many wrong file changes in this PR, we cannot proceed

@ChaudharyRaman ChaudharyRaman changed the base branch from os-1 to os-1-final April 25, 2024 11:38
@ChaudharyRaman
Copy link
Contributor

@varunraj03 Please sync with the branch os-1-final.

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.

10 participants