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

Merging Latest Staging in RSPC-FINAL #1536

Merged
merged 236 commits into from
Apr 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
236 commits
Select commit Hold shift + click to select a range
a3df842
GAD1-Department (#1064)
CHOUHAN-MOHIT Feb 8, 2023
07750f7
Fix problem regarding fetching batch for students enrolled in batch 2…
gaur-abhi524 Feb 10, 2023
91e248c
Fix form render for students of 2020 batch and later (#1103)
gaur-abhi524 Feb 13, 2023
0e4f281
ac-2: added sample excel sheet to add new students and deleted unnece…
Anunaya07 Feb 16, 2023
821c814
Merge remote-tracking branch 'origin/test-temp' into ac-2
akshatnema Feb 17, 2023
bf8a101
Merge branch 'main' into ac-2
akshatnema Feb 18, 2023
3b64aa0
Merge branch 'test-temp' into ac-5
akshatnema Feb 18, 2023
ce6239f
Merge branch 'test-temp' into gad-1
akshatnema Feb 18, 2023
04dc4b4
GAD1 : Week1 : Fixed-Request are getting submitted with null values f…
CHOUHAN-MOHIT Feb 27, 2023
2bf2a36
Gad1 : Week4 : Added design departments tab and some new subtabs for…
CHOUHAN-MOHIT Mar 3, 2023
8a63881
ac-3 : week-5 : Fixed Assignment and slide upload and download by Ins…
tech-akash Mar 14, 2023
e985383
Merge branch 'main' into ac-3
akshatnema Mar 14, 2023
f337d6a
Merge pull request #1151 from FusionIIIT/main
yatharthagoenka Mar 15, 2023
0df8bfe
Merge branch 'main' into ac-2
akshatnema Mar 15, 2023
ae6a748
Merge branch 'main' into gad-1
akshatnema Mar 15, 2023
2a037b8
Merge branch 'main' into ac-2
akshatnema Mar 15, 2023
182a220
Merge branch 'main' into ac-3
akshatnema Mar 15, 2023
3a117bb
Merge branch 'main' into ac-5
akshatnema Mar 15, 2023
e28963d
Merge branch 'main' into gad-1
akshatnema Mar 15, 2023
360abd5
merge issue resolved
akshatnema Mar 15, 2023
4c842d5
Merge branch 'main' into ac-2
akshatnema Mar 18, 2023
1be8bba
Merge branch 'main' into ac-3
akshatnema Mar 18, 2023
e3b685c
Merge branch 'main' into ac-5
akshatnema Mar 18, 2023
7ff9448
Merge branch 'main' into gad-1
akshatnema Mar 18, 2023
7c08c83
Gad1 : Week5-6 : Created APIs for department module (#1161)
CHOUHAN-MOHIT Mar 19, 2023
bfca3e9
Merge branch 'main' into ac-2
akshatnema Mar 19, 2023
3476583
Merge branch 'main' into ac-3
akshatnema Mar 19, 2023
1bfe8f2
Merge branch 'main' into ac-5
akshatnema Mar 19, 2023
ba47708
Merge branch 'main' into gad-1
akshatnema Mar 19, 2023
115d684
Merge branch 'main' into ac-2
akshatnema Mar 23, 2023
6fedb87
Merge branch 'main' into ac-3
akshatnema Mar 23, 2023
d0ba062
Merge branch 'main' into ac-5
akshatnema Mar 23, 2023
5464488
Merge branch 'main' into gad-1
akshatnema Mar 23, 2023
18b2a1b
AC-2: Replaced .xlsx file with .xls file (#1124)
Anunaya07 Mar 25, 2023
e8a612e
Merge branch 'main' into ac-2
akshatnema Mar 26, 2023
081f35c
Merge branch 'main' into ac-3
akshatnema Mar 26, 2023
4831f8d
Merge branch 'main' into ac-5
akshatnema Mar 26, 2023
1ee96a8
Merge branch 'main' into gad-1
akshatnema Mar 26, 2023
d7235c6
feat: basic frontend of Examination module
SaiGanesh837 Feb 14, 2024
2b5f993
Implemented 90% apis and implemented 3 models (#1289)
jatin471 Feb 17, 2024
cf56e9d
created apis for AC2 module
Divyanshu-iiitdmj Feb 17, 2024
49f6cbd
created apis for AC2 module
Divyanshu-iiitdmj Feb 17, 2024
c2aab55
created apis for AC2 module
Divyanshu-iiitdmj Feb 17, 2024
144554e
latest Examination Module
harshabonu Feb 17, 2024
db82cee
latest Examination Module (#1291)
harshabonu Feb 17, 2024
c2360b6
added apis for AC2 module and created backlog model
Divyanshu-iiitdmj Feb 18, 2024
c22fd4b
Added Sdk module for Approve/Forwd and Indent file, add/view stock, g…
aniket2003 Feb 18, 2024
bcd84d3
debugging and refactoring
sudheerdagar Feb 20, 2024
037f6bc
resolved invitation notifications error
nityatiwari002 Feb 20, 2024
b19aa2d
Merge pull request #1 from nityatiwari002/main
sudheerdagar Feb 20, 2024
6f24ede
added apply convocation functionality
nityatiwari002 Feb 20, 2024
99c0709
Merge branch 'sudheerdagar:main' into main
nityatiwari002 Feb 20, 2024
23b8062
latest examination module code
harshabonu Feb 20, 2024
3a13ee2
fixed profile redirection issue
sudheerdagar Feb 20, 2024
25000d4
Merge pull request #2 from nityatiwari002/main
sudheerdagar Feb 20, 2024
9d004eb
resolve errors and add apis
Daksh119 Feb 20, 2024
e6e9d2f
fixed profile redirection issues
sudheerdagar Feb 21, 2024
654496a
Merge branch 'main' of https://github.com/sudheerdagar/Fusion
sudheerdagar Feb 21, 2024
dfdc6b3
refactoring and other changes
sudheerdagar Feb 22, 2024
d65e0a1
ps1 changes
aniket2003 Feb 23, 2024
9e3b0fa
ps1 changes 1.0
aniket2003 Feb 23, 2024
89e0831
ps1 changes 20
aniket2003 Feb 23, 2024
263eadc
ps1 changes 3.0
aniket2003 Feb 23, 2024
5879abf
ps1 changes 3.0
aniket2003 Feb 23, 2024
b8ffd74
created functionalities for pre registration configuration , also cre…
Divyanshu-iiitdmj Mar 3, 2024
09387f0
removing postgres data files and migrations file
Divyanshu-iiitdmj Mar 3, 2024
d01b943
Remove ignored files from repository
Divyanshu-iiitdmj Mar 3, 2024
a57c078
removing postgres data files and migrations file
Divyanshu-iiitdmj Mar 3, 2024
13943ee
removing postgres data files
Divyanshu-iiitdmj Mar 3, 2024
c150d4a
functionality for faculty to view assigned course and generate roll list
Divyanshu-iiitdmj Mar 8, 2024
fe530a8
Wrong details displayed : course name in place of course code
Divyanshu-iiitdmj Mar 9, 2024
3d927fe
Removed migrations file
Divyanshu-iiitdmj Mar 10, 2024
a801ad5
Changed the gitignore file
Divyanshu-iiitdmj Mar 10, 2024
5f5b05f
Merge pull request #1319 from Divyanshusir/courseRegistration
ChaudharyRaman Mar 11, 2024
5b920d8
made some changes
aniket2003 Mar 12, 2024
01ef828
resolved routing error
nityatiwari002 Feb 22, 2024
7eec96a
Merge remote-tracking branch 'upstream/gad-5
sudheerdagar Mar 15, 2024
e1c716a
removed delete button
nityatiwari002 Mar 15, 2024
487c0f4
added sdk in inbox,outbox and some changes
aniket2003 Mar 16, 2024
1e02e5a
Merge remote-tracking branch 'upstream/main'
ThisisMS11 Mar 17, 2024
74352be
Merge remote-tracking branch 'upstream/gad-5'
ThisisMS11 Mar 17, 2024
c621a94
Latest Updated Commit on 10th march (#1320)
Harshan-Nayak Mar 17, 2024
601a9d2
Latest update on 18th march
harshabonu Mar 18, 2024
d0760f7
Added Dashboard Changes
ThisisMS11 Mar 17, 2024
83d1d94
Merge branch 'main' into main
sudheerdagar Mar 18, 2024
2ad8b76
Merge pull request #3 from nityatiwari002/main
sudheerdagar Mar 18, 2024
4549a6a
Merge branch 'main' of https://github.com/sudheerdagar/Fusion into ac-5
sudheerdagar Mar 18, 2024
ec7e7ee
AC-5 (spacs) : dashboard integration and invitations and applicati…
sudheerdagar Mar 18, 2024
6a9aff4
Ac-1 updated model.py (#1372)
Ravichendraa Mar 20, 2024
19c6283
Changes
21BCS035 Mar 20, 2024
4630d36
Merge branch 'gad-5' of https://github.com/FusionIIIT/Fusion into temp3
21BCS035 Mar 20, 2024
dc559cf
Gad-1 Updated dashboard (#1374)
21BCS035 Mar 20, 2024
68e43d4
Removed conflicts with ps-1 and remove migrations files
ThisisMS11 Mar 20, 2024
927d7ee
Updated PR AC2-Course registration after the changes and integration …
Divyanshusir Mar 20, 2024
a34ff3c
Improvised stockEntry Modals, StockView and StockEdit for updated req…
ThisisMS11 Mar 22, 2024
4ae33f1
Added StockITem and StockTransfer Table and improvised others views r…
ThisisMS11 Mar 25, 2024
871e979
added filters in stock view and added stock_transfer_view pages
ThisisMS11 Mar 29, 2024
ebb75c8
cpda, leave and appraisal form created.
21BCS035 Apr 6, 2024
43d1fa3
changes
21BCS035 Apr 7, 2024
b484b6f
small correction
21BCS035 Apr 7, 2024
670730e
GAD-1: CPDA form, Leave form and Appraisal form created (#1401)
21BCS035 Apr 7, 2024
1dd5124
Latest code on 8th april
harshabonu Apr 8, 2024
99a0645
add new apis
Daksh119 Apr 9, 2024
aed8561
ac-3 : resolve error, add api (#1299)
Daksh119 Apr 9, 2024
17a3fa3
changes
21BCS035 Apr 9, 2024
96b7929
Merge branch 'ac-7' into ac-7
harshabonu Apr 10, 2024
4956f20
updated functionalities on 10/4 (#1408)
harshabonu Apr 10, 2024
2721149
new changes
21BCS035 Apr 10, 2024
4785c7f
Added ps-1 API for Flutter APP
ThisisMS11 Apr 10, 2024
b74458b
changes in gitignore , bugs and issues fixed
Divyanshu-iiitdmj Apr 10, 2024
b903e74
first commit
21BCS035 Apr 10, 2024
da98099
first
21BCS035 Apr 10, 2024
2d92742
CPDA form ,leave form,Appraisal form created (#1418)
21BCS035 Apr 11, 2024
1217f45
corrected files
Divyanshu-iiitdmj Apr 11, 2024
2c266eb
before merging latest staging
Divyanshu-iiitdmj Apr 11, 2024
791bf35
Changes With migrations
ThisisMS11 Apr 11, 2024
18cd91d
solved issues after merge in latest_staging
Divyanshu-iiitdmj Apr 11, 2024
242eae0
updated migrations
Divyanshu-iiitdmj Apr 11, 2024
2328dc6
new changes
21BCS035 Apr 11, 2024
23e566f
changes
21BCS035 Apr 11, 2024
3f9e3c9
added migrations
ThisisMS11 Apr 12, 2024
38928de
completed_merge
ThisisMS11 Apr 12, 2024
68696f6
Updated Ac2 merged with staging (#1435)
Divyanshusir Apr 12, 2024
333f828
Improved UI and added some buttons
ThisisMS11 Apr 12, 2024
3259203
copied programme curriculum models from latest staging
Divyanshu-iiitdmj Apr 13, 2024
d82ec16
Added more apis for flutter app
ThisisMS11 Apr 13, 2024
9f8fc36
Merge branch 'FusionIIIT:main' into mohit_fusion_1
ThisisMS11 Apr 14, 2024
64e3636
Updated with new database
harshabonu Apr 14, 2024
8c6d429
new changes
harshabonu Apr 14, 2024
00aea7c
changes
harshabonu Apr 14, 2024
cc75c46
Completed merge
harshabonu Apr 14, 2024
dda706f
Updated Dashboard
harshabonu Apr 14, 2024
d379b18
Merge branch 'ac-7' into ac-7
harshabonu Apr 14, 2024
885f59a
Added more apis for flutter app
ThisisMS11 Apr 13, 2024
4bca813
resolved some issues
ThisisMS11 Apr 14, 2024
22dd7b1
solving conflict with cr
Divyanshu-iiitdmj Apr 14, 2024
f85e045
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion…
Divyanshu-iiitdmj Apr 14, 2024
55ec300
[AC-2] Cource registration merging to CR (#1445)
Divyanshusir Apr 14, 2024
bd6ca0d
Merge branch 'latest_staging' into cr
ChaudharyRaman Apr 14, 2024
b754b56
new functionality added
Ravichendraa Apr 14, 2024
2f982d4
changes
Ravichendraa Apr 14, 2024
55f5a9b
AC-1: Fts Added (#1458)
Ravichendraa Apr 14, 2024
5661abf
resolved some issues
ThisisMS11 Apr 14, 2024
c4fb508
Merge branch 'mohit_fusion_1' of https://github.com/ThisisMS11/Fusion…
ThisisMS11 Apr 15, 2024
64af913
removed conflicts with ps-1
ThisisMS11 Apr 15, 2024
2525a9d
add migration files,notifications and some minor changes
Daksh119 Apr 15, 2024
ae3686a
merge with latest_staging
Divyanshu-iiitdmj Apr 16, 2024
3914af0
added new notifications fucntionality
Divyanshu-iiitdmj Apr 16, 2024
81f6a44
added sidepanel file for notifications
Divyanshu-iiitdmj Apr 16, 2024
67c4534
merge upstream cr
Divyanshu-iiitdmj Apr 16, 2024
3289265
again merged with latest_staging
Divyanshu-iiitdmj Apr 16, 2024
77c04d3
extra line removed
Divyanshu-iiitdmj Apr 16, 2024
09e3692
fixed UI error
Daksh119 Apr 16, 2024
58689f0
changes
Ravichendraa Apr 16, 2024
9fd34c7
changes in models.py
Ravichendraa Apr 16, 2024
cba0fd8
changes in models.py
Ravichendraa Apr 16, 2024
7d6e81d
dashboard Acadadmin replaced with correct designation acadadmin
Divyanshu-iiitdmj Apr 17, 2024
dbf5380
Notification Added
Ravichendraa Apr 17, 2024
eddcfe8
Removed redundant designations selection pages and prevented admins t…
ThisisMS11 Apr 17, 2024
998764b
updates since faculty designation not in dropdown
Divyanshu-iiitdmj Apr 17, 2024
6fcea07
Merge pull request #1479 from FusionIIIT/latest_staging
ChaudharyRaman Apr 17, 2024
c927ee4
Completed merge
harshabonu Apr 17, 2024
20d98fb
Merge branch 'ac-7' of https://github.com/harshabonu/Fusion into ac-7
harshabonu Apr 17, 2024
039df0f
Merge remote-tracking branch 'upstream/cr' into cr2
Divyanshu-iiitdmj Apr 17, 2024
2d0f38b
Completed merge
harshabonu Apr 17, 2024
774ff13
deleted migration files
Daksh119 Apr 17, 2024
6e0c0ee
Merge branch 'ac-3' into ac-3
Daksh119 Apr 17, 2024
3a48486
new changes
21BCS035 Apr 17, 2024
237cdf5
Merge pull request #1476 from Divyanshusir/cr2
ChaudharyRaman Apr 17, 2024
05dee7c
Completed merge code
harshabonu Apr 17, 2024
da8041e
Merge pull request #1477 from Ravichendraa/new8ac1
prabhatsuman Apr 17, 2024
1105182
Merge AC-1 to AC-final
prajjwalkapoor Apr 17, 2024
be4b8b9
corrected dashboard and filetracking templates
prabhatsuman Apr 17, 2024
7962229
Merge pull request #1483 from FusionIIIT/cr
prabhatsuman Apr 17, 2024
29f6d2a
Notification issue resolved
prabhatsuman Apr 17, 2024
a8f8069
Merge pull request #1465 from Daksh119/ac-3
ChaudharyRaman Apr 17, 2024
f209784
Merge branch 'ac-final' of github.com:FusionIIIT/Fusion into ac-3
prabhatsuman Apr 17, 2024
0dae131
errors resolved
prabhatsuman Apr 17, 2024
bf3dc98
Merge pull request #1453 from harshabonu/ac-7
ChaudharyRaman Apr 17, 2024
b49e3a1
Merge branch 'ac-final' of github.com:FusionIIIT/Fusion into ac-7
prabhatsuman Apr 17, 2024
766f650
Merge branch 'ac-7' of github.com:FusionIIIT/Fusion into ac-7
prabhatsuman Apr 17, 2024
e048ffc
Merge pull request #1486 from FusionIIIT/ac-7
prabhatsuman Apr 17, 2024
33f7eba
dashboard affected by AC-7 corrected
prabhatsuman Apr 17, 2024
bb04551
Merge pull request #1487 from prabhatsuman/AC-final
prabhatsuman Apr 17, 2024
7ebf534
added __init__.py and updated 0000_initial.py for AC-7
prabhatsuman Apr 18, 2024
7466500
Merge pull request #1490 from prabhatsuman/ac-final
prabhatsuman Apr 18, 2024
cc938f4
removed grade ,disallowed dept_admins to create files and ui changes
ThisisMS11 Apr 18, 2024
aca3ec0
pull changes from ps-1
ThisisMS11 Apr 18, 2024
48a9887
minor designation change
Daksh119 Apr 18, 2024
65e47f2
minor designation change
Daksh119 Apr 18, 2024
9d521cc
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion…
ThisisMS11 Apr 18, 2024
9cca132
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion…
ThisisMS11 Apr 18, 2024
fa45bde
Merge branch 'mohit_fusion_1' of https://github.com/ThisisMS11/Fusion…
ThisisMS11 Apr 18, 2024
c0c98f1
Merge branch 'mohit_fusion_1' of https://github.com/ThisisMS11/Fusion…
ThisisMS11 Apr 18, 2024
ef14147
Merge branch 'mohit_fusion_1' of https://github.com/ThisisMS11/Fusion…
ThisisMS11 Apr 19, 2024
0cfd743
Merge pull request #1493 from Daksh119/ac-3-f
ChaudharyRaman Apr 19, 2024
da3082a
fix errors related to grades for examination module
Daksh119 Apr 19, 2024
e99572e
changes
21BCS035 Apr 19, 2024
6eeb838
merged latest_staging
21BCS035 Apr 19, 2024
257b5bb
roll_no fixed
Daksh119 Apr 19, 2024
bfbb967
added next sem registration courses
sdeepanshu17 Apr 19, 2024
e78b2f6
fixed convocation flag errors updated recent invite Ui
sudheerdagar Apr 19, 2024
1807e62
Merge pull request #1488 from ThisisMS11/mohit_fusion_1
prajjwalkapoor Apr 20, 2024
eabf67e
fixed previous winners data duplications
sudheerdagar Apr 20, 2024
839f35b
fixed update issues with convocation medals
sudheerdagar Apr 20, 2024
f93a37f
refactoring
sudheerdagar Apr 20, 2024
10ff292
Merge pull request #1499 from 21BCS035/temp8
prajjwalkapoor Apr 20, 2024
0ea8a42
Merge branch 'ac-5' into ac-5
sudheerdagar Apr 20, 2024
20fa092
corrected the code in file tracking , taking refernce from latest sta…
anudeeps0306 Apr 20, 2024
9aebad0
Merge pull request #1503 from anudeeps0306/gad-1
prajjwalkapoor Apr 20, 2024
cbfbfbc
final changes and refactoring
sudheerdagar Apr 20, 2024
85f5d36
modified get_mcm_flags functionalities
sudheerdagar Apr 20, 2024
c86d036
Merge pull request #1495 from Daksh119/ac-3-f
prabhatsuman Apr 20, 2024
c59c836
Update common.py
prabhatsuman Apr 20, 2024
38d3dce
Merge pull request #1502 from sudheerdagar/ac-5
prabhatsuman Apr 20, 2024
dbdd3bc
added required apis for ac-2 module
Bhavik-ag Apr 20, 2024
55d42ae
Merge branch 'ac-3' of github.com:FusionIIIT/Fusion into ac3-final
prabhatsuman Apr 20, 2024
1f12194
Merge branch 'latest_staging' into ac-5
itsspriyansh Apr 20, 2024
7c6b6e7
added version field in urls and fixed course fetching errors
Daksh119 Apr 21, 2024
da3d306
Deleted migrations file
anudeeps0306 Apr 21, 2024
403cff6
Merge pull request #1505 from FusionIIIT/ac-5
itsspriyansh Apr 21, 2024
348f350
Merge pull request #1509 from Daksh119/ac-3-final
prabhatsuman Apr 21, 2024
22ae8c0
acad procedure error corrected
prabhatsuman Apr 21, 2024
e71308f
Merge pull request #1512 from FusionIIIT/ac-3-final
prabhatsuman Apr 21, 2024
6f6c539
Merge pull request #1507 from FusionIIIT/ps-1
VarunGitGood Apr 21, 2024
e2d651a
Merge pull request #1504 from Bhavik-ag/ac2-apis
prabhatsuman Apr 21, 2024
3fa5f68
views for api
Arpan243 Apr 21, 2024
d5c54cc
serializers for api
Arpan243 Apr 21, 2024
a8d0f1a
api
Arpan243 Apr 21, 2024
4a13d60
Merge pull request #1516 from Arpan243/ac-final
prabhatsuman Apr 21, 2024
f97eb7b
Merge pull request #1489 from FusionIIIT/ac-final
prabhatsuman Apr 22, 2024
28c4c1c
Merge pull request #1508 from anudeeps0306/gad-1
prajjwalkapoor Apr 22, 2024
c78f1ed
Merge pull request #1506 from FusionIIIT/gad-1
prajjwalkapoor Apr 22, 2024
8b54426
Globals api error corrected
prabhatsuman Apr 22, 2024
101b798
deleted .sql
prabhatsuman Apr 22, 2024
308f901
Merge pull request #1524 from prabhatsuman/latest_staging
prabhatsuman Apr 22, 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
Prev Previous commit
Next Next commit
Merge branch 'main' into ac-5
akshatnema committed Mar 18, 2023
commit e3b685c8267beb13c5d96ffdbb05afc4b8d76d2c

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.