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
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b832cf8
OS1 issue 1024 resolved : Booking form integrated with Front End (#1025)
VedantJain1103 Feb 14, 2023
2248fbc
Merge branch 'test-temp' into os-1
akshatnema Feb 18, 2023
c90b94b
OS-1 : Week 5 : All changes till week 5 (#1116)
harsh-k-singh Feb 26, 2023
e202745
Merge branch 'main' into os-1
akshatnema Mar 15, 2023
5101420
Merge branch 'main' into os-1
akshatnema Mar 15, 2023
405d82f
Merge branch 'main' into os-1
akshatnema Mar 18, 2023
0c0ea14
Merge branch 'main' into os-1
akshatnema Mar 19, 2023
859c115
Merge branch 'main' into os-1
akshatnema Mar 23, 2023
231b385
Merge branch 'main' into os-1
akshatnema Mar 26, 2023
97f98c7
OS-1 Minor issues resolved (#1202)
VedantJain1103 Apr 6, 2023
96a0b50
visitor hostel
davneesh Mar 10, 2024
ec63f75
Merge branch 'os-1' into main
davneesh Mar 10, 2024
93b7878
Merge pull request #1321 from davneesh/main
ChaudharyRaman Mar 11, 2024
c3a04c2
os-1 vh complete
varunraj03 Mar 17, 2024
3825701
os-1 vh module
varunraj03 Mar 18, 2024
f02bf3f
Merge branch 'staging' into os-1
prajjwalkapoor Mar 19, 2024
d807cf1
migrations added and phc resolved
prabhatsuman Apr 5, 2024
577b0d8
corrected faculty profile
prabhatsuman Apr 5, 2024
35b62c9
corrected acad info model
prabhatsuman Apr 5, 2024
949c43f
comma removed
prabhatsuman Apr 5, 2024
269b596
Merge pull request #1395 from prabhatsuman/temp-staging
Shivkant-Chauhan Apr 6, 2024
50b03a9
mobile api changes
TusharGupta03 Apr 7, 2024
997f78a
Merge pull request #1400 from TusharGupta03/NewChanges
Shivkant-Chauhan Apr 7, 2024
55e82c6
added notifications
varunraj03 Apr 21, 2024
68f86a5
Merge branch 'os-1' into visitor_hostel
Shivkant-Chauhan Apr 21, 2024
4ea732a
added .github files
varunraj03 Apr 21, 2024
570da5b
Merge branch 'visitor_hostel' of https://github.com/varunraj03/Fusion…
varunraj03 Apr 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

12 changes: 0 additions & 12 deletions .github/ISSUE_TEMPLATE/component_refactor.md

This file was deleted.

19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/proposal.md

This file was deleted.

36 changes: 0 additions & 36 deletions .github/pull_request_template.md

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/welcome-new-contributors.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ 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?



FusionIIIT/applications/eis/migrations/
# FusionIIIT/applications/eis/migrations/

postgres_data

# sample files from media/Adminstrator
!media/Administrator/academic_procedures/sample_courses_allotment.xls
!media/Administrator/academic_procedures/sample_student_profile.xlsx

migrations/
# migrations/

5 changes: 0 additions & 5 deletions .idea/.gitignore

This file was deleted.

31 changes: 0 additions & 31 deletions .idea/Fusion.iml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/dataSources.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/libraries/Django_Lib.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

26 changes: 0 additions & 26 deletions .idea/runConfigurations/Local_Server.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

Loading