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

Merge 'latest_staging' branch with ac-6 #1578

Merged
merged 21 commits into from
Apr 26, 2024
Merged

Merge 'latest_staging' branch with ac-6 #1578

merged 21 commits into from
Apr 26, 2024

Conversation

rush1kesh-010
Copy link

Proposed changes

Merges latest_staging branch with ac-6 and prepares it for deployment

Brief description of what is fixed or changed

Merge conflicts have been resolved
Branch is up to date with latest 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.

rush1kesh-010 and others added 21 commits February 20, 2024 05:00
@rush1kesh-010
feat: enable dashboard department button, optimize code
c457bd4
@aryan0723
ac-6 : week-5: create api (FusionIIIT#1294)
6534802 
* feat: create api

* feat:create more routes
@rush1kesh-010
feat: enable dashboard department button, optimize code (FusionIIIT#1297
865ec00 
)
@prajjwalkapoor
Revert "ac-6 : week-5 : enable button, optimize code" (FusionIIIT#1308)
48e5d98 
This reverts commit 865ec00.
@rush1kesh-010 @aryan0723 @prajjwalkapoor
ac-6 : week-5 : enable notification, fix docker issues (FusionIIIT#1309)
e97983b 
* feat: enable dashboard department button, optimize code

* ac-6 : week-5: create api (FusionIIIT#1294)

* feat: create api

* feat:create more routes

* feat : enable notification, fix docker issues

---------

Co-authored-by: Aryan Shrivastava <[email protected]>
Co-authored-by: Prajjwal kapoor <[email protected]>
@rush1kesh-010
feat: add staff view, complete faculty view and add alumni details
4ba53fd
@rush1kesh-010
Merge branch 'ac-6' into ac-6
eb6650b
@aryan0723 @rush1kesh-010
ac-6 : week-5: create api (FusionIIIT#1294)
c0b7894 
* feat: create api

* feat:create more routes
@rush1kesh-010
feat : enable notification, fix docker issues
5629499
@prajjwalkapoor
Merge branch 'ac-6' into ac-6
1ff7c39
@VarunGitGood
Merge pull request FusionIIIT#1311 from rush1kesh-010/ac-6
ffa78d4 
ac-6 : week-5 : add staff view, complete faculty view, add alumni details
@prajjwalkapoor
chore: remove sql backup
c629c95
@aryan0723
Ac 6 (FusionIIIT#1443)
2507698 
* feat: create api

* feat:create more routes

* add all views

* feat update ui and department info

* removed unwanted migration files and updated docker-compose.yml and docker-entrypoint.sh

* removed unwanted file
@SukulSarve
Enable a module (FusionIIIT#1470)
f6e4f33
@yatharthagoenka @Mojo-03
Enabled all modules for access (FusionIIIT#1120)
301808f
@Lawful2002 @Anunaya07
@Aksh-Bansal-dev @Mojo-03
GAD-5: Fix responsiveness (FusionIIIT#1125)
85a7331 
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
@Mojo-03
integrated dashboard
e259551
@Mojo-03
feat: Improve UI, add update department info
1b928ad
@Mojo-03
updated department information dynamically and changeed ui layout
4a0b5ae
@prajjwalkapoor
Merge pull request FusionIIIT#1554 from Mojo-03/ac-6
ca70322 
AC-6: updated department_information table , integrated dashboard
@rush1kesh-010
Merge 'latest staging' with ac-6
ea51cfe
@rush1kesh-010 rush1kesh-010 changed the base branch from ac-6 to latest_staging April 26, 2024 08:45
@prabhatsuman prabhatsuman changed the base branch from latest_staging to ac-6 April 26, 2024 16:43
@prabhatsuman prabhatsuman merged commit 239d68b into FusionIIIT:ac-6 Apr 26, 2024
1 check passed
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.
9 participants
@rush1kesh-010 @prabhatsuman @aryan0723 @prajjwalkapoor @VarunGitGood @SukulSarve @yatharthagoenka @Lawful2002 @Mojo-03