Commit Graph

703 Commits

Author SHA1 Message Date
SA K
1e64d291dc Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-28 16:32:51 +09:00
SA K
a9eed1f38d [FE-widget/data] Add missing db icon and correct broken layout #185 2022-10-28 16:32:30 +09:00
SA K
6308ff3b85 Merge pull request #187 from sakang07/develop
Develop
2022-10-28 13:37:30 +09:00
SA K
352a36b70e Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-28 13:35:56 +09:00
SA K
e8358ce061 Edit modules.xml 2022-10-28 13:35:12 +09:00
SA K
6ef9a65007 Merge pull request #186 from sakang07/develop
Add widget icons
2022-10-28 12:16:46 +09:00
SA K
d86fe4ba40 [FE-widget] Add widget icons #185 2022-10-28 12:15:29 +09:00
SA K
fe0bc5b57e Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-28 11:12:05 +09:00
SA K
60e8edc6a4 [FE-layout] Add a link to breadcrumbs 2022-10-28 11:11:51 +09:00
godyuo
c5f0aa2204 Merge pull request #183 from godyuo/develop
update res dataType
2022-10-28 11:07:59 +09:00
손승우
e84df7fc20 update res dataType 2022-10-28 11:07:13 +09:00
SA K
b449290de0 Merge pull request #182 from sakang07/develop
widget design
2022-10-27 20:58:14 +09:00
SA K
4f62807dc9 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-27 20:56:11 +09:00
Dosun Yun
aa8331b35e [BE-setup] Add ci build file 2022-10-27 18:57:40 +09:00
HeeseonYoon
3cb825e5e8 Merge pull request #181 from yathoo88/develop_backend_yhs
[BE-template] Modify Recommend template algorithm _ing
2022-10-27 18:51:14 +09:00
HeeseonYoon
64d98d3f52 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-10-27 18:49:39 +09:00
HeeseonYoon
71eeba8624 [BE-template] Modify Recommend template algorithm _ing 2022-10-27 18:49:30 +09:00
SA K
7579358c3b Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-27 18:49:26 +09:00
SA K
797a94e2b4 [FE-Widget] Fix error of the score board #177 2022-10-27 18:49:05 +09:00
Dosun Yun
2d91690b66 [BE-setup] Add ci build file 2022-10-27 18:48:41 +09:00
Dosun Yun
d882840bbd Merge remote-tracking branch 'upstream/develop' into develop 2022-10-27 18:45:30 +09:00
Dosun Yun
b66c6a2421 [BE-setup] Add ci build file 2022-10-27 18:45:19 +09:00
SA K
a3c6cb2502 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-27 18:03:04 +09:00
SA K
a8cea4e3b0 [FE-Widget] Fix error with incorrect title output at widget modify page #164 2022-10-27 18:02:55 +09:00
Jeon Jae Yeoul
31f59c8e4b Merge pull request #180 from jyjeun/develop
Develop
2022-10-27 17:57:37 +09:00
jjy
c2a234ca37 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop_jyjeun 2022-10-27 17:56:48 +09:00
jjy
6d5cb8b7ed dialog 크기 적용 수정 2022-10-27 17:56:04 +09:00
SA K
714b2b5c6b Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-27 17:46:39 +09:00
Dosun Yun
a2d06f8fec Merge remote-tracking branch 'upstream/develop' into develop 2022-10-27 17:26:10 +09:00
Dosun Yun
83e083b5ea [BE-setup] Remove validation pipe from serverless.ts 2022-10-27 17:22:29 +09:00
SA K
2e4db40ef4 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-27 17:13:07 +09:00
HeeseonYoon
23d4450032 Merge pull request #179 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-10-27 17:11:06 +09:00
HeeseonYoon
344e250155 Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-10-27 17:10:05 +09:00
HeeseonYoon
584ef5dec2 [BE-setting] Modify dev.env setting 2022-10-27 17:09:52 +09:00
SA K
3cdea8af0d Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-27 16:57:32 +09:00
Jeon Jae Yeoul
b33a338ca9 Merge pull request #178 from jyjeun/develop
template 선택상태 수정
2022-10-27 16:57:03 +09:00
jjy
c10a0cefb1 template 선택상태 수정 2022-10-27 16:56:32 +09:00
HeeseonYoon
cf6ba02fcb Merge pull request #176 from yathoo88/develop_backend_yhs
Develop backend yhs
2022-10-27 16:55:30 +09:00
HeeseonYoon
22101a1b1f Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs 2022-10-27 16:54:32 +09:00
David Yun
94bab936dd Merge pull request #175 from drumcap/develop_backend_yds
cors origin 업데이트
2022-10-27 16:54:18 +09:00
HeeseonYoon
cc7901a322 [BE-widget] Modify get WidgetList service response - add component title, description property #174 2022-10-27 16:53:47 +09:00
Dosun Yun
bdd51d8e1e Merge remote-tracking branch 'upstream/develop' into develop_backend_yds 2022-10-27 16:52:35 +09:00
Dosun Yun
dbc10f0c0f [BE-setup] Update CORS_ORIGIN to serverless.yml 2022-10-27 16:52:11 +09:00
SA K
79c06b822d Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-27 16:51:21 +09:00
SA K
7e1aadd15d [FE-Widget] Fix error with incorrect title output at widget modify page: step 1 #164 2022-10-27 16:51:13 +09:00
David Yun
7511ceed09 Merge pull request #173 from drumcap/develop_backend_yds
add origin setup
2022-10-27 16:06:16 +09:00
Dosun Yun
94d85b2da9 [FE-setup] Update build script to package.json 2022-10-27 16:01:35 +09:00
Dosun Yun
aa9fbe02a1 [FE-setup] Update cors origin in serverless.ts 2022-10-27 15:58:05 +09:00
David Yun
47800536cb Merge pull request #172 from drumcap/develop_backend_yds
Update .env settings
2022-10-27 15:49:07 +09:00
Dosun Yun
9f1b251af4 [FE-Setup] Update dev-api to .env.development 2022-10-27 15:46:57 +09:00