mindol1004/vanillameta
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
641 Commits 3 Branches 4 Tags
cade517676dc24dc151458af30b32fdae30a9780
Commit Graph

641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lsw
2011d0d62e Modify widget button 2022-10-26 18:02:40 +09:00
godyuo
05b438c02b Merge branch 'vanillabrain:develop' into develop 2022-10-26 18:01:57 +09:00
SA K
45797880d4 Merge pull request #153 from sakang07/develop 
Modify the widget view, modify, create page
 2022-10-26 17:41:55 +09:00
SA K
e3dcd66750 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-26 17:37:42 +09:00
SA K
7711186fb1 [FE-Widget] Modify the widget view screen to resemble the dashboard view screen 2022-10-26 17:37:20 +09:00
lsw
c8741b625f Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-26 17:35:53 +09:00
lsw
c2dbfbe12b Modify dashboard page 2022-10-26 17:21:01 +09:00
Sangwon Lee
2e7411b743 Merge pull request #152 from e8133/develop 
Modify dashboard template page
 2022-10-26 17:04:01 +09:00
lsw
dd96ddba1b Modify dashboard template 2022-10-26 17:02:54 +09:00
손승우
a8ab8216c5 add mariadb connect 2022-10-26 16:33:39 +09:00
SA K
eb6c668e62 [FE-Widget] Modify design of widget create page 2022-10-26 16:11:16 +09:00
lsw
7b73933a86 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-26 15:04:52 +09:00
lsw
3eceb6e468 Modify Database Form 2022-10-26 15:04:41 +09:00
SA K
61bc9c7c66 [FE-Widget] Modify design of widget setting of chart attribute step 2022-10-26 12:15:59 +09:00
HeeseonYoon
b86c754b4f Merge pull request #151 from yathoo88/develop_backend_yhs 
[BE-database] Modify query execute mysql
 2022-10-26 10:43:21 +09:00
HeeseonYoon
e9c211f3fd [BE-database] Modify query execute mysql 2022-10-26 10:42:24 +09:00
Jeon Jae Yeoul
a470163290 Merge pull request #150 from jyjeun/develop 
- 스타일 적용중
 2022-10-26 02:47:29 +09:00
jyjeun
8ccd918018 - 스타일 적용중 2022-10-26 02:46:36 +09:00
jyjeun
d43faf38cd Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop_jyjeun 
 Conflicts:
	frontend-web/src/components/BoardListItem.tsx
 2022-10-26 02:45:17 +09:00
jyjeun
3514f94d11 - 스타일 적용중 2022-10-26 02:36:44 +09:00
Sangwon Lee
df77fcc74f Merge pull request #149 from e8133/develop 
Fix bug a tag in a tag
 2022-10-26 00:59:40 +09:00
ivy
430cdeceda Fix bug a tag in a tag 2022-10-26 00:55:13 +09:00
Sangwon Lee
3855863d39 Merge pull request #148 from e8133/develop 
Add custom autocomplete to query editor
 2022-10-26 00:32:52 +09:00
ivy
3df64d38d2 Add custom autocomplete to query editor 2022-10-26 00:31:33 +09:00
ivy
301fc13255 Modify layout 2022-10-25 23:53:43 +09:00
ivy
860ae5b8fe Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 
 Conflicts:
	frontend-web/src/pages/Widget/WidgetCreate/WidgetAttributeSelect.tsx
	frontend-web/src/pages/Widget/WidgetCreate/index.tsx
 2022-10-25 22:49:21 +09:00
ivy
a1bea2fe80 Add loading indicator calling service 2022-10-25 22:33:48 +09:00
SA K
07d7534d3d Merge pull request #147 from sakang07/develop 
Fix errors
 2022-10-25 22:02:35 +09:00
SA K
c61256f0e5 [FE-Chart] Add angle-left.svg 2022-10-25 22:00:18 +09:00
HeeseonYoon
2ad8d9dd94 Merge pull request #146 from yathoo88/develop_backend_yhs 
[BE-database] Modify query execute case (mysql, mysql2)
 2022-10-25 21:59:48 +09:00
HeeseonYoon
74067fb921 [BE-database] Modify query execute case (mysql, mysql2) 2022-10-25 21:58:13 +09:00
SA K
79faa7af58 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-25 21:58:03 +09:00
Jeon Jae Yeoul
f63918f8a5 Merge pull request #145 from jyjeun/develop 
- 스타일 적용중
 2022-10-25 21:49:16 +09:00
jyjeun
91083d131f - 스타일 적용중 2022-10-25 21:48:36 +09:00
SA K
b319a8a921 Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop 2022-10-25 20:54:17 +09:00