klaus/sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: klaus:test
Branches Tags
klaus:test klaus:main
...
compare: klaus:8ad13c289e1afa45e866a1275130aadc1016c91d
Branches Tags
klaus:main klaus:test

308 Commits
test ... 8ad13c289e

Author SHA1 Message Date
klaus
8ad13c289e Merge pull request '회원탈퇴' (#308) from test into main 
Reviewed-on: #308
 2025-04-15 10:42:37 +00:00
klaus
7577f48a09 Merge pull request '한정판 콘텐츠' (#307) from test into main 
Reviewed-on: #307
 2025-04-15 09:44:12 +00:00
klaus
0251906964 Merge pull request '비밀번호 찾기' (#306) from test into main 
Reviewed-on: #306
 2025-04-10 06:28:57 +00:00
klaus
2723a5f134 Merge pull request '일별 전체 회원 수' (#305) from test into main 
Reviewed-on: #305
 2025-04-10 02:30:00 +00:00
klaus
c3c60605fd Merge pull request '관리자 - 회원리스트, 크리에이터 리스트' (#304) from test into main 
Reviewed-on: #304
 2025-04-09 10:35:01 +00:00
klaus
238f704b22 Merge pull request '소셜 로그인, 회원가입 - 이메일 체크 로직 수정' (#303) from test into main 
Reviewed-on: #303
 2025-04-08 07:04:11 +00:00
klaus
5639d8ac8e Merge pull request 'test' (#302) from test into main 
Reviewed-on: #302
 2025-04-07 10:23:13 +00:00
klaus
9aac591591 Merge pull request 'test' (#301) from test into main 
Reviewed-on: #301
 2025-04-01 13:31:24 +00:00
klaus
ffa8e5aebb Merge pull request '일별 전체 회원 수 통계' (#300) from test into main 
Reviewed-on: #300
 2025-03-31 03:50:18 +00:00
klaus
cbbfe014cc Merge pull request '광고 통계' (#299) from test into main 
Reviewed-on: #299
 2025-03-28 05:29:40 +00:00
klaus
83028f7817 Merge pull request 'test' (#298) from test into main 
Reviewed-on: #298
 2025-03-26 21:08:29 +00:00
klaus
70d1795557 Merge pull request 'test' (#297) from test into main 
Reviewed-on: #297
 2025-03-26 04:23:28 +00:00
klaus
8c6c681424 Merge pull request 'marketing 정보 업데이트 시 pid 값이 있으면 항상 로그인 기록 남기기' (#296) from test into main 
Reviewed-on: #296
 2025-03-25 11:25:46 +00:00
klaus
50bc9f4ff3 Merge pull request '라이브 방 - 예약 중 조회' (#295) from test into main 
Reviewed-on: #295
 2025-03-24 10:04:08 +00:00
klaus
f00ea03fad Merge pull request 'test' (#294) from test into main 
Reviewed-on: #294
 2025-03-24 09:09:16 +00:00
klaus
f22e7b9ad1 Merge pull request '자동생성 닉네임에 사용될 형용사, 명사 값 추가' (#293) from test into main 
Reviewed-on: #293
 2025-03-21 10:27:30 +00:00
klaus
c7ec95f4bb Merge pull request 'test' (#292) from test into main 
Reviewed-on: #292
 2025-03-20 19:24:03 +00:00
klaus
229e7a8ccc Merge pull request '시리즈 상세, 채널 상세' (#291) from test into main 
Reviewed-on: #291
 2025-03-19 09:43:06 +00:00
klaus
3c616474ff Merge pull request 'test' (#290) from test into main 
Reviewed-on: #290
 2025-03-19 07:51:25 +00:00
klaus
56eb6b3ce3 Merge pull request '19금 콘텐츠 보기 설정 적용' (#289) from test into main 
Reviewed-on: #289
 2025-03-19 02:05:17 +00:00
klaus
545836d43c Merge pull request '관리자 광고통계, 일별 전체 회원 수' (#288) from test into main 
Reviewed-on: #288
 2025-03-17 08:50:59 +00:00
klaus
219f83dec0 Merge pull request 'test' (#287) from test into main 
Reviewed-on: #287
 2025-03-17 05:54:05 +00:00
klaus
a76a841238 Merge pull request 'test' (#286) from test into main 
Reviewed-on: #286
 2025-03-14 16:11:17 +00:00
klaus
c26680de84 Merge pull request '이벤트 배너, 충전 이벤트 - 기간 설정에 시간 추가' (#285) from test into main 
Reviewed-on: #285
 2025-03-14 03:40:07 +00:00
klaus
8fffad9d3a Merge pull request 'test' (#284) from test into main 
Reviewed-on: #284
 2025-03-13 12:25:35 +00:00
klaus
f4f0f203a2 Merge pull request '유저 정보 조회' (#283) from test into main 
Reviewed-on: #283
 2025-03-12 08:00:13 +00:00
klaus
b7196f5a0c Merge pull request 'test' (#282) from test into main 
Reviewed-on: #282
 2025-03-11 08:01:05 +00:00
klaus
5d33a18890 Merge pull request 'test' (#281) from test into main 
Reviewed-on: #281
 2025-03-10 05:35:30 +00:00
klaus
96186a1a50 Merge pull request '마케팅 - 매체 파트너 코드 조회 API - link 값 수정' (#280) from test into main 
Reviewed-on: #280
 2025-03-07 06:27:08 +00:00
klaus
bc8bc479d1 Merge pull request 'test' (#279) from test into main 
Reviewed-on: #279
 2025-03-06 17:58:32 +00:00
klaus
47595b1291 Merge pull request 'test' (#278) from test into main 
Reviewed-on: #278
 2025-03-05 14:05:47 +00:00
klaus
01a88964df Merge pull request 'test' (#277) from test into main 
Reviewed-on: #277
 2025-03-05 09:44:59 +00:00
klaus
3a2b77379f Merge pull request '콘텐츠 업로드' (#276) from test into main 
Reviewed-on: #276
 2025-02-28 04:45:04 +00:00
klaus
dc4e5f75cd Merge pull request '콘텐츠 메인 콘텐츠 탭 - 채널별 추천 단편' (#275) from test into main 
Reviewed-on: #275
 2025-02-26 03:14:33 +00:00
klaus
d0178d551c Merge pull request '콘텐츠 메인 콘텐츠 탭 - 채널별 추천 단편' (#274) from test into main 
Reviewed-on: #274
 2025-02-25 14:54:53 +00:00
klaus
827333108d Merge pull request '콘텐츠 대여기간' (#273) from test into main 
Reviewed-on: #273
 2025-02-25 14:02:18 +00:00
klaus
587b90bd27 Merge pull request '콘텐츠 메인 무료 탭 - 새로운 콘텐츠' (#272) from test into main 
Reviewed-on: #272
 2025-02-22 01:56:49 +00:00
klaus
4dc20c5e90 Merge pull request '콘텐츠 메인 무료 탭' (#271) from test into main 
Reviewed-on: #271
 2025-02-22 00:39:09 +00:00
klaus
ac25782f2b Merge pull request '관리자 태그 큐레이션 - 콘텐츠 검색' (#270) from test into main 
Reviewed-on: #270
 2025-02-21 21:46:15 +00:00
klaus
20437d56e7 Merge pull request '메인 시리즈 탭 - 완결 시리즈' (#269) from test into main 
Reviewed-on: #269
 2025-02-21 21:15:52 +00:00
klaus
f0b412828a Merge pull request '메인 시리즈 탭 - 완결 시리즈' (#268) from test into main 
Reviewed-on: #268
 2025-02-21 19:27:33 +00:00
klaus
367faac5c3 Merge pull request 'test' (#267) from test into main 
Reviewed-on: #267
 2025-02-20 18:24:35 +00:00
klaus
84deaaa970 Merge pull request '콘텐츠 메인 시리즈 탭 - 장르별 시리즈' (#266) from test into main 
Reviewed-on: #266
 2025-02-19 12:52:17 +00:00
klaus
a2b39466c2 Merge pull request '기존 콘텐츠 메인 - 새로운 콘텐츠' (#265) from test into main 
Reviewed-on: #265
 2025-02-19 11:34:02 +00:00
klaus
03586c4005 Merge pull request '기존 콘텐츠 메인 - 새로운 콘텐츠' (#264) from test into main 
Reviewed-on: #264
 2025-02-19 09:49:04 +00:00
klaus
6ea69e1510 Merge pull request '콘텐츠 메인 무료 탭 - 새로운 무료 콘텐츠' (#263) from test into main 
Reviewed-on: #263
 2025-02-19 09:24:24 +00:00
klaus
553c6dc539 Merge pull request '콘텐츠 메인 단편 탭 - 새로운 단편' (#262) from test into main 
Reviewed-on: #262
 2025-02-19 08:20:14 +00:00
klaus
6cc22f5b6d Merge pull request '콘텐츠 메인 홈, 무료 탭' (#261) from test into main 
Reviewed-on: #261
 2025-02-19 06:34:53 +00:00
klaus
9103d67cc1 Merge pull request 'test' (#260) from test into main 
Reviewed-on: #260
 2025-02-18 18:13:25 +00:00
klaus
25083fb0e4 Merge pull request 'test' (#259) from test into main 
Reviewed-on: #259
 2025-02-18 14:48:09 +00:00
klaus
d2dc045255 Merge pull request 'test' (#258) from test into main 
Reviewed-on: #258
 2025-02-14 18:09:11 +00:00
klaus
b8621dfbb0 Merge pull request 'test' (#257) from test into main 
Reviewed-on: #257
 2025-02-09 13:36:21 +00:00
klaus
93633940dd Merge pull request 'test' (#256) from test into main 
Reviewed-on: #256
 2025-02-03 07:20:32 +00:00
klaus
b6f5325351 Merge pull request 'test' (#255) from test into main 
Reviewed-on: #255
 2025-01-31 15:22:23 +00:00
klaus
7c32c08f1f Merge pull request 'test' (#254) from test into main 
Reviewed-on: #254
 2025-01-17 05:46:00 +00:00
klaus
1d268da08d Merge pull request '오디션 등록 푸시알림 메시지 수정' (#253) from test into main 
Reviewed-on: #253
 2025-01-10 10:23:19 +00:00
klaus
797666ae0d Merge pull request 'test' (#252) from test into main 
Reviewed-on: #252
 2025-01-08 14:11:08 +00:00
klaus
dcf470997e Merge pull request 'test' (#251) from test into main 
Reviewed-on: #251
 2025-01-08 06:29:33 +00:00
klaus
0974d1dbf8 Merge pull request '관리자 오디션 지원 리스트' (#250) from test into main 
Reviewed-on: #250
 2025-01-07 19:44:39 +00:00
klaus
12a35db6cd Merge pull request '오디션' (#249) from test into main 
Reviewed-on: #249
 2025-01-07 17:24:40 +00:00
klaus
9abbb05ad8 Merge pull request 'test' (#248) from test into main 
Reviewed-on: #248
 2024-12-18 07:10:01 +00:00
klaus
1ecaf69b0b Merge pull request 'test' (#247) from test into main 
Reviewed-on: #247
 2024-12-17 13:43:45 +00:00
klaus
e334d1e5d9 Merge pull request '콘텐츠 댓글 푸시 대상자' (#246) from test into main 
Reviewed-on: #246
 2024-12-03 15:54:34 +00:00
klaus
b735e861d0 Merge pull request '콘텐츠 댓글 푸시 대상자 조회' (#245) from test into main 
Reviewed-on: #245
 2024-12-02 15:06:49 +00:00
klaus
4eb433d372 Merge pull request 'test' (#244) from test into main 
Reviewed-on: #244
 2024-12-02 12:05:30 +00:00
klaus
2416ae61f3 Merge pull request 'test' (#243) from test into main 
Reviewed-on: #243
 2024-12-02 04:29:50 +00:00
klaus
01fb336985 Merge pull request '콘텐츠 등록' (#242) from test into main 
Reviewed-on: #242
 2024-11-26 12:46:24 +00:00
klaus
b6af88a732 Merge pull request 'test' (#241) from test into main 
Reviewed-on: #241
 2024-11-26 05:33:45 +00:00
klaus
58a2a17d6d Merge pull request 'test' (#240) from test into main 
Reviewed-on: #240
 2024-11-23 17:59:23 +00:00
klaus
79f5a0f520 Merge pull request '내 콘텐츠 수정, 삭제 시 콘텐츠 조회 함수' (#239) from test into main 
Reviewed-on: #239
 2024-11-21 06:34:30 +00:00
klaus
7f6c0f7f04 Merge pull request 'Redis connection 수정' (#238) from test into main 
Reviewed-on: #238
 2024-11-20 09:58:56 +00:00
klaus
f658df4dca Merge pull request 'Redis connection' (#237) from test into main 
Reviewed-on: #237
 2024-11-20 07:52:58 +00:00
klaus
9d43b8e23a Merge pull request 'Redis connection' (#236) from test into main 
Reviewed-on: #236
 2024-11-20 06:47:52 +00:00
klaus
4270aef79b Merge pull request 'test' (#235) from test into main 
Reviewed-on: #235
 2024-11-11 15:34:35 +00:00
klaus
1c0dc82d44 Merge pull request '콘텐츠 구매 - 소장만 추가' (#234) from test into main 
Reviewed-on: #234
 2024-11-08 12:40:29 +00:00
klaus
c1e325aadf Merge pull request 'test' (#233) from test into main 
Reviewed-on: #233
 2024-11-05 07:26:19 +00:00
klaus
cec87da69d Merge pull request '콘텐츠 대여가격' (#232) from test into main 
Reviewed-on: #232
 2024-10-31 05:23:01 +00:00
klaus
f68f24cb2c Merge pull request 'test' (#231) from test into main 
Reviewed-on: #231
 2024-10-31 03:09:13 +00:00
klaus
ed094347fc Merge pull request '라이브 방 후원랭킹' (#230) from test into main 
Reviewed-on: #230
 2024-10-30 05:16:05 +00:00
klaus
b8afdffbe1 Merge pull request 'test' (#229) from test into main 
Reviewed-on: #229
 2024-10-29 08:35:58 +00:00
klaus
f6ba79f31c Merge pull request 'test' (#228) from test into main 
Reviewed-on: #228
 2024-10-25 03:45:26 +00:00
klaus
5f3b1663d2 Merge pull request '관리자 - 콘텐츠 리스트' (#227) from test into main 
Reviewed-on: #227
 2024-10-16 03:33:23 +00:00
klaus
66e786b4bb Merge pull request '관리자 - 시리즈 리스트 API' (#226) from test into main 
Reviewed-on: #226
 2024-10-14 15:39:45 +00:00
klaus
f671114574 Merge pull request '관리자 - 시리즈 리스트 API' (#225) from test into main 
Reviewed-on: #225
 2024-10-14 10:37:28 +00:00
klaus
ce37060d94 Merge pull request '관리자 - 시리즈 리스트 API 추가' (#224) from test into main 
Reviewed-on: #224
 2024-10-14 10:10:43 +00:00
klaus
7d19a4d184 Merge pull request 'test' (#223) from test into main 
Reviewed-on: #223
 2024-10-13 17:30:25 +00:00
klaus
22f28a2f8a Merge pull request '콘텐츠 메인 - 추천시리즈, 새로운 콘텐츠, 큐레이션' (#222) from test into main 
Reviewed-on: #222
 2024-10-13 16:33:15 +00:00
klaus
ceef9ca979 Merge pull request 'test' (#221) from test into main 
Reviewed-on: #221
 2024-10-11 05:06:22 +00:00
klaus
efe8f4f939 Merge pull request '콘텐츠 메인 - 새로운 콘텐츠 섹션 두번째 정렬 조건 추가' (#220) from test into main 
Reviewed-on: #220
 2024-10-04 07:21:38 +00:00
klaus
ba692a1195 Merge pull request '시리즈 상세 - 콘텐츠 리스트 두번째 정렬 조건 추가' (#219) from test into main 
Reviewed-on: #219
 2024-10-04 02:41:28 +00:00
klaus
d732bad042 Merge pull request '시리즈 상세' (#218) from test into main 
Reviewed-on: #218
 2024-10-02 09:18:19 +00:00
klaus
4c935c3bee Merge pull request '예약 라이브 개수 제한' (#217) from test into main 
Reviewed-on: #217
 2024-09-25 05:42:45 +00:00
klaus
c160dd791f Merge pull request 'test' (#216) from test into main 
Reviewed-on: #216
 2024-09-24 10:17:58 +00:00
klaus
23cd1b4601 Merge pull request '라이브 후원현황 API' (#215) from test into main 
Reviewed-on: #215
 2024-09-23 13:58:14 +00:00
klaus
031fc8ba1b Merge pull request 'test' (#214) from test into main 
Reviewed-on: #214
 2024-09-23 06:24:12 +00:00
klaus
c6853289ad Merge pull request 'test' (#213) from test into main 
Reviewed-on: #213
 2024-09-11 08:23:08 +00:00
klaus
2497bb69bc Merge pull request 'test' (#212) from test into main 
Reviewed-on: #212
 2024-09-11 07:47:35 +00:00
klaus
a58a67e0a2 Merge pull request 'test' (#211) from test into main 
Reviewed-on: #211
 2024-09-11 06:00:31 +00:00
klaus
4315fe12a5 Merge pull request 'test' (#210) from test into main 
Reviewed-on: #210
 2024-09-06 19:00:39 +00:00
klaus
42f10a8899 Merge pull request 'test' (#209) from test into main 
Reviewed-on: #209
 2024-09-05 10:12:14 +00:00
klaus
1e4b47f989 Merge pull request 'test' (#208) from test into main 
Reviewed-on: #208
 2024-08-30 09:17:41 +00:00
klaus
ff255dbfae Merge pull request 'test' (#207) from test into main 
Reviewed-on: #207
 2024-08-27 07:31:05 +00:00
klaus
dbe9b72feb Merge pull request 'test' (#206) from test into main 
Reviewed-on: #206
 2024-08-23 13:48:24 +00:00
klaus
95a714b391 Merge pull request '탐색' (#205) from test into main 
Reviewed-on: #205
 2024-08-19 13:21:31 +00:00
klaus
28f58c7f56 Merge pull request '라이브' (#204) from test into main 
Reviewed-on: #204
 2024-08-14 09:34:52 +00:00
klaus
8bd46d8f21 Merge pull request '크리에이터 관리자 시리즈' (#203) from test into main 
Reviewed-on: #203
 2024-08-14 07:41:33 +00:00
klaus
e1bb8e54ed Merge pull request '크리에이터 커뮤니티' (#202) from test into main 
Reviewed-on: #202
 2024-08-06 11:41:11 +00:00
klaus
1de705b063 Merge pull request '크리에이터 커뮤니티' (#201) from test into main 
Reviewed-on: #201
 2024-08-06 06:37:30 +00:00
klaus
f6926ad356 Merge pull request '남/여 크리에이터에서 특정 크리에이터 제거' (#200) from test into main 
Reviewed-on: #200
 2024-07-26 07:54:18 +00:00
klaus
2cdbbb1b37 Merge pull request 'test' (#199) from test into main 
Reviewed-on: #199
 2024-07-25 16:08:20 +00:00
klaus
4dce8c8f03 Merge pull request '크리에이터 커뮤니티' (#198) from test into main 
Reviewed-on: #198
 2024-07-10 05:24:58 +00:00
klaus
97a5bace6f Merge pull request 'test' (#197) from test into main 
Reviewed-on: #197
 2024-07-08 14:17:42 +00:00
klaus
d4d51ec48f Merge pull request 'test' (#196) from test into main 
Reviewed-on: #196
 2024-07-02 08:57:11 +00:00
klaus
fb91398462 Merge pull request '커뮤니티 게시물' (#195) from test into main 
Reviewed-on: #195
 2024-06-17 14:09:26 +00:00
klaus
105dadd798 Merge pull request '커뮤니티 게시물' (#194) from test into main 
Reviewed-on: #194
 2024-06-15 11:57:33 +00:00
klaus
2abf2837d3 Merge pull request '커뮤니티 게시물' (#193) from test into main 
Reviewed-on: #193
 2024-06-11 12:13:47 +00:00
klaus
422aa67af6 Merge pull request '커뮤니티 게시물' (#192) from test into main 
Reviewed-on: #192
 2024-06-11 11:55:05 +00:00
klaus
7fffab6985 Merge pull request '크리에이터 정산 - 입력된 비율로 계산' (#191) from test into main 
Reviewed-on: #191
 2024-06-11 08:07:22 +00:00
klaus
5a4be3d2c1 Merge pull request '콘텐츠 상세' (#190) from test into main 
Reviewed-on: #190
 2024-06-07 10:30:06 +00:00
klaus
f39a7681db Merge pull request 'test' (#189) from test into main 
Reviewed-on: #189
 2024-06-04 03:39:23 +00:00
klaus
c60a7580ba Merge pull request 'test' (#188) from test into main 
Reviewed-on: #188
 2024-06-03 22:13:56 +00:00
klaus
97edb56edc Merge pull request 'test' (#187) from test into main 
Reviewed-on: #187
 2024-05-29 17:04:39 +00:00
klaus
6ebca8d22b Merge pull request '관리자 - 라이브 리스트' (#186) from test into main 
Reviewed-on: #186
 2024-05-28 18:18:44 +00:00
klaus
95371ad934 Merge pull request '(크리에이터)관리자 커뮤니티 게시물 정산' (#185) from test into main 
Reviewed-on: #185
 2024-05-28 16:54:44 +00:00
klaus
2c176825fd Merge pull request 'test' (#184) from test into main 
Reviewed-on: #184
 2024-05-28 16:09:51 +00:00
klaus
fae7de48d3 Merge pull request 'test' (#183) from test into main 
Reviewed-on: #183
 2024-05-27 08:28:27 +00:00
klaus
b8230646a2 Merge pull request '커뮤니티 게시글 유료화' (#182) from test into main 
Reviewed-on: #182
 2024-05-24 14:44:14 +00:00
klaus
43279541dd Merge pull request '콘텐츠별 누적정산' (#181) from test into main 
Reviewed-on: #181
 2024-05-21 06:37:51 +00:00
klaus
b4791977c1 Merge pull request 'PG 심사를 위한 캔 충전 로직 추가' (#180) from test into main 
Reviewed-on: #180
 2024-05-20 06:38:40 +00:00
klaus
ef917ecc25 Merge pull request '라이브 방 - 크리에이터 입장 가능 설정 추가' (#179) from test into main 
Reviewed-on: #179
 2024-05-14 12:09:53 +00:00
klaus
a93faad951 Merge pull request '룰렛 방식 수정' (#178) from test into main 
Reviewed-on: #178
 2024-05-10 18:00:40 +00:00
klaus
fd001d24d3 Merge pull request '추천시리즈 API 추가' (#177) from test into main 
Reviewed-on: #177
 2024-05-07 10:34:10 +00:00
klaus
7aa5884797 Merge pull request '구글 인 앱 결제 검증코드 수정' (#176) from test into main 
Reviewed-on: #176
 2024-05-03 10:06:39 +00:00
klaus
5b237a1547 Merge pull request 'test' (#175) from test into main 
Reviewed-on: #175
 2024-05-03 06:08:55 +00:00
klaus
2e37990d87 Merge pull request '탐색 - 남/여 크리에이터 리스트' (#174) from test into main 
Reviewed-on: #174
 2024-05-02 17:24:18 +00:00
klaus
dd07d724a8 Merge pull request 'test' (#173) from test into main 
Reviewed-on: #173
 2024-05-02 16:41:50 +00:00
klaus
03ce8618e7 Merge pull request '관리자 시그니처 설정' (#172) from test into main 
Reviewed-on: #172
 2024-05-02 07:13:21 +00:00
klaus
db1a7a7fd6 Merge pull request '시그니처 후원 시간 추가' (#171) from test into main 
Reviewed-on: #171
 2024-05-02 06:23:22 +00:00
klaus
36a82d7f53 Merge pull request '시리즈, 시리즈 콘텐츠' (#170) from test into main 
Reviewed-on: #170
 2024-04-30 14:00:01 +00:00
klaus
3a34401113 Merge pull request '시리즈 상세' (#169) from test into main 
Reviewed-on: #169
 2024-04-30 09:44:55 +00:00
klaus
9927268330 Merge pull request '구글 인 앱 결제' (#168) from test into main 
Reviewed-on: #168
 2024-04-30 08:24:03 +00:00
klaus
c45c97e29d Merge pull request '시리즈' (#167) from test into main 
Reviewed-on: #167
 2024-04-26 18:51:10 +00:00
klaus
c64a315226 Merge pull request 'test' (#166) from test into main 
Reviewed-on: #166
 2024-04-18 16:40:55 +00:00
klaus
a4cafca6ab Merge pull request 'test' (#165) from test into main 
Reviewed-on: #165
 2024-04-18 10:02:45 +00:00
klaus
46284a0660 Merge pull request 'test' (#164) from test into main 
Reviewed-on: #164
 2024-04-15 12:31:42 +00:00
klaus
05df86e15a Merge pull request 'test' (#163) from test into main 
Reviewed-on: #163
 2024-04-09 14:40:33 +00:00
klaus
8b433027e2 Merge pull request 'test' (#162) from test into main 
Reviewed-on: #162
 2024-04-09 13:27:24 +00:00
klaus
5bd4ff7610 Merge pull request '결제 테이블에 구글결제의 경우 orderId 추가' (#161) from test into main 
Reviewed-on: #161
 2024-04-05 03:10:00 +00:00
klaus
d693c397ea Merge pull request '.' (#160) from test into main 
Reviewed-on: #160
 2024-04-03 06:49:36 +00:00
klaus
1d8d1ec9a5 Merge pull request 'test' (#159) from test into main 
Reviewed-on: #159
 2024-04-03 06:27:26 +00:00
klaus
5e491f11ee Merge pull request '크리에이터 관리자 라이브 정산' (#158) from test into main 
Reviewed-on: #158
 2024-04-03 03:45:31 +00:00
klaus
7cedea06ac Merge pull request '캔 사용' (#157) from test into main 
Reviewed-on: #157
 2024-04-01 12:42:44 +00:00
klaus
2e5f750e50 Merge pull request 'test' (#156) from test into main 
Reviewed-on: #156
 2024-04-01 10:20:09 +00:00
klaus
20289cad10 Merge pull request '콘텐츠 상세' (#155) from test into main 
Reviewed-on: #155
 2024-03-29 10:10:04 +00:00
klaus
e0d64c31c7 Merge pull request '콘텐츠 상세' (#154) from test into main 
Reviewed-on: #154
 2024-03-29 08:18:15 +00:00
klaus
8c1b95dc97 Merge pull request '구글 인 앱구매 검증' (#153) from test into main 
Reviewed-on: #153
 2024-03-28 17:13:57 +00:00
klaus
fb5641343e Merge pull request 'test' (#152) from test into main 
Reviewed-on: #152
 2024-03-28 06:31:43 +00:00
klaus
87765941eb Merge pull request '구글 인 앱 결제 검증' (#151) from test into main 
Reviewed-on: #151
 2024-03-22 20:10:01 +00:00
klaus
1809862c16 Merge pull request '구글 인 앱 결제 처리과정 축소' (#150) from test into main 
Reviewed-on: #150
 2024-03-22 15:27:25 +00:00
klaus
300f784f7d Merge pull request '구글 인 앱 결제 검증 과정 try/catch로 예외 처리' (#149) from test into main 
Reviewed-on: #149
 2024-03-22 11:59:37 +00:00
klaus
67a045eae6 Merge pull request '구글 인 앱 결제 검증 수정' (#148) from test into main 
Reviewed-on: #148
 2024-03-22 11:36:35 +00:00
klaus
2a79903a28 Merge pull request 'test' (#147) from test into main 
Reviewed-on: #147
 2024-03-22 10:08:00 +00:00
klaus
d3222ce083 Merge pull request '관리자 캔 충전현황' (#146) from test into main 
Reviewed-on: #146
 2024-03-21 15:56:02 +00:00
klaus
406a421742 Merge pull request '구글 인 앱 결제 검증 코드 수정' (#145) from test into main 
Reviewed-on: #145
 2024-03-21 15:22:34 +00:00
klaus
10bf728faf Merge pull request '구글 인 앱 결제 검증 코드 수정' (#144) from test into main 
Reviewed-on: #144
 2024-03-21 14:37:09 +00:00
klaus
607617747c Merge pull request '구글 인 앱 결제 검증 코드 수정' (#143) from test into main 
Reviewed-on: #143
 2024-03-21 12:47:51 +00:00
klaus
f0a69eb1a2 Merge pull request 'test' (#142) from test into main 
Reviewed-on: #142
 2024-03-21 07:45:02 +00:00
klaus
6b307a6e17 Merge pull request 'test' (#141) from test into main 
Reviewed-on: #141
 2024-03-13 11:28:13 +00:00
klaus
08d08a934a Merge pull request 'test' (#140) from test into main 
Reviewed-on: #140
 2024-03-12 06:20:02 +00:00
klaus
c500c12668 Merge pull request 'test' (#139) from test into main 
Reviewed-on: #139
 2024-03-08 13:40:27 +00:00
klaus
62060adeba Merge pull request '채널 후원 랭킹' (#138) from test into main 
Reviewed-on: #138
 2024-02-29 10:28:51 +00:00
klaus
b2fc75edb8 Merge pull request '룰렛 정렬 순서 수정' (#137) from test into main 
Reviewed-on: #137
 2024-02-27 17:29:36 +00:00
klaus
a999dd2085 Merge pull request 'test' (#136) from test into main 
Reviewed-on: #136
 2024-02-27 16:16:30 +00:00
klaus
49f95ab100 Merge pull request '회원테이블에 adid 추가' (#135) from test into main 
Reviewed-on: #135
 2024-02-27 05:49:47 +00:00
klaus
1a84d5b30c Merge pull request 'test' (#134) from test into main 
Reviewed-on: #134
 2024-02-24 20:35:57 +00:00
klaus
3b65050632 Merge pull request 'redis ssl false' (#133) from test into main 
Reviewed-on: #133
 2024-02-17 13:00:25 +00:00
klaus
d0df31674c Merge pull request 'test' (#132) from test into main 
Reviewed-on: #132
 2024-02-17 12:44:52 +00:00
klaus
1fe88402e2 Merge pull request 'test' (#131) from test into main 
Reviewed-on: #131
 2024-02-14 07:12:41 +00:00
klaus
67097696e6 Merge pull request '커뮤니티 게시물 시간' (#130) from test into main 
Reviewed-on: #130
 2024-02-12 08:14:24 +00:00
klaus
8e7e77067a Merge pull request 'test' (#129) from test into main 
Reviewed-on: #129
 2024-02-12 07:53:26 +00:00
klaus
9899390b61 Merge pull request '관리자 콘텐츠 리스트, 수정' (#128) from test into main 
Reviewed-on: #128
 2024-02-08 18:19:50 +00:00
klaus
80c476a908 Merge pull request '관리자 콘텐츠 리스트' (#127) from test into main 
Reviewed-on: #127
 2024-02-08 14:45:54 +00:00
klaus
59da1d6e49 Merge pull request '카테고리 콘텐츠' (#126) from test into main 
Reviewed-on: #126
 2024-02-07 13:33:37 +00:00
klaus
5aef7dac33 Merge pull request 'test' (#125) from test into main 
Reviewed-on: #125
 2024-02-07 09:39:09 +00:00
klaus
faf7aa06b6 Merge pull request 'test' (#124) from test into main 
Reviewed-on: #124
 2024-02-05 07:03:45 +00:00
klaus
38ef6e5583 Merge pull request 'test' (#123) from test into main 
Reviewed-on: #123
 2024-02-05 02:12:10 +00:00
klaus
c0b15b5d94 Merge pull request '콘텐츠 업로드' (#122) from test into main 
Reviewed-on: #122
 2024-01-30 03:45:31 +00:00
klaus
2cfc067ea1 Merge pull request '콘텐츠 전체 리스트' (#121) from test into main 
Reviewed-on: #121
 2024-01-29 09:00:23 +00:00
klaus
a91db4f956 Merge pull request '콘텐츠 상단 고정 기능 추가' (#120) from test into main 
Reviewed-on: #120
 2024-01-29 02:45:41 +00:00
klaus
8a09780a02 Merge pull request 'test' (#119) from test into main 
Reviewed-on: #119
 2024-01-26 06:19:49 +00:00
klaus
45e8ec6505 Merge pull request '콘텐츠 정렬 기준' (#118) from test into main 
Reviewed-on: #118
 2024-01-24 15:03:06 +00:00
klaus
4554b85914 Merge pull request '회원가입 시 닉네임 validation 조건' (#117) from test into main 
Reviewed-on: #117
 2024-01-24 07:11:23 +00:00
klaus
8aa79c4a9c Merge pull request '콘텐츠 등록 - 태그 등록' (#116) from test into main 
Reviewed-on: #116
 2024-01-16 15:19:59 +00:00
klaus
c8d3210b57 Merge pull request 'test' (#115) from test into main 
Reviewed-on: #115
 2024-01-11 09:05:44 +00:00
klaus
2282a49563 Merge pull request 'test' (#114) from test into main 
Reviewed-on: #114
 2024-01-11 03:49:53 +00:00
klaus
b82fdfb2c8 Merge pull request '예약 업로드' (#113) from test into main 
Reviewed-on: #113
 2024-01-10 16:59:51 +00:00
klaus
2d17eac199 Merge pull request '19세 미만이 인증처리 되던 버그 수정' (#112) from test into main 
Reviewed-on: #112
 2024-01-08 10:07:21 +00:00
klaus
e482bc3aad Merge pull request '콘텐츠를 올린 크리에이터가 댓글을 삭제할 수 있도록 수정' (#111) from test into main 
Reviewed-on: #111
 2024-01-04 11:36:43 +00:00
klaus
ec022b74d1 Merge pull request '캔 쿠폰 조회 로직 수정' (#110) from test into main 
Reviewed-on: #110
 2024-01-04 09:59:20 +00:00
klaus
dc42c09ce3 Merge pull request '캔 쿠폰 조회' (#109) from test into main 
Reviewed-on: #109
 2024-01-03 15:48:09 +00:00
klaus
046a34d2a4 Merge pull request 'test' (#108) from test into main 
Reviewed-on: #108
 2024-01-03 15:19:42 +00:00
klaus
9ff6ec1888 Merge pull request '캔 쿠폰 시스템' (#107) from test into main 
Reviewed-on: #107
 2024-01-03 11:28:48 +00:00
klaus
d2950106ec Merge pull request '콘텐츠 랭킹 - 후원 순위 제거, 룰렛 아이템 개수 10로 변경' (#106) from test into main 
Reviewed-on: #106
 2023-12-26 12:50:09 +00:00
klaus
962f800d2e Merge pull request '팔로우 한 크리에이터 커뮤니티 게시물 조회 - 인증하지 않은 사람은 19금이 아닌 최신 게시물이 조회되도록 수정' (#105) from test into main 
Reviewed-on: #105
 2023-12-25 08:19:43 +00:00
klaus
962107e507 Merge pull request '팔로우 한 크리에이터 커뮤니티 게시물 조회 - 차단된 유저는 조회되지 않도록 수정' (#104) from test into main 
Reviewed-on: #104
 2023-12-21 19:28:10 +00:00
klaus
039bd11963 Merge pull request '커뮤니티 게시물 조회 - 차단된 유저는 조회되지 않도록 수정' (#103) from test into main 
Reviewed-on: #103
 2023-12-21 19:05:12 +00:00
klaus
5c250ea4ae Merge pull request '크리에이터 커뮤니티' (#102) from test into main 
Reviewed-on: #102
 2023-12-21 15:10:55 +00:00
klaus
e3405bcec6 Merge pull request 'test' (#101) from test into main 
Reviewed-on: #101
 2023-12-13 16:14:50 +00:00
klaus
0fd1c2235f Merge pull request '라이브 정산 - 정렬 순서 추가 (라이브 방 id, 구분)' (#100) from test into main 
Reviewed-on: #100
 2023-12-10 16:58:05 +00:00
klaus
b20c29b022 Merge pull request 'test' (#99) from test into main 
Reviewed-on: #99
 2023-12-10 12:34:51 +00:00
klaus
12d5dcd298 Merge pull request 'test' (#98) from test into main 
Reviewed-on: #98
 2023-12-10 09:02:29 +00:00
klaus
2c305dc6c6 Merge pull request 'test' (#97) from test into main 
Reviewed-on: #97
 2023-12-10 06:48:43 +00:00
klaus
62f76f7433 Merge pull request 'test' (#96) from test into main 
Reviewed-on: #96
 2023-12-07 01:46:33 +00:00
klaus
858ce524f9 Merge pull request 'test' (#95) from test into main 
Reviewed-on: #95
 2023-11-27 12:48:24 +00:00
klaus
3795fb4a40 Merge pull request 'test' (#94) from test into main 
Reviewed-on: #94
 2023-11-24 07:03:10 +00:00
klaus
0c01aeec50 Merge pull request '관리자 - 이벤트 배너 등록' (#93) from test into main 
Reviewed-on: #93
 2023-11-21 16:21:19 +00:00
klaus
892206744d Merge pull request '이벤트 배너, 팝업' (#92) from test into main 
Reviewed-on: #92
 2023-11-21 12:59:30 +00:00
klaus
9e2c1474db Merge pull request '메시지 보내기 유저 검색' (#91) from test into main 
Reviewed-on: #91
 2023-11-20 05:41:57 +00:00
klaus
16328f73d9 Merge pull request '크리에이터 관리자, 관리자 - 일자별 콘텐츠 후원 정산 API' (#90) from test into main 
Reviewed-on: #90
 2023-11-14 13:14:19 +00:00
klaus
e0d4f53cf4 Merge pull request 'test' (#89) from test into main 
Reviewed-on: #89
 2023-11-14 12:15:51 +00:00
klaus
e09a59c5b4 Merge pull request 'test' (#88) from test into main 
Reviewed-on: #88
 2023-11-14 11:09:14 +00:00
klaus
049e654535 Merge pull request '관리자 일자별 콘텐츠 후원 정산 - 크리에이터 순으로 정렬' (#87) from test into main 
Reviewed-on: #87
 2023-11-14 09:22:38 +00:00
klaus
c927dc4ecd Merge pull request '관리자 - 일자별 콘텐츠 후원 정산 페이지 추가' (#86) from test into main 
Reviewed-on: #86
 2023-11-14 09:03:35 +00:00
klaus
fe4ecd0ad8 Merge pull request '크리에이터 관리자 - 일자별 콘텐츠 정산 페이징 안되는 버그 수정' (#85) from test into main 
Reviewed-on: #85
 2023-11-14 05:17:58 +00:00
klaus
78d476fe80 Merge pull request '라이브 상세 - 시작 시간 dateformat yyyy.MM.dd E hh:mm a 로 복구' (#84) from test into main 
Reviewed-on: #84
 2023-11-14 03:31:54 +00:00
klaus
a11c8465d5 Merge pull request '크리에이터 관리자 - @JsonProperty 추가' (#83) from test into main 
Reviewed-on: #83
 2023-11-13 16:10:57 +00:00
klaus
366304a9b7 Merge pull request '크리에이터 관리자 - 정산 API 캐시 추가' (#82) from test into main 
Reviewed-on: #82
 2023-11-13 15:56:58 +00:00
klaus
4356663688 Merge pull request '크리에이터 관리자 - 콘텐츠 누적 매출 API' (#81) from test into main 
Reviewed-on: #81
 2023-11-13 15:23:53 +00:00
klaus
26b55e6fcf Merge pull request '콘텐츠 누적 매출 API - orderType 추가' (#80) from test into main 
Reviewed-on: #80
 2023-11-13 14:48:47 +00:00
klaus
0d743f7204 Merge pull request '콘텐츠 누적 매출 API 추가' (#79) from test into main 
Reviewed-on: #79
 2023-11-13 13:42:17 +00:00
klaus
6cbe113b3e Merge pull request '크리에이터 콘텐츠 정산 - API 추가' (#78) from test into main 
Reviewed-on: #78
 2023-11-13 10:03:02 +00:00
klaus
6409b69d6c Merge pull request '콘텐츠 정산 - 결과값에 JsonProperty 를 추가하여 데이터 파싱이 진행 되도록 수정' (#77) from test into main 
Reviewed-on: #77
 2023-11-10 13:19:06 +00:00
klaus
c5164c76fc Merge pull request '콘텐츠 정산 - group by 날짜 수정' (#76) from test into main 
Reviewed-on: #76
 2023-11-10 12:46:07 +00:00
klaus
baade8e138 Merge pull request 'test' (#75) from test into main 
Reviewed-on: #75
 2023-11-10 10:47:11 +00:00
klaus
b848d6b4e0 Merge pull request 'test' (#74) from test into main 
Reviewed-on: #74
 2023-11-09 11:18:20 +00:00
klaus
d8139d2ab0 Merge pull request '라이브 리스트, 라이브 상세' (#73) from test into main 
Reviewed-on: #73
 2023-11-07 16:48:25 +00:00
klaus
e96d8f7469 Merge pull request 'test' (#72) from test into main 
Reviewed-on: #72
 2023-11-07 16:23:11 +00:00
klaus
2acffd8afc Merge pull request '콘텐츠 메인 API - 캐싱을 적용하기 위해 AudioContentMainManageService 추가' (#71) from test into main 
Reviewed-on: #71
 2023-11-07 11:24:40 +00:00
klaus
3c8e72073c Merge pull request '콘텐츠 메인 API - @Transactional(readOnly = true) 추가' (#70) from test into main 
Reviewed-on: #70
 2023-11-07 08:47:47 +00:00
klaus
724d7a9d9b Merge pull request 'test' (#69) from test into main 
Reviewed-on: #69
 2023-11-07 08:21:56 +00:00
klaus
2da3b0db78 Merge pull request 'test' (#68) from test into main 
Reviewed-on: #68
 2023-11-06 09:26:36 +00:00
klaus
685ad7afaf Merge pull request '콘텐츠 메인 캐싱전략 수정' (#67) from test into main 
Reviewed-on: #67
 2023-11-06 08:46:55 +00:00
klaus
264cf75964 Merge pull request '콘텐츠 메인 - 큐레이션 개수 15개만 노출' (#66) from test into main 
Reviewed-on: #66
 2023-11-06 08:11:00 +00:00
klaus
c773dbc7b5 Merge pull request '콘텐츠 랭킹 - 후원 랭킹 조회 로직 수정' (#65) from test into main 
Reviewed-on: #65
 2023-11-04 14:24:46 +00:00
klaus
37cbc64f52 Merge pull request '본인인증' (#64) from test into main 
Reviewed-on: #64
 2023-11-03 07:48:02 +00:00
klaus
cb1dde17bb Merge pull request 'test' (#63) from test into main 
Reviewed-on: #63
 2023-11-02 12:18:29 +00:00
klaus
c29988acf4 Merge pull request '콘텐츠 주문 - 대여만 가능한 콘텐츠의 경우 소장으로 주문이 들어오더라도 대여로 처리되도록 로직 수정' (#62) from test into main 
Reviewed-on: #62
 2023-11-01 04:49:18 +00:00
klaus
eadbf56dae Merge pull request '정산테이블에 무료충전 코인도 반영되도록 수정' (#61) from test into main 
Reviewed-on: #61
 2023-10-28 08:42:29 +00:00
klaus
4b3b455135 Merge pull request '캔 사용 시 제휴보상 캔도 사용할 수 있도록 수정' (#60) from test into main 
Reviewed-on: #60
 2023-10-27 13:48:33 +00:00
klaus
e6ac177396 Merge pull request '충전내역 - 결제수단에 "제휴보상" 표시' (#59) from test into main 
Reviewed-on: #59
 2023-10-26 18:48:46 +00:00
klaus
3d0e29003f Merge pull request '충전내역 - 결제수단에 "제휴보상" 표시' (#58) from test into main 
Reviewed-on: #58
 2023-10-26 18:22:10 +00:00
klaus
78b9b00f77 Merge pull request '충전내역 - 결제수단에 "제휴보상" 표시' (#57) from test into main 
Reviewed-on: #57
 2023-10-26 18:02:16 +00:00
klaus
0ee7faa551 Merge pull request '카울리를 이용한 무료충전 테이블 adProfit 과 point 타입 int -> float 로 변경' (#56) from test into main 
Reviewed-on: #56
 2023-10-26 16:55:39 +00:00
klaus
e5fdced681 Merge pull request '콘텐츠 메인 캐싱 전략 변경' (#55) from test into main 
Reviewed-on: #55
 2023-10-26 16:14:37 +00:00
klaus
afb99fef64 Merge pull request 'GetAudioContentMainItem - adult를 isAdult로 변경, 캐시 제거' (#54) from test into main 
Reviewed-on: #54
 2023-10-24 11:39:56 +00:00
klaus
7dfaa36024 Merge pull request 'test' (#53) from test into main 
Reviewed-on: #53
 2023-10-24 10:42:10 +00:00
klaus
0496f665aa Merge pull request 'getAudioContentMainBannerList 부분 캐시 제거' (#52) from test into main 
Reviewed-on: #52
 2023-10-17 10:02:53 +00:00
klaus
0d19e1be74 Merge pull request 'audio content banner - lazy 옵션으로 인해 발생하는 com.fasterxml.jackson.databind.exc.InvalidDefinitionException 문제 수정' (#51) from test into main 
Reviewed-on: #51
 2023-10-17 09:47:44 +00:00
klaus
4aff0111aa Merge pull request '로딩 속도를 위해 @Cacheable 적용' (#50) from test into main 
Reviewed-on: #50
 2023-10-17 09:31:08 +00:00
klaus
63b3ba2bb2 Merge pull request '인기 콘텐츠 전체보기 집계날짜 수정' (#49) from test into main 
Reviewed-on: #49
 2023-10-16 13:59:28 +00:00
klaus
7444b41f60 Merge pull request '콘텐츠 메인 - 인기 콘텐츠 집계날짜 수정' (#48) from test into main 
Reviewed-on: #48
 2023-10-16 13:42:31 +00:00
klaus
8e90dbc8b6 Merge pull request '구매목록 - isActive 가 true 인 것만 조회되도록 수정' (#47) from test into main 
Reviewed-on: #47
 2023-10-16 03:30:10 +00:00
klaus
9f70722521 Merge pull request '탐색 인기 크리에이터 - 날짜 설명 글 수정' (#46) from test into main 
Reviewed-on: #46
 2023-10-14 21:43:48 +00:00
klaus
52fae596fa Merge pull request '콘텐츠 랭킹 데이터 전체보기 API - 페이징 추가' (#45) from test into main 
Reviewed-on: #45
 2023-10-14 21:20:19 +00:00
klaus
ccb67957bc Merge pull request '콘텐츠 랭킹 추가' (#44) from test into main 
Reviewed-on: #44
 2023-10-14 19:37:55 +00:00
klaus
fb82538d0d Merge pull request '캔 소비 - 콘텐츠 주문시 캔 소비내역에 콘텐츠 내용 추가' (#43) from test into main 
Reviewed-on: #43
 2023-10-14 11:33:59 +00:00
klaus
72ee39612e Merge pull request '탐색 - 인기 급상승 제거, 인기 크리에이터 섹션 추가' (#42) from test into main 
Reviewed-on: #42
 2023-10-13 15:41:25 +00:00
klaus
51fd5408dc Merge pull request 'test' (#41) from test into main 
Reviewed-on: #41
 2023-10-06 08:50:32 +00:00
klaus
3fae40fbef Merge pull request '콘텐츠 상세 - 댓글 수 로직 답글 포함하지 않도록 수정' (#40) from test into main 
Reviewed-on: #40
 2023-10-05 02:49:22 +00:00
klaus
0745890af0 Merge pull request 'test' (#39) from test into main 
Reviewed-on: #39
 2023-10-04 03:24:41 +00:00
klaus
4abe1730a7 Merge pull request '관리자 라이브 정산 API - 인원 추가' (#38) from test into main 
Reviewed-on: #38
 2023-10-03 12:10:51 +00:00
klaus
626f0e6989 Merge pull request '관리자 - 라이브 정산 API 추가' (#37) from test into main 
Reviewed-on: #37
 2023-10-03 09:28:04 +00:00
klaus
9f42d9d173 Merge pull request '라이브 시작 알림 - 알림 받을 유저 조회에서 에러가 발생하는 버그 수정' (#36) from test into main 
Reviewed-on: #36
 2023-10-02 13:00:11 +00:00
klaus
f90a93c4bc Merge pull request '후원순위 - 유료라이브 입장 캔 반영' (#35) from test into main 
Reviewed-on: #35
 2023-09-27 14:57:27 +00:00
klaus
8000ad6c6a Merge pull request 'test' (#34) from test into main 
Reviewed-on: #34
 2023-09-27 06:49:21 +00:00
klaus
1f1f1bea1a Merge pull request 'test' (#33) from test into main 
Reviewed-on: #33
 2023-09-27 05:28:04 +00:00
klaus
d95460c7cd Merge pull request '닉네임 변경 가격 100 캔으로 변경' (#32) from test into main 
Reviewed-on: #32
 2023-09-22 07:01:27 +00:00
klaus
a3d93d4b08 Merge pull request 'test' (#31) from test into main 
Reviewed-on: #31
 2023-09-19 06:32:22 +00:00
klaus
07a92af982 Merge pull request '라이브 시작시간 4시간이 지나도 라이브를 시작하지 않은 경우 자동취소로직 추가' (#30) from test into main 
Reviewed-on: #30
 2023-09-12 14:09:37 +00:00
klaus
f4618877d4 Merge pull request '주문목록 - 크리에이터 닉네임 추가' (#29) from test into main 
Reviewed-on: #29
 2023-09-08 16:29:30 +00:00
klaus
2b914fd222 Merge pull request 'test' (#28) from test into main 
Reviewed-on: #28
 2023-09-02 16:12:08 +00:00
klaus
109e42a5a3 Merge pull request 'test' (#27) from test into main 
Reviewed-on: #27
 2023-08-31 08:37:42 +00:00
klaus
fa515ad39c Merge pull request '관리자 캔 충전내역 - 애플 인 앱 결제에 PG결제가 같이 나오던 버그 수정' (#26) from test into main 
Reviewed-on: #26
 2023-08-30 10:02:32 +00:00
klaus
f09673a795 Merge pull request 'test' (#25) from test into main 
Reviewed-on: #25
 2023-08-30 08:10:29 +00:00
klaus
f71536c614 Merge pull request 'test' (#24) from test into main 
Reviewed-on: #24
 2023-08-30 07:24:14 +00:00
klaus
7bdddc7ae8 Merge pull request '후원 전체보기 - 하단 랭킹에 콘텐츠 후원도 포함' (#23) from test into main 
Reviewed-on: #23
 2023-08-29 15:22:09 +00:00
klaus
aa8926a624 Merge pull request '후원 전체보기 - 상단 캔 현황 을 후원 캔만 반영하도록 수정' (#22) from test into main 
Reviewed-on: #22
 2023-08-29 14:53:44 +00:00
klaus
be71e59be2 Merge pull request '무료 콘텐츠를 못올리는 버그 수정' (#21) from test into main 
Reviewed-on: #21
 2023-08-29 13:32:13 +00:00
klaus
4d7753378f Merge pull request 'test' (#20) from test into main 
Reviewed-on: #20
 2023-08-29 07:33:57 +00:00
klaus
60257c4ef4 Merge pull request 'test' (#19) from test into main 
Reviewed-on: #19
 2023-08-28 08:54:08 +00:00
klaus
1e0b79bf62 Merge pull request 'test' (#18) from test into main 
Reviewed-on: #18
 2023-08-27 12:28:42 +00:00
klaus
6883434d0d Merge pull request '유저 관심사, 라이브 관심사 - 연령제한 설정 추가' (#17) from test into main 
Reviewed-on: #17
 2023-08-25 08:38:51 +00:00
klaus
eda2193e64 Merge pull request 'test' (#16) from test into main 
Reviewed-on: #16
 2023-08-25 07:50:55 +00:00
klaus
99bf829c88 Merge pull request '첫 충전 이벤트 - 본인인증한 전체 계정 중 첫 충전 시에만 첫충전 이벤트 적용' (#15) from test into main 
Reviewed-on: #15
 2023-08-24 16:26:54 +00:00
klaus
5feafe1b48 Merge pull request 'test' (#14) from test into main 
Reviewed-on: #14
 2023-08-24 14:54:37 +00:00
klaus
c9292b7d04 Merge pull request 'test' (#13) from test into main 
Reviewed-on: #13
 2023-08-23 14:05:00 +00:00
klaus
ae7e1a91c1 Merge pull request '캔 충전로직 수정' (#12) from test into main 
Reviewed-on: #12
 2023-08-21 15:12:44 +00:00
klaus
3e1887e0d1 Merge pull request 'test' (#11) from test into main 
Reviewed-on: #11
 2023-08-21 13:19:03 +00:00
klaus
474646db47 Merge pull request '스피커 최대 10 -> 5명으로 수정' (#10) from test into main 
Reviewed-on: #10
 2023-08-20 20:40:23 +00:00
klaus
56f7b6c449 Merge pull request 'test' (#9) from test into main 
Reviewed-on: #9
 2023-08-20 19:22:23 +00:00
klaus
76b2b5f7e3 Merge pull request '캔 사용내역 - 후원을 콘텐츠 후원, 라이브 후원으로 분리' (#8) from test into main 
Reviewed-on: #8
 2023-08-20 15:46:30 +00:00
klaus
e918d809eb Merge pull request '충전내역 - 관리자 지급 추가' (#7) from test into main 
Reviewed-on: #7
 2023-08-20 15:08:35 +00:00
klaus
7af059e543 Merge pull request 'test' (#6) from test into main 
Reviewed-on: #6
 2023-08-20 14:45:39 +00:00
klaus
897726e1ec Merge pull request 'test' (#5) from test into main 
Reviewed-on: #5
 2023-08-19 17:47:16 +00:00
klaus
8b98a2dd07 Merge pull request '비밀번호 찾기 API 추가' (#4) from test into main 
Reviewed-on: #4
 2023-08-19 07:05:17 +00:00
klaus
cca75420f0 Merge pull request '큐레이션 - 조건 추가' (#3) from test into main 
Reviewed-on: #3
 2023-08-18 14:07:34 +00:00
klaus
86c627ed1d Merge pull request 'test' (#2) from test into main 
Reviewed-on: #2
 2023-08-18 12:54:09 +00:00
klaus
d55514e3a7 Merge pull request 'test' (#1) from test into main 
Reviewed-on: #1
 2023-08-16 02:30:36 +00:00
Expand all files Collapse all files

Diff Content Not Available