Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
391f14a
최종 merge
dolimpan Feb 1, 2025
c6d3baa
SignUp
triangle-park Feb 2, 2025
1f5419d
0202
younmo Feb 2, 2025
b9592ea
SignUp
triangle-park Feb 2, 2025
2b94cfc
Merge branch 'dev' of https://github.com/UMC-MSMG/Frontend into dev
younmo Feb 2, 2025
47e9eda
check
dolimpan Feb 2, 2025
212ffa2
회원가입 수정
triangle-park Feb 3, 2025
00b365a
회원가입 수정
triangle-park Feb 3, 2025
f0ba9d5
회원가입 수정
triangle-park Feb 3, 2025
966c8ba
회원가입 수정
triangle-park Feb 4, 2025
02399f0
병합 충돌 해결: dev 브랜치 병합
triangle-park Feb 5, 2025
27ce626
fix: Merge conflicts resolution for IDE config files
triangle-park Feb 5, 2025
431c235
SignUp 문제 해결
triangle-park Feb 5, 2025
7f4bd41
뒤로가기 버튼
triangle-park Feb 5, 2025
271ffcf
기본 splash 수정
triangle-park Feb 5, 2025
9660218
call widget
triangle-park Feb 5, 2025
81cab14
composite widget
triangle-park Feb 5, 2025
57f3ed7
CompositeWidget UI 수정
triangle-park Feb 6, 2025
d829d20
약관동의 페이지 ui
triangle-park Feb 6, 2025
da8130e
약관동의 수정
triangle-park Feb 6, 2025
b68f8f2
Update .gitignore
younmo Feb 6, 2025
9749c85
약복용 레이아웃
triangle-park Feb 7, 2025
c483a35
BMI 추가
triangle-park Feb 8, 2025
fad2331
call 위젯 수정
triangle-park Feb 8, 2025
3b468d8
merge
dolimpan Feb 9, 2025
f88a359
.
triangle-park Feb 16, 2025
8141518
Merge remote-tracking branch 'origin/dev' into dev
triangle-park Feb 16, 2025
e2e5eb6
영상/count/set
triangle-park Feb 16, 2025
bcc76f0
SplashTheme 생성
triangle-park Feb 17, 2025
6854272
비디오뷰 수정
triangle-park Feb 17, 2025
aa8df29
비디오 업데이트
triangle-park Feb 17, 2025
68a7dc8
workout 프래그먼트 연결 수정
triangle-park Feb 18, 2025
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
Binary file added .DS_Store
Binary file not shown.
Binary file added .gitignore
Binary file not shown.
Binary file added .gradle/8.7/checksums/checksums.lock
Binary file not shown.
Binary file added .gradle/8.7/checksums/md5-checksums.bin
Binary file not shown.
Binary file added .gradle/8.7/checksums/sha1-checksums.bin
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Empty file.
Binary file added .gradle/8.7/executionHistory/executionHistory.bin
Binary file not shown.
Binary file added .gradle/8.7/executionHistory/executionHistory.lock
Binary file not shown.
Binary file added .gradle/8.7/fileChanges/last-build.bin
Binary file not shown.
Binary file added .gradle/8.7/fileHashes/fileHashes.bin
Binary file not shown.
Binary file added .gradle/8.7/fileHashes/fileHashes.lock
Binary file not shown.
Binary file added .gradle/8.7/fileHashes/resourceHashesCache.bin
Binary file not shown.
Empty file added .gradle/8.7/gc.properties
Empty file.
Binary file added .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 2 additions & 0 deletions .gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Sun Feb 02 10:20:12 KST 2025
gradle.version=8.7
Binary file added .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
2 changes: 2 additions & 0 deletions .gradle/config.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Sun Feb 02 10:21:19 KST 2025
java.home=C\:\\Program Files\\Android\\Android Studio\\jbr
Binary file added .gradle/file-system.probe
Binary file not shown.
Empty file added .gradle/vcs-1/gc.properties
Empty file.
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

316 changes: 316 additions & 0 deletions .idea/assetWizardSettings.xml

Large diffs are not rendered by default.

450 changes: 450 additions & 0 deletions .idea/caches/deviceStreaming.xml

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading