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.

Sign up for GitHub

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

Jump to bottom

Sa 1 #1631

Closed
wants to merge 509 commits into from
Closed

Sa 1 #1631

wants to merge 509 commits into from

Conversation

ayodhyaprasad01
Copy link

@ayodhyaprasad01 ayodhyaprasad01 commented Oct 15, 2024 •
edited
Loading

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

Iamankit45 and others added 30 commits March 15, 2024 21:16
@Iamankit45
Merge remote-tracking branch 'remoteK/main' into notificationsPull
0a8bbb0 
pulled notifications
@anujpatel03
Merge pull request #23 from anujpatel03/hmweb-main
85f74aa 
Hmweb main
@aniruddha2002das
Merge branch 'anujpatel03:main' into hmweb-leave
a765e45
@aniruddha2002das
added remark field in leave
a9853ca
@aniruddha2002das
Merge remote-tracking branch 'origin/hmweb-leave' into hmweb-leave
3ee3c58
@aniruddha2002das
fix:hostelTransaction
62fb346
@aniruddha2002das
fix
a2633e7
@aniruddha2002das
fix:In leave request remark option is added
5d8f810
@anujpatel03
Merge pull request #24 from aniruddha2002das/hmweb-leave
31c07be 
fixed leave data
@Iamankit45
added notification functionality
1c9a221
@anujpatel03
Merge branch 'hmweb-main' into dashboardMerge
2925a9e
@anujpatel03
Merge pull request #25 from Iamankit45/dashboardMerge
5516b6f 
Added notification functionality in Guest room , Fine , Leave.
@anujpatel03
added remark column in leave request
52dbcfb
@anujpatel03
Merge remote-tracking branch 'origin/hmweb-main' into notification
2b5ce50
@anujpatel03
migrations files
b64e663
@anujpatel03
Merge pull request #26 from anujpatel03/hmweb-main
5678579 
Added notification functionality
@Ravichendraa
AC-1 : Add functionality to add and update courses (#1300)
0c2392c 
* Add functionality to add and update courses

* Course version added

* Delete FusionIIIT/Fusion/settings/development.py

* Delete FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240218_1206.py

* Delete FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py

* Delete FusionIIIT/applications/globals/migrations/0002_auto_20240218_1206.py

* Delete FusionIIIT/applications/globals/migrations/0003_auto_20240218_1235.py

* Delete FusionIIIT/applications/globals/migrations/0004_auto_20240218_1242.py

* Delete FusionIIIT/applications/globals/migrations/0005_auto_20240218_1325.py

* Delete FusionIIIT/applications/globals/migrations/0006_auto_20240218_1336.py

* Delete FusionIIIT/applications/globals/migrations/0007_auto_20240218_1601.py

* Delete FusionIIIT/applications/globals/migrations/0008_auto_20240218_1942.py

* Delete FusionIIIT/applications/globals/migrations/0009_auto_20240219_2217.py

* Delete FusionIIIT/applications/globals/migrations/0010_auto_20240219_2232.py

* Delete FusionIIIT/applications/scholarships/migrations/0002_auto_20240218_1206.py

* Delete requirements.txt

* Delete FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240312_1929.py

* Delete FusionIIIT/applications/programme_curriculum/migrations/0003_auto_20240312_1944.py

* Delete FusionIIIT/applications/programme_curriculum/migrations/0004_course_latest_version.py

* Delete FusionIIIT/applications/programme_curriculum/migrations/0005_auto_20240313_0128.py
@SukulSarve
Fixing ui bugs (#1335)
d40e94d
@kishankoushal
Merge branch 'FusionIIIT:main' into main
58a32b0
@kishankoushal
Merge branch 'main' of https://github.com/kishankoushal/Fusion
bd60014
@Iamankit45
Merge remote-tracking branch 'fusion/gad-5' into dashboardMerge
1afa0de 
commit the merge
@kishankoushal
Merge remote-tracking branch 'upstream/gad-5' into gad-5_2021
b1a62ed
@kishankoushal
updated dashboard
f27a5a4
@abhi87374 @yatharthagoenka
@akshatnema @Lawful2002 @Anunaya07 @Aksh-Bansal-dev @BlackHAWK2001 @Ishu-ji
Gad 5 (#1341)
01bf0c9 
* Enabled all modules for access (#1120)

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

---------

Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
@kishankoushal
Merge pull request #1 from kishankoushal/gad-5_2021
c29708d 
Gad 5 2021
@Iamankit45
Synced with new Dashboard
69d3357 
Some changes made to dashboard module in terms of UI and context updated.
@Iamankit45
Merge remote-tracking branch 'origin/dashboardMerge' into dashboardMerge
4c14426 
Resolved some merge confilt
@anujpatel03
.DS_Store
1c72a73
@anujpatel03
Merge pull request #27 from Iamankit45/dashboardMerge
a5eeacd 
Synced with Dashboard
@anujpatel03
Merge remote-tracking branch 'origin/hmweb-main' into notification
09cd7f5
prabhatsuman and others added 26 commits April 15, 2024 21:48
@prabhatsuman
Merge branch 'latest_staging' into OS-2
13d3fc6
@prabhatsuman
minor bug fix
9324b00
@prabhatsuman
latest migrations added
6de94ac
@ChaudharyRaman
Merge pull request #1466 from prabhatsuman/OS-2
688830b 
Updated  OS-2 (PHC module) with File Tracking Functionality Enabled
@ChaudharyRaman
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion …
2a31c28 
…into ps-1
@ChaudharyRaman
Merge pull request #1468 from FusionIIIT/os-2
f2156de 
Merging OS-2 (PHC) into latest_staging
@ChaudharyRaman
removed auto migrations
416f522
@ChaudharyRaman
Merge pull request #1469 from FusionIIIT/ps-1
443720c 
[PS-1] Merging to latest_staging
@Srivatsa19
Removed unwanted files
0c92fc9
@Srivatsa19
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion …
d8033fe 
…into gad-2-2025-latest
@prajjwalkapoor
fixed indentation
123472d
@prajjwalkapoor
fixed indentation
d3b81da
@SukulSarve
Enable deployed module (#1471)
58ecf34
@Srivatsa19
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion …
a5cc5e4 
…into gad-2-2025-latest
@Srivatsa19
Made changes so that employee also can create a new request
df6c7eb
@Priyansh61
Merge pull request #1463 from Srivatsa19/gad-2-2025-latest
7d53b01 
Gad 2 2025 latest
@Priyansh61
Merge pull request #1460 from FusionIIIT/gad-2
c638c57 
Gad 2 : Pushing for `latest_staging`
@Srivatsa19
Added extra designations in the iwd dashboard file
04cc11a
@Srivatsa19
Added extra designation in the ied dashboard file
3d7a221
@prajjwalkapoor
Merge pull request #1474 from Srivatsa19/gad-2-2025-latest
30df282 
Gad 2 2025 latest
@prajjwalkapoor
Merge pull request #1475 from FusionIIIT/gad-2
eb90711 
Added extra designations in the IWD dashboard file
@anujpatel03
removed initials of url http://0.0.0.0:8000 while fetching in assign-…
c8bbe19 
…batch,assign-caretaker,assign-warden
@anujpatel03
previous batch by default value 0
43900a5
@Priyansh61
Merge pull request #1478 from anujpatel03/sa-1-main
47b12de 
SA-1 Hostel Management (Fixed bug)
@anujpatel03
resolve conflict
32ba344
@Priyansh61
Merge pull request #1481 from anujpatel03/latest-sa-1
438f0a5 
SA-1 Hostel Management
@FusionIIIT-Bot
Copy link
Collaborator

Congratulations for making your first Pull Request at Fusion!! 🎉 Someone from our team will review it soon.

@ayodhyaprasad01
Copy link
Author

Impact
No breaking changes.
All existing tests have passed without issues.

Additional Information
Comments and documentation have been updated where necessary.
Please review and provide feedback.
My code follows the [style guidelines of this project]

@dvjsharma
Copy link
Member

Hi @ayodhyaprasad01. Please rebase your branch as I see a lot of redundant commits. Also, please include a description of the changes you made for the review.

@ayodhyaprasad01 ayodhyaprasad01 closed this by deleting the head repository Oct 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.