1313 Commits

Author SHA1 Message Date
godyuo
6f3d09c43e Merge pull request #417 from godyuo/develop
update typeorm-seeding
2023-04-20 12:12:27 +09:00
godyuo
ef4610a11f Merge branch 'vanillabrain:develop' into develop 2023-04-20 12:10:16 +09:00
손승우
6fa38b1463 update: seed package 2023-04-19 10:48:00 +09:00
Dosun Yun
23d9b232c8 Merge branch 'feature' into develop v0.4 2023-03-04 09:45:23 +09:00
Dosun Yun
6d295497d9 refactoring modules.xml 2023-03-04 09:45:10 +09:00
godyuo
1253ac5f08 Update .env.ci 2023-03-02 11:54:48 +09:00
godyuo
745883a23b Merge pull request #416 from godyuo/develop
update path
2023-03-02 11:45:39 +09:00
손승우
775d0e55e6 update path 2023-03-02 11:43:24 +09:00
godyuo
6dad88affe Update .env.ci 2023-03-02 10:57:07 +09:00
SA K
d8c5466cc1 Merge pull request #415 from sakang07/develop
Add series label option to chart
2023-02-27 10:53:17 +09:00
SA K
0b43978d6a [FE-chart] Add series label option at Mixed chart #413 2023-02-25 16:48:54 +09:00
SA K
e9f72b7290 [FE-chart] Add series label option at Radar, Gauge chart #413 2023-02-24 10:53:11 +09:00
SA K
3c58d35ed5 Merge pull request #414 from sakang07/develop
Fix bugs and Add features
2023-02-23 20:54:59 +09:00
SA K
e9abc4b49f [FE-chart] Add series label option #413 2023-02-23 16:19:52 +09:00
SA K
750916d49c [FE-chart] Add the option to hide the title to the numeric board #412 2023-02-23 15:36:13 +09:00
SA K
51ae590182 [FE-widget] Fix a widget creation page title bug #411 2023-02-23 14:42:21 +09:00
godyuo
c1495716b6 Merge pull request #410 from vanillabrain/feature
Feature > develop
2023-02-21 18:29:33 +09:00
godyuo
b7384113c8 Update README.md 2023-02-17 19:21:34 +09:00
godyuo
fbb1fc35fc Update README.md 2023-02-17 19:20:07 +09:00
godyuo
c0cac23f98 Merge pull request #409 from godyuo/develop_sqlite
Develop sqlite setting
2023-02-17 18:15:15 +09:00
godyuo
dbedadca7e Update README.md 2023-02-17 18:14:39 +09:00
손승우
427e858786 Merge remote-tracking branch 'origin/develop_sqlite' into develop_sqlite 2023-02-17 18:12:08 +09:00
손승우
053b8ed28f add: changInfo crypto 2023-02-17 18:12:01 +09:00
godyuo
273a2594a2 Update README.md 2023-02-17 17:15:51 +09:00
godyuo
0e302a2d68 Update README.md 2023-02-17 14:28:59 +09:00
손승우
39aac2dea5 add: cryptoLogin 2023-02-17 14:27:21 +09:00
godyuo
04e7d835d6 Update README.md 2023-02-17 13:21:19 +09:00
godyuo
b062f06cb9 Update README.md 2023-02-17 13:18:24 +09:00
손승우
cf0d8a36fd add: seedLibrary 2023-02-17 12:27:50 +09:00
손승우
2e96c3a8dc add: add seedData 2023-02-16 19:08:13 +09:00
손승우
469362c664 update: update widgetQuery 2023-02-16 11:05:22 +09:00
손승우
62815a1036 update: update sqlite.db 2023-02-15 18:42:55 +09:00
손승우
0ba8fcdccb update: update shareToken entity 2023-02-15 17:03:43 +09:00
손승우
2a472a5e9e update: default setting 2023-02-15 15:27:01 +09:00
손승우
ac8f2735c3 Merge remote-tracking branch 'origin/develop_sqlite' into develop_sqlite 2023-02-15 15:09:32 +09:00
손승우
07a34550c7 add: default db 추가 2023-02-15 15:09:26 +09:00
godyuo
0d2fe924b9 Merge branch 'vanillabrain:main' into develop_sqlite 2023-02-15 14:35:15 +09:00
손승우
68083e9aa3 Merge remote-tracking branch 'origin/develop_backend' into develop_sqlite
# Conflicts:
#	backend-api/.env.sample.dev
#	backend-api/Dockerfile
#	backend-api/docker-compose.yml
#	backend-api/package-lock.json
#	backend-api/src/app.module.ts
#	backend-api/src/database/connection/connection.service.ts
#	backend-api/src/database/database.controller.ts
#	backend-api/src/database/database.service.ts
#	backend-api/src/database/dto/create-database.dto.ts
#	backend-api/src/database/entities/database.entity.ts
#	backend-api/src/main.ts
2023-02-15 11:27:17 +09:00
손승우
7988db8d7f update: entity 변경 2023-02-15 11:20:50 +09:00
godyuo
b1a433d83a Merge pull request #408 from godyuo/feature
update: update dashboard.service.ts
2023-02-02 22:33:03 +09:00
손승우
fe17ace2db update: update dashboard.service.ts 2023-02-02 22:31:57 +09:00
godyuo
50da9b2822 Merge pull request #407 from godyuo/feature
update: update docker-compose clear
2023-01-02 18:18:27 +09:00
손승우
762fbef35a Merge remote-tracking branch 'origin/feature' into feature 2023-01-02 18:17:48 +09:00
손승우
e90e42c134 update: update docker-compose clear 2023-01-02 18:17:40 +09:00
godyuo
26e57227b0 Merge pull request #406 from godyuo/feature
fix: fix docker-compose local dump
2022-12-23 18:22:36 +09:00
손승우
4a3d19a3ec Merge remote-tracking branch 'origin/feature' into feature 2022-12-23 18:21:43 +09:00
손승우
c5c7a020af fix: fix docker-compose local dump 2022-12-23 18:21:04 +09:00
godyuo
d27a97ccfd Merge pull request #405 from godyuo/feature
add: add docker-compose
2022-12-21 19:17:27 +09:00
손승우
2ccfcfb0ba Merge remote-tracking branch 'origin/feature' into feature 2022-12-21 19:16:44 +09:00
손승우
1b623d5257 add: add docker-compose 2022-12-21 19:16:19 +09:00