dynamic issued_items details#24
Closed
avinashpvas wants to merge 9 commits intoFusionIIIT:masterfrom
avinashpvas:master
Closed
dynamic issued_items details#24avinashpvas wants to merge 9 commits intoFusionIIIT:masterfrom avinashpvas:master
avinashpvas wants to merge 9 commits intoFusionIIIT:masterfrom
avinashpvas:master
Conversation
Contributor
|
Please solve the conflict before sending Pull Request |
Contributor
|
there are still many conflict please solve it |
Author
|
We made another pull request so ignore it
…On Sat, 16 Feb 2019, 4:19 pm sksingh55 ***@***.*** wrote:
there are still many conflict please solve it
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#24 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/Adg5qTaz8sipK3pJVYRYWaTz3wtTm5ZUks5vN-JHgaJpZM4a0cRf>
.
|
sksingh55
pushed a commit
that referenced
this pull request
Jan 23, 2020
Fix mess_warden in Mess Module
prajjwalkapoor
pushed a commit
that referenced
this pull request
Apr 10, 2024
* GAD-5: Fix responsiveness (#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * feat: new use case implementation and fixes in existing APIs * refactored: new club registration form only availablt to designated peoples (#2) * removed conflicts from approve request from dean * refactored: minor changes * removed conflicts from approve request from dean (#4) * change co and coco api working * Error fix:Change co and coco api now working (#5) * removed conflicts from approve request from dean * change co and coco api working * Update serializers.py * Update views.py * Update urls.py * New feature: new club approval form fixed (#6) * use cases init * club approoval request to dean working * fixed: removed conflicts (#7) * use cases init * club approoval request to dean working * removed conflicts * date foreign key issue resolved * fixed: new club joinee request approval and rejection * fix: multiple votes issue resolved * corrected: club budget sent to dean * corrected: club budget sent to dean * Delete requirements1.txt * fix: packages file edited * view club budget added * updated migrations error * segregated use cases based on actors * fixed gymkhana sidebar buttons according to roles * fixed: type in designations * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * fic navigation added * removed migrations * local migrations removed * Fixing ui bugs (#1335) * all migration files removed * chore: merged with main * chore: added migrations to gitignore * Sa 3 (#24) * club budget updates * fix: member approval, removed FTS overhead, co/coo assignment on club creation, club budget * chore: removed migrations from .gitignore --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Puliuvarthi.Mahesh <134507390+MaheshPulivarthi18@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <109756367+shokushwaha@users.noreply.github.com> Co-authored-by: RishabhSharma96 <114917946+RishabhSharma96@users.noreply.github.com> Co-authored-by: Anushri Thakre <121868449+ast008@users.noreply.github.com> Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <shobhitkushwaha1406@gmail.com> Co-authored-by: Rohit Raj <singh.rohitraj122@gmail.com> Co-authored-by: RohanParmar2002 <rohanparmar143256@gmail.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
VarunGitGood
pushed a commit
that referenced
this pull request
Apr 10, 2024
* GAD-5: Fix responsiveness (#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * feat: new use case implementation and fixes in existing APIs * refactored: new club registration form only availablt to designated peoples (#2) * removed conflicts from approve request from dean * refactored: minor changes * removed conflicts from approve request from dean (#4) * change co and coco api working * Error fix:Change co and coco api now working (#5) * removed conflicts from approve request from dean * change co and coco api working * Update serializers.py * Update views.py * Update urls.py * New feature: new club approval form fixed (#6) * use cases init * club approoval request to dean working * fixed: removed conflicts (#7) * use cases init * club approoval request to dean working * removed conflicts * date foreign key issue resolved * fixed: new club joinee request approval and rejection * fix: multiple votes issue resolved * corrected: club budget sent to dean * corrected: club budget sent to dean * Delete requirements1.txt * fix: packages file edited * view club budget added * updated migrations error * segregated use cases based on actors * fixed gymkhana sidebar buttons according to roles * fixed: type in designations * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * fic navigation added * removed migrations * local migrations removed * Fixing ui bugs (#1335) * all migration files removed * chore: merged with main * chore: added migrations to gitignore * Sa 3 (#24) * club budget updates * fix: member approval, removed FTS overhead, co/coo assignment on club creation, club budget * chore: removed migrations from .gitignore * chore: added migrations --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Puliuvarthi.Mahesh <134507390+MaheshPulivarthi18@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <109756367+shokushwaha@users.noreply.github.com> Co-authored-by: RishabhSharma96 <114917946+RishabhSharma96@users.noreply.github.com> Co-authored-by: Anushri Thakre <121868449+ast008@users.noreply.github.com> Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <shobhitkushwaha1406@gmail.com> Co-authored-by: Rohit Raj <singh.rohitraj122@gmail.com> Co-authored-by: RohanParmar2002 <rohanparmar143256@gmail.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
ChaudharyRaman
pushed a commit
that referenced
this pull request
Apr 11, 2024
* GAD-5: Fix responsiveness (#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * feat: new use case implementation and fixes in existing APIs * refactored: new club registration form only availablt to designated peoples (#2) * removed conflicts from approve request from dean * refactored: minor changes * removed conflicts from approve request from dean (#4) * change co and coco api working * Error fix:Change co and coco api now working (#5) * removed conflicts from approve request from dean * change co and coco api working * Update serializers.py * Update views.py * Update urls.py * New feature: new club approval form fixed (#6) * use cases init * club approoval request to dean working * fixed: removed conflicts (#7) * use cases init * club approoval request to dean working * removed conflicts * date foreign key issue resolved * fixed: new club joinee request approval and rejection * fix: multiple votes issue resolved * corrected: club budget sent to dean * corrected: club budget sent to dean * Delete requirements1.txt * fix: packages file edited * view club budget added * updated migrations error * segregated use cases based on actors * fixed gymkhana sidebar buttons according to roles * fixed: type in designations * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * fic navigation added * removed migrations * local migrations removed * Fixing ui bugs (#1335) * all migration files removed * chore: merged with main * chore: added migrations to gitignore * Sa 3 (#24) * club budget updates * fix: member approval, removed FTS overhead, co/coo assignment on club creation, club budget * chore: removed migrations from .gitignore * chore: added migrations * chore: removed .sql file --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Puliuvarthi.Mahesh <134507390+MaheshPulivarthi18@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <109756367+shokushwaha@users.noreply.github.com> Co-authored-by: RishabhSharma96 <114917946+RishabhSharma96@users.noreply.github.com> Co-authored-by: Anushri Thakre <121868449+ast008@users.noreply.github.com> Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <shobhitkushwaha1406@gmail.com> Co-authored-by: Rohit Raj <singh.rohitraj122@gmail.com> Co-authored-by: RohanParmar2002 <rohanparmar143256@gmail.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
ChaudharyRaman
pushed a commit
that referenced
this pull request
Apr 22, 2024
* GAD-5: Fix responsiveness (#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * feat: new use case implementation and fixes in existing APIs * refactored: new club registration form only availablt to designated peoples (#2) * removed conflicts from approve request from dean * refactored: minor changes * removed conflicts from approve request from dean (#4) * change co and coco api working * Error fix:Change co and coco api now working (#5) * removed conflicts from approve request from dean * change co and coco api working * Update serializers.py * Update views.py * Update urls.py * New feature: new club approval form fixed (#6) * use cases init * club approoval request to dean working * fixed: removed conflicts (#7) * use cases init * club approoval request to dean working * removed conflicts * date foreign key issue resolved * fixed: new club joinee request approval and rejection * fix: multiple votes issue resolved * corrected: club budget sent to dean * corrected: club budget sent to dean * Delete requirements1.txt * fix: packages file edited * view club budget added * updated migrations error * segregated use cases based on actors * fixed gymkhana sidebar buttons according to roles * fixed: type in designations * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * fic navigation added * removed migrations * local migrations removed * Fixing ui bugs (#1335) * all migration files removed * chore: merged with main * chore: added migrations to gitignore * Sa 3 (#24) * club budget updates * fix: member approval, removed FTS overhead, co/coo assignment on club creation, club budget * chore: removed migrations from .gitignore * chore: added migrations --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Puliuvarthi.Mahesh <134507390+MaheshPulivarthi18@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <109756367+shokushwaha@users.noreply.github.com> Co-authored-by: RishabhSharma96 <114917946+RishabhSharma96@users.noreply.github.com> Co-authored-by: Anushri Thakre <121868449+ast008@users.noreply.github.com> Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <shobhitkushwaha1406@gmail.com> Co-authored-by: Rohit Raj <singh.rohitraj122@gmail.com> Co-authored-by: RohanParmar2002 <rohanparmar143256@gmail.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
ChaudharyRaman
pushed a commit
that referenced
this pull request
Apr 22, 2024
* GAD-5: Fix responsiveness (#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * feat: new use case implementation and fixes in existing APIs * refactored: new club registration form only availablt to designated peoples (#2) * removed conflicts from approve request from dean * refactored: minor changes * removed conflicts from approve request from dean (#4) * change co and coco api working * Error fix:Change co and coco api now working (#5) * removed conflicts from approve request from dean * change co and coco api working * Update serializers.py * Update views.py * Update urls.py * New feature: new club approval form fixed (#6) * use cases init * club approoval request to dean working * fixed: removed conflicts (#7) * use cases init * club approoval request to dean working * removed conflicts * date foreign key issue resolved * fixed: new club joinee request approval and rejection * fix: multiple votes issue resolved * corrected: club budget sent to dean * corrected: club budget sent to dean * Delete requirements1.txt * fix: packages file edited * view club budget added * updated migrations error * segregated use cases based on actors * fixed gymkhana sidebar buttons according to roles * fixed: type in designations * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * fic navigation added * removed migrations * local migrations removed * Fixing ui bugs (#1335) * all migration files removed * chore: merged with main * chore: added migrations to gitignore * Sa 3 (#24) * club budget updates * fix: member approval, removed FTS overhead, co/coo assignment on club creation, club budget * chore: removed migrations from .gitignore * chore: added migrations * chore: removed .sql file --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Puliuvarthi.Mahesh <134507390+MaheshPulivarthi18@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <109756367+shokushwaha@users.noreply.github.com> Co-authored-by: RishabhSharma96 <114917946+RishabhSharma96@users.noreply.github.com> Co-authored-by: Anushri Thakre <121868449+ast008@users.noreply.github.com> Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Shobhit Kushwaha <shobhitkushwaha1406@gmail.com> Co-authored-by: Rohit Raj <singh.rohitraj122@gmail.com> Co-authored-by: RohanParmar2002 <rohanparmar143256@gmail.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.