Skip to content

Os 3 #1368

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 19 commits into from
Apr 8, 2024
Merged

Os 3 #1368

merged 19 commits into from
Apr 8, 2024

Conversation

@prajjwalkapoor
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

abhinav520 and others added 18 commits February 14, 2023 13:09
@abhinav520
os-3 : Fix UI divider of library module (#1096)
a008c2b
@akshatnema
Merge branch 'test-temp' into os-3
0bfff5a
@akshatnema
Merge branch 'main' into os-3
c7c0e72
@Aksh-Bansal-dev @akshatnema
add db migration files (#1153)
4c10b59
@akshatnema
Merge branch 'main' into os-3
da88225
@akshatnema
Merge branch 'main' into os-3
d157e71
@akshatnema
Merge branch 'main' into os-3
cc2bfd8
@akshatnema
Merge branch 'main' into os-3
162b13b
@kishankoushal
Added api endpoints for notifications
a8fe99b
@kishankoushal
resolved error in sending notification for announcements
a1ebc28
@kishankoushal
updated alerts.html and alert1.html for implementing delete notification
702c197
@ChaudharyRaman
Merge pull request #1296 from kishankoushal/main
7bbb10c 
Notifications
@kishankoushal @Lawful2002
@Anunaya07 @Aksh-Bansal-dev @akshatnema @hardiksharma11 @ChaudharyRaman @BlackHAWK2001 @Arpittak @anudeeps0306 @SukulSarve
Notifications module(OS-3)_updated dashboard (#1340)
b54f999 
* GAD-5: Fix responsiveness (#1125)

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

* updated alerts.html and alert1.html for implementing delete notification

* Added pylint  (#1302)

* Create bandit_security_test.yml

Added Bandit security test for python

* Update bandit_security_test.yml

* Update bandit_security_test.yml

* Create pylint.yml

* Update pylint.yml

* Update pylint.yml

* Revert "Added pylint  (#1302)" (#1324)

This reverts commit c1359b7.

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

* changes in programme_cuuriculam,adding version to models (#1330)

* made few changes for delete notification

* created sidebar for notifications

* Fixing ui bugs (#1335)

* updated dashboard

* updated dashboard

* updated dashboard

---------

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: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: SukulSarve <[email protected]>
@kishankoushal @Lawful2002
@Anunaya07 @Aksh-Bansal-dev @akshatnema @hardiksharma11 @ChaudharyRaman @BlackHAWK2001 @Arpittak @anudeeps0306 @SukulSarve
Notification_OS_3 (#1366)
14df71f 
* GAD-5: Fix responsiveness (#1125)

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

* updated alerts.html and alert1.html for implementing delete notification

* Added pylint  (#1302)

* Create bandit_security_test.yml

Added Bandit security test for python

* Update bandit_security_test.yml

* Update bandit_security_test.yml

* Create pylint.yml

* Update pylint.yml

* Update pylint.yml

* Revert "Added pylint  (#1302)" (#1324)

This reverts commit c1359b7.

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

* changes in programme_cuuriculam,adding version to models (#1330)

* made few changes for delete notification

* created sidebar for notifications

* Fixing ui bugs (#1335)

* updated dashboard

* updated dashboard

* updated dashboard

---------

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: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: SukulSarve <[email protected]>
@prajjwalkapoor
Merge branch 'staging' into os-3
c2e3884
@kishankoushal @Lawful2002
@Anunaya07 @Aksh-Bansal-dev @akshatnema @BlackHAWK2001 @Arpittak @SukulSarve
Change made in models.py in programme_curriculum (#1380)
ec73676 
* GAD-5: Fix responsiveness (#1125)

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

* updated alerts.html and alert1.html for implementing delete notification

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

* made few changes for delete notification

* created sidebar for notifications

* Fixing ui bugs (#1335)

* updated dashboard

* updated dashboard

* updated dashboard

* updated models.py in programmes and curriculum

---------

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]>
@kishankoushal @Lawful2002
@Anunaya07 @Aksh-Bansal-dev @akshatnema @BlackHAWK2001 @Arpittak @SukulSarve @abhi87374
os_3_21 (#1386)
b4be942 
* GAD-5: Fix responsiveness (#1125)

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

* updated alerts.html and alert1.html for implementing delete notification

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

* made few changes for delete notification

* created sidebar for notifications

* Fixing ui bugs (#1335)

* updated dashboard

* updated dashboard

* updated dashboard

---------

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]>
Co-authored-by: Abhikumar Gupta <[email protected]>
@kishankoushal @Lawful2002
@Anunaya07 @Aksh-Bansal-dev @akshatnema @BlackHAWK2001 @Arpittak @SukulSarve
os_3_check (#1387)
079286a 
* GAD-5: Fix responsiveness (#1125)

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

* updated alerts.html and alert1.html for implementing delete notification

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

* made few changes for delete notification

* created sidebar for notifications

* Fixing ui bugs (#1335)

* updated dashboard

* updated dashboard

* updated dashboard

---------

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]>
@abhi87374 abhi87374 closed this Mar 22, 2024
@abhi87374 abhi87374 reopened this Apr 8, 2024
@abhi87374 abhi87374 merged commit ebee719 into staging Apr 8, 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.

7 participants

@prajjwalkapoor @abhi87374 @abhinav520 @akshatnema @Aksh-Bansal-dev @kishankoushal @ChaudharyRaman