Skip to content

PS1_Changes_UI #1488

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
Merged
merged 281 commits into from
Apr 20, 2024
Merged

PS1_Changes_UI #1488

merged 281 commits into from
Apr 20, 2024

Conversation

ThisisMS11
Copy link

The following changes were made :

  1. Improved UI and notification module integrated.
  2. Admins were disallowed to file indents.
  3. file forwarding restricted to the beholder only.
  4. Archieved files feature included.

aniruddha2002das and others added 30 commits February 17, 2024 16:21
@aniruddha2002das
chore:inventory_form change
d2f6f6b
@anujpatel03
added frontend of alloted_room and linked with backend
c97c383
@anujpatel03
Merge branch 'hmweb-main' into hmweb3
8dcf6ad
@anujpatel03
Merge pull request FusionIIIT#3 from Iamankit45/hmweb3
4a5695e 
Functionality assigned batch
@anujpatel03
Merge remote-tracking branch 'origin/hmweb-main' into hmweb-main
fcf2912
@stark-akshay3000
chore: hostel_complaint and hostel_leave implemented
035e559
@aniruddha2002das
feat:hall_inventory form submmit,edit,delete
bc3dbe0
@anujpatel03
Merging migration of database
89111f8
@anujpatel03
Merge branch 'hmweb-main' into fusionv7
eea2625
@anujpatel03
Merge pull request FusionIIIT#4 from stark-akshay3000/fusionv7
76ae93a 
Added HostelLeave and hostelComplaint functionality in backend.
@Iamankit45
added assign-warden , add-hostel ,delete-hostel in frontend and backend
0a6fb32
@Iamankit45
Merge remote-tracking branch 'origin/hmweb3' into hmweb3
07a8708
@anujpatel03
akshay PR merge
96068ce
@anujpatel03
Merge branch 'hmweb-main' into hmweb3
1d4ec36
@aniruddha2002das
chore:hall id set
388ea35
@anujpatel03
Merge pull request FusionIIIT#6 from Iamankit45/hmweb3
fc532be 
added assign-warden, add hostel , delete hostel ,show room, alloted room, complaint , leave  etc
@anujpatel03
Final merge of akshay,ankit,anuj
31e264c
@anujpatel03
Merge branch 'main' into hmweb-main
4b76c61 
Merging all the changes of akshay,ankit,anuj
@anujpatel03
uncommented functionality of hostel_complaint_list/
0f97dbc
@aniruddha2002das
fix:hall select problem fixed
578ff2e
@aniruddha2002das
fix:dropdownlist change when hall.id change in URL
0a5b2b9
@anujpatel03
Added frontend of all_leave_data,alloted_rooms_main,create_leave,comp…
a99d39e 
…laint_form
@stark-akshay3000
chore: login required
fb68faa
@aniket2003
Added Sdk module for Approve/Forwd and Indent file, add/view stock, g…
c22fd4b 
…enerate report
@stark-akshay3000
chore: login required implemented
d7c8c39
@aniruddha2002das
feat:authentication added
b2d5c4f
@stark-akshay3000
feat: authentication added in hostel leave and hostel complaint syste…
f8b27ad 
…m and also added all operations that caretaker and warden can perform
@anujpatel03
Merge branch 'hmweb-main' into hmweb-anni11
45c174e
@anujpatel03
Merge pull request FusionIIIT#7 from aniruddha2002das/hmweb-anni11
491e752 
Added manage inventory with auth.
@anujpatel03
Merge branch 'hmweb-main' into fusionv9
a88e436
prajjwalkapoor and others added 18 commits April 16, 2024 12:55
@prajjwalkapoor
fixed indentation
123472d
@prajjwalkapoor
fixed indentation
d3b81da
@SukulSarve
Enable deployed module (FusionIIIT#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 FusionIIIT#1463 from Srivatsa19/gad-2-2025-latest
7d53b01 
Gad 2 2025 latest
@Priyansh61
Merge pull request FusionIIIT#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 FusionIIIT#1474 from Srivatsa19/gad-2-2025-latest
30df282 
Gad 2 2025 latest
@prajjwalkapoor
Merge pull request FusionIIIT#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 FusionIIIT#1478 from anujpatel03/sa-1-main
47b12de 
SA-1 Hostel Management (Fixed bug)
@ThisisMS11
Removed redundant designations selection pages and prevented admins t…
eddcfe8 
…o create indent file
@anujpatel03
resolve conflict
32ba344
@Priyansh61
Merge pull request FusionIIIT#1481 from anujpatel03/latest-sa-1
438f0a5 
SA-1 Hostel Management
@Priyansh61
Merge pull request FusionIIIT#1480 from FusionIIIT/sa-1
bbab300 
Pushing `sa-1` to `latest_staging`
@ThisisMS11
Copy link
Author

@prajjwalkapoor @anudeeps0306 please review the pr.

@anudeeps0306
Copy link
Contributor

@prajjwalkapoor All migration files exist , you can merge it.

@prajjwalkapoor
Copy link

LGTM.

@prajjwalkapoor prajjwalkapoor merged commit 1807e62 into FusionIIIT:ps-1 Apr 20, 2024
@ThisisMS11 ThisisMS11 deleted the mohit_fusion_1 branch April 21, 2024 17:08
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.