Commits · dd1433904ccff97aa6e0ab2064d859485c19afc0 · MotherProject / Probability Death · GitLab

09 Dec, 2018 24 commits
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  ejs file route fixed · dd143390
  dd143390 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 20:28:06 +0900
- Merge branch 'algorithm' into 'developing' · ec442ae7 ...
  ec442ae7 Browse Files
```
merge 'algorithm' to 'developing'



See merge request !7
```
  배희수 authored 2018-12-09 20:15:47 +0900
- 렌더링 알고리즘 마무리 · 24e0b661
  24e0b661 Browse Files
  
  배희수 authored 2018-12-09 20:15:11 +0900
- Merge branch 'chart' into 'developing' · 47b6ed4f ...
  47b6ed4f Browse Files
```
ejs



See merge request !6
```
  조민지 authored 2018-12-09 20:14:22 +0900
- ejs · dd2978c7
  dd2978c7 Browse Files
  
  조민지 authored 2018-12-09 20:13:22 +0900
- Merge branch 'chart' into 'developing' · 9ca1929b ...
  9ca1929b Browse Files
```
Chart



See merge request !5
```
  조민지 authored 2018-12-09 19:45:48 +0900
- page error revised · 34471c48
  34471c48 Browse Files
  
  조민지 authored 2018-12-09 19:44:26 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  Merge branch 'developing' of http://khuhub.khu.ac.kr/2017104029/2018_2_project into socket_db · 75bb7f58
  75bb7f58 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 18:50:13 +0900
- Merge branch 'algorithm' into 'developing' · 9ac94a70 ...
  9ac94a70 Browse Files
```
merge 'algorithm' to 'developing'



See merge request !4
```
  배희수 authored 2018-12-09 18:49:39 +0900
- 렌더링 알고리즘 구현 · 3c4939a1
  3c4939a1 Browse Files
  
  배희수 authored 2018-12-09 18:49:01 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  db insertion complete · 8d026b13
  8d026b13 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 18:40:22 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  event divergence to client · 82ea2e54
  82ea2e54 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 18:20:51 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  api calling and deathProb calculate complete · 07577183
  07577183 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 18:03:36 +0900
- Merge branch 'developing' of http://khuhub.khu.ac.kr/2017104029/2018_2_project into chart · d483d657
  d483d657 Browse Files
  
  조민지 authored 2018-12-09 16:42:10 +0900
- Merge branch 'algorithm' into 'developing' · 2b8f3aae ...
  2b8f3aae Browse Files
```
merge 'algorithm' to 'developing'



See merge request !3
```
  배희수 authored 2018-12-09 16:41:51 +0900
- Merge branch 'developing' into 'algorithm' · 66a5e1af ...
  66a5e1af Browse Files
```
# Conflicts:
#   package-lock.json
```
  배희수 authored 2018-12-09 16:41:48 +0900
- Merge branch 'algorithm' into 'developing' · 7e1cbd3e ...
  7e1cbd3e Browse Files
```
merge 'algorithm' to 'developing'



See merge request !2
```
  배희수 authored 2018-12-09 16:36:27 +0900
- 패키지 파일 오류 및 DB 쿼리문/변수명 수정 · b733ef5c
  b733ef5c
  
  배희수 authored 2018-12-09 16:34:22 +0900
- 디렉토리 정리 · 3796297e
  3796297e
  
  조민지 authored 2018-12-09 16:31:22 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  graph view update · a136e545
  a136e545 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 16:26:30 +0900
- little revise · 9ca052da
  9ca052da Browse Files
  
  조민지 authored 2018-12-09 16:22:06 +0900
- Merge branch 'chart' into 'developing' · bb99d368 ...
  bb99d368 Browse Files
```
Chart Update



See merge request !1
```
  조민지 authored 2018-12-09 16:16:31 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  api calling advanced · 89cdef69
  89cdef69 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 16:12:25 +0900
- 웹페이지 구조 완성 · b346d399
  b346d399 Browse Files
  
  조민지 authored 2018-12-09 16:08:06 +0900
08 Dec, 2018 3 commits
- db 연동 쿼리문 작성 및 변수 초기화 · f107c0cb
  f107c0cb Browse Files
  
  배희수 authored 2018-12-08 19:09:03 +0900
- y축이 두개인 그래프 · 0150776f
  0150776f Browse Files
  
  조민지 authored 2018-12-08 11:09:49 +0900
- 3초마다 업데이트되는 그래프 · f4f6408f
  f4f6408f Browse Files
  
  조민지 authored 2018-12-08 11:08:45 +0900
06 Dec, 2018 13 commits
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  충돌해결 · f203460e
  f203460e Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-06 16:45:18 +0900
- MySQL 세션 파트 삭제 · 0b49b6f3
  0b49b6f3 Browse Files
  
  배희수 authored 2018-12-06 16:34:29 +0900
- mysql 개발 환경 구축 및 생활 기상 지수/사망확률 변수 정의 · 3ac172ee
  3ac172ee Browse Files
  
  배희수 authored 2018-12-06 16:34:28 +0900
- 차트에 push/pop 가능 · 7c8168b3
  7c8168b3 Browse Files
  
  조민지 authored 2018-12-06 16:16:02 +0900
- example api call file add , requesting api part advanced(functionalize) · eef3c7c7
  eef3c7c7 Browse Files
  
  unknown authored 2018-12-06 14:26:20 +0900
- request several apis in socket connection · 34c86460
  34c86460 Browse Files
  
  unknown authored 2018-12-06 14:13:04 +0900
- ignore keys file · 0924359f
  0924359f Browse Files
  
  unknown authored 2018-12-06 13:13:49 +0900
- git ignore 오작동으로 다시 커밋.. · 0ac51626
  0ac51626 Browse Files
  
  unknown authored 2018-12-06 12:15:30 +0900
- key gitignore · bee3cdc5
  bee3cdc5 Browse Files
  
  unknown authored 2018-12-06 12:09:08 +0900
- MySQL 세션 파트 삭제 · 7a24a469
  7a24a469 Browse Files
  
  배희수 authored 2018-12-06 12:07:19 +0900
- merge keys in one folder · 959429ee
  959429ee Browse Files
  
  unknown authored 2018-12-06 12:05:52 +0900
- leaved db_option re-commit · a7f3a653
  a7f3a653 Browse Files
  
  unknown authored 2018-12-06 12:01:57 +0900
- db call modulize · 3b09d838
  3b09d838 Browse Files
  
  unknown authored 2018-12-06 11:51:50 +0900