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

2024-01-26 배포 #1391

Merged
merged 113 commits into from
Jan 26, 2025
Merged

2024-01-26 배포 #1391

merged 113 commits into from
Jan 26, 2025

Conversation

Engineer-JJHaMa
Copy link
Contributor

요약 *

신규 기능은 다음과 같습니다.

  • 지원금 신청 작성 기능: 동아리 대표자들은 지원금 신청 기간에 지원금 신청서를 작성/조회할 수 있습니다.
  • 활동보고서 승인 후 반려 가능: 승인한 활동에 대해 다시 반려할 수 있습니다.
    버그 수정은 다음과 같습니다.
  • 활동보고서 승인시 최종검토자가 적용되지 않는 오류: 이제부터 단일 활동 승인시 최종검토자가 해당 집행부원으로 변경됩니다. 이미 승인한 활동보고서의 경우 반려 후 재승인시 최종 검토자를 변경할 수 있습니다.
    It closes #issue_number

스크린샷

이후 Task *

  • 없음

jooyeongmee and others added 30 commits January 14, 2025 19:20
@jooyeongmee
feat: connect apiFnd002
5fda240
@jooyeongmee
feat: connect apiFnd004
42b8c78
@jooyeongmee
Merge branch 'dev' of https://github.com/academic-relations/ar-002-clubs
ad96238 
 into 1331-connect-apifnd002-apifnd004
@jooyeongmee
fix: fix build error
58d8534
@jinhyeonkwon
feat: easteregg
4c5528d
@jinhyeonkwon
feat: show easteregg on club list and club details page
1662dab
@jooyeongmee
fix: fix funding clubSuppliesSoftwareEvidence field issue
b47953b
@jooyeongmee
feat: add getKSTDate in utils
69686d6
@wjeongchoi
feat: impl scrolling text
04a3c2d
@wjeongchoi
fix: fix club name ellipsis
2851d34
@wjeongchoi
chore: add comment
1d60556
@pbc1017
feat: implement funding comments feature with repository and service …
cb62221 
…integration
@pbc1017
feat: add fetchActivitySummaries method to ActivityRepository and Act…
0991f2b 
…ivityPublicService
@pbc1017
feat: implement funding update and related records management in Fund…
c3953ae 
…ingRepository
@pbc1017
feat: enhance FundingRepository with additional fields
d62b488
@pbc1017
refactor: streamline activity fetching in FundingService by replacing…
b87abc2 
… individual activity name retrieval
@pbc1017
feat: enhance FundingService and UserPublicService with student summa…
5bc8675 
…ry fetching
@Engineer-JJHaMa
fix: act-024 finalReviewedExecutive error
08d543b
@Engineer-JJHaMa
Merge pull request #1356 from academic-relations/act-024-finalReviewe…
abef8de 
…dExecutive-error

Act-024 finalReviewedExecutive error
@Engineer-JJHaMa
feat: add hama's 24w credit
1460c35
@Engineer-JJHaMa
Merge pull request #1357 from academic-relations/hama-24w-credit
7656ccd 
Add hama's 24w credit
@pbc1017
Merge pull request #1355 from academic-relations/1351-fix-bug-in-add-…
cbacffd 
…funding-and-get-funding-summary

1351 fix bug in add funding and get funding summary
@Gerbera3090
feat: api interface for fnd 007,8
5af74cd
@Gerbera3090
feat: api fnd 007
da96e57
@Gerbera3090
feat: api fnd 008
e1dcb7f
@Gerbera3090
fix: change activity list only availables
68b8555
@Gerbera3090
fix: add enum
06cedd7 
colors
@wjeongchoi
fix: fix build error in frontend
fe425be
@jooyeongmee
Merge branch 'dev' of https://github.com/academic-relations/ar-002-clubs
a5333a1 
 into 1331-connect-apifnd002-apifnd004
@wjeongchoi
Merge pull request #1354 from academic-relations/1352-fix-club-name-w…
1c8bb50 
…idth-with-club-card

fix club name width with club card
jooyeongmee and others added 27 commits January 25, 2025 04:30
@jooyeongmee
feat: connect apiAct021 to funding
0e19465
@jooyeongmee
fix: build error
817a5f7
@pbc1017
fix: handle optional purposeActivity in funding order insertion
59eaa6c
@jooyeongmee
feat: connect apiAct022
17c6b1d
@jooyeongmee
Merge branch 'dev' of https://github.com/academic-relations/ar-002-clubs
28e7d1a 
 into 1383-connect-purpose-activity-api-to-funding
@jooyeongmee
fix: isActivityReportUnverifiable logic
f14e31e
@jooyeongmee
fix: update funding AddEvidenceFrame
47e4352
@pbc1017
refactor: update activity summary type and response handling
c313caa
@Gerbera3090
Merge pull request #1387 from academic-relations/1386-fix-api-act-028
54d751a 
refactor: update activity summary type and response handling
@jinhyeonkwon
refactor: useEasteregg
10107d9
@jinhyeonkwon
Merge pull request #1346 from academic-relations/1345-feat-add-easter…
8f754bf 
…-egg-on-main-page

feat: easteregg
@jooyeongmee
fix: update funding edit page initial data
b024c73
@jooyeongmee
fix: add funding section in manage club page
113eab2
@Engineer-JJHaMa
fix: change new Date to KSTDate
c10f79d
@jooyeongmee
fix: update new funding list table to sort by fundingStatusEnum
bd41753
@jooyeongmee
fix: update funding and activity report info text parameters
d495b2c
@jooyeongmee
Merge branch 'dev' of https://github.com/academic-relations/ar-002-clubs
a9ee3aa 
 into 1383-connect-purpose-activity-api-to-funding
@jooyeongmee
fix: update FromController required error message
f5c2a61
@jooyeongmee
Merge pull request #1381 from academic-relations/1380-connect-apifnd005
96f4bd5 
feat: connect apiFnd005
@jooyeongmee
Merge branch 'dev' of https://github.com/academic-relations/ar-002-clubs
19407c0 
 into 1383-connect-purpose-activity-api-to-funding
@jooyeongmee
fix: update hooks to return just data
68a8bb1
@jooyeongmee
feat: add funding NO_ACTIVITY_REPORT_FUNDING and FUNDING_TABLE_NO_ACT…
3c8c38f 
…IVITY_NAME constant
@jooyeongmee
Merge pull request #1384 from academic-relations/1383-connect-purpose…
3423d75 
…-activity-api-to-funding

지원금 페이지에 지출 목적 api 연결
@jooyeongmee
fix: update frontend getKSTDate logic
787e601
@jooyeongmee
chore: fix typo
8018024
@jooyeongmee
fix: create new Date instance inside getKSTDate
cd03d3a
@jooyeongmee
Merge pull request #1390 from academic-relations/fix-front-getkstdate…
0fcb352 
…-function

update frontend getKSTDate logic
@Engineer-JJHaMa Engineer-JJHaMa added the release 데모(demo.clubs.sparcs.org) 배포시 포함합니다. label Jan 26, 2025
@Engineer-JJHaMa Engineer-JJHaMa self-assigned this Jan 26, 2025
@Engineer-JJHaMa Engineer-JJHaMa merged commit 042cd46 into main Jan 26, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Engineer-JJHaMa Engineer-JJHaMa

Labels
release 데모(demo.clubs.sparcs.org) 배포시 포함합니다.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Engineer-JJHaMa @jooyeongmee @jinhyeonkwon @wjeongchoi @pbc1017 @Gerbera3090