Commit Graph

1280 Commits

Author SHA1 Message Date
손승우
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
손승우
fe17ace2db update: update dashboard.service.ts 2023-02-02 22:31:57 +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
SA K
e018dea72e Merge pull request #404 from sakang07/feature
Modify footer
2022-12-19 18:01:41 +09:00
SA K
454a6115f7 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-19 14:59:09 +09:00
godyuo
5e12b8e375 Merge pull request #403 from godyuo/feature
fix: fix sentence
2022-12-19 14:42:38 +09:00
손승우
9cc9ae0404 Merge remote-tracking branch 'origin/feature' into feature 2022-12-19 14:41:57 +09:00
손승우
a7c986fc52 fix: fix sentence 2022-12-19 14:41:50 +09:00
SA K
d3e673186a [FE] footer link floating in a new window 2022-12-19 11:16:25 +09:00
SA K
04c0715552 Merge pull request #402 from sakang07/feature
Remove token from local storage when refresh token expires
2022-12-19 11:05:40 +09:00
SA K
0d8e807f53 [FE-auth] Remove token from local storage when refresh token expires 2022-12-19 11:04:12 +09:00
godyuo
7657fdc790 Merge pull request #401 from godyuo/feature
fix: fix acessToken
2022-12-16 21:10:36 +09:00
손승우
eb14caa2fd Merge remote-tracking branch 'origin/feature' into feature 2022-12-16 21:10:02 +09:00
손승우
daf29a975f fix: fix AccessToken 2022-12-16 21:09:50 +09:00
SA K
09243a0873 Merge pull request #400 from sakang07/feature
Fix issues
2022-12-15 18:53:20 +09:00
SA K
f10e925411 [FE-share] Separate the invalid state and the expired state 2022-12-15 18:51:43 +09:00
SA K
fa014b8643 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 17:57:27 +09:00
godyuo
f85435088b Merge pull request #399 from godyuo/feature
update: update endDate
2022-12-15 17:57:11 +09:00
손승우
18547a311b update: update endDate 2022-12-15 17:56:51 +09:00
SA K
ee5287bcbc [FE-data] Encrypt password 2022-12-15 17:54:33 +09:00
SA K
ebe86ec76d Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 16:48:07 +09:00
godyuo
158691e14b Merge pull request #398 from godyuo/feature
update: update statusMessage
2022-12-15 16:47:55 +09:00
손승우
d28a86d2df update: update statusMessage 2022-12-15 16:46:58 +09:00
SA K
6ed9a5e966 Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 16:19:41 +09:00
godyuo
c6976e17d5 Merge pull request #397 from godyuo/feature
style: style statusCode
2022-12-15 16:12:57 +09:00
godyuo
c436e8206d Merge branch 'vanillabrain:feature' into feature 2022-12-15 16:12:08 +09:00
SA K
10d2b3fcc9 [FE-share] Change logo link to landing page 2022-12-15 16:11:47 +09:00
손승우
2657f3b76c style: style statusCode 2022-12-15 16:11:42 +09:00
SA K
a2494a8733 [FE-router] Remove error alert on first connection 2022-12-15 15:53:23 +09:00
godyuo
f4f973cf4f Merge pull request #396 from godyuo/feature
fix: fix DateError
2022-12-15 15:52:36 +09:00
손승우
351a601762 Merge remote-tracking branch 'origin/feature' into feature 2022-12-15 15:51:55 +09:00
손승우
4e878eb3ea fix: fix DateError 2022-12-15 15:51:23 +09:00
SA K
20f7f2ec46 Merge pull request #395 from sakang07/feature
Feature
2022-12-15 15:06:48 +09:00
SA K
8dd76f9d3d Merge branch 'feature' of https://github.com/vanillabrain/vanillameta into feature 2022-12-15 14:08:33 +09:00
godyuo
f93306298c Merge pull request #394 from godyuo/feature
update: update endDate
2022-12-15 14:07:11 +09:00
손승우
d61425279c Merge remote-tracking branch 'origin/feature' into feature 2022-12-15 14:06:40 +09:00