Commit Graph

676 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dosun Yun
921aa6345e [BE-SLS] Add Properties to serverless.yml 2022-10-27 15:45:30 +09:00
HeeseonYoon
827ad84b04 Merge pull request #171 from yathoo88/develop_backend_yhs
[BE-database] Fixed mysql data select service result columnType # 170
2022-10-27 13:32:28 +09:00
HeeseonYoon
1b0bfc9923 [BE-database] Fixed mysql data select service result columnType 2022-10-27 13:31:13 +09:00
David Yun
6e56f3ff70 Merge pull request #169 from drumcap/develop_backend_yds
Update Serverless Setting for Nest.js Project
2022-10-27 11:29:03 +09:00
Dosun Yun
7440ccd62a [BE-SLS] Update serverless.yml 2022-10-27 11:26:36 +09:00
HeeseonYoon
88c5f48efa Merge pull request #162 from yathoo88/develop_backend_yhs
[BE-widget] Modify get WidgetList service response - add component icon property #160
2022-10-27 11:18:07 +09:00
HeeseonYoon
309af3c3b9 [BE-widget] Modify get WidgetList service response - add component icon property #160 2022-10-27 11:17:23 +09:00
Dosun Yun
cade517676 [backend-api] Add lambda layer libs 2022-10-27 06:08:32 +09:00
Dosun Yun
609594eae8 Merge remote-tracking branch 'upstream/develop' into develop_backend_yds
# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml
2022-10-27 04:45:45 +09:00
Jeon Jae Yeoul
39fd7dc646 Merge pull request #159 from jyjeun/develop
레이아웃 작업중
2022-10-27 03:22:16 +09:00
jyjeun
1c2971f388 레이아웃 작업중 2022-10-27 03:21:38 +09:00
Sangwon Lee
e251ef3718 Merge pull request #158 from e8133/develop
Modify router
2022-10-27 01:09:46 +09:00
이상원
731fdedb27 Modify router 2022-10-27 00:18:47 +09:00
Sangwon Lee
d1b239d5d4 Merge pull request #157 from e8133/develop
Modify recommend Dashboard creaetion page
2022-10-26 22:05:01 +09:00
ivy
3b77cf7d43 Modify component style 2022-10-26 22:02:46 +09:00
ivy
87a558c1a0 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-26 21:16:54 +09:00
SA K
5df5321343 Merge pull request #156 from sakang07/develop
Add icons at widget list page
2022-10-26 21:15:37 +09:00
SA K
5f8f31d3b3 [FE-Widget] Add icons at widget list page 2022-10-26 21:14:49 +09:00
ivy
ecf670db02 Modify alert in dashboard page 2022-10-26 20:26:57 +09:00
ivy
b71f1cc683 Modify recommend Dashboard creaetion page 2022-10-26 20:04:53 +09:00
ivy
387ea95ef2 Merge branch 'develop' of https://github.com/e8133/vanillameta_ivy into develop
 Conflicts:
	frontend-web/src/pages/Widget/index.tsx
2022-10-26 18:56:59 +09:00
godyuo
56d2729004 Merge pull request #155 from godyuo/develop
add mariadb connect
2022-10-26 18:03:36 +09:00