Commits · apply_ejs · 김윤지 / Probability Death · GitLab

Create Merge Request

13 Dec, 2018 3 commits
- ejs errrorrrrrr · 036e2a64
  036e2a64
  
  조민지 authored 2018-12-14 02:46:41 +0900
- first try · 7882825a
  7882825a Browse Files
  
  조민지 authored 2018-12-14 00:34:45 +0900
- 그래프 페이지 디자인 완료 · 0541b9be
  0541b9be
  
  조민지 authored 2018-12-13 23:48:45 +0900
12 Dec, 2018 5 commits
- footer 추가 · 84723cc2
  84723cc2 Browse Files
  
  조민지 authored 2018-12-12 17:04:51 +0900
- 폰트 적용 · 2d473fe8
  2d473fe8 Browse Files
  
  조민지 authored 2018-12-12 17:03:38 +0900
- 배경디자인, submit form · 40d6d231
  40d6d231
  
  조민지 authored 2018-12-12 17:02:22 +0900
- Merge branch 'front_socket' into developing · 7433c87b
  7433c87b Browse Files
  
  조민지 authored 2018-12-12 14:18:57 +0900
- 소켓에서 받을 때 마다 AddPoint · 3c719ed4
  3c719ed4 Browse Files
  
  조민지 authored 2018-12-12 14:12:13 +0900
11 Dec, 2018 12 commits
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  create main page , added death cause => name , birth · f7683df1
  f7683df1
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-12 01:16:42 +0900
- data push · 6bdabf60
  6bdabf60 Browse Files
  
  조민지 authored 2018-12-11 23:09:42 +0900
- 스크립트 하나로 합치기 · 58a2b7f8
  58a2b7f8 Browse Files
  
  조민지 authored 2018-12-11 22:58:37 +0900
- Merge branch 'al_new' into 'developing' · de17b8ba ...
  de17b8ba Browse Files
```
fix error on rendering part



See merge request !9
```
  배희수 authored 2018-12-11 19:23:47 +0900
- 렌더링 오류 수정 · a1600051
  a1600051 Browse Files
  
  배희수 authored 2018-12-11 19:22:22 +0900
- Merge branch 'al_new' into 'developing' · 91daa8ed ...
  91daa8ed Browse Files
```
merge 'al_new' to 'developing'



See merge request !8
```
  배희수 authored 2018-12-11 16:36:21 +0900
- 렌더링 파트 알고리즘 수정 · 567b8445
  567b8445 Browse Files
  
  배희수 authored 2018-12-11 16:35:23 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  socket io add · 6c9b906a
  6c9b906a Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-11 16:17:50 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  Merge branch · 5ba60943
  5ba60943 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-11 16:16:23 +0900
- 반복문 수정 · 948b9057
  948b9057 Browse Files
  
  조민지 authored 2018-12-11 16:14:01 +0900
- 변수에 var붙여주기 for MacBook · 87fa9774
  87fa9774 Browse Files
  
  조민지 authored 2018-12-11 15:53:03 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  리팩토링 => socket 부분 간소화 · 04199e6f
  04199e6f Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-11 15:01:00 +0900
09 Dec, 2018 20 commits
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  The API call result was not normally contained in the (info) object because node… · f3174baf ...
  f3174baf Browse Files
```
…js processed the function asynchronously. So we used the following grammar rules, async, await, and changed it to call api synchronously. Good operation
```
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-10 00:58:25 +0900
- 렌더링 파트 오류 수정 · 58349bda
  58349bda Browse Files
  
  배희수 authored 2018-12-09 22:34:43 +0900
- Resolve error · 976b4672
  976b4672 Browse Files
  
  배희수 authored 2018-12-09 22:05:16 +0900
- loop revised · 1ea900a3
  1ea900a3 Browse Files
  
  조민지 authored 2018-12-09 21:51:05 +0900
- loop revised · 5d57affe
  5d57affe Browse Files
  
  조민지 authored 2018-12-09 21:47:30 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  Merge branch 'socket_db' into developing · 0f5edf63
  0f5edf63 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 21:43:09 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  no meaning , just test · a62d17fb
  a62d17fb Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 21:42:43 +0900
- $DESKTOP-PC6TBNS\강환석씨's avatar$
  
  no meaning commit · 0c58aa02
  0c58aa02 Browse Files
  
  DESKTOP-PC6TBNS\강환석씨 authored 2018-12-09 21:29:49 +0900
- ejs 초기값 받아오기 · 625e6e58
  625e6e58 Browse Files
  
  조민지 authored 2018-12-09 21:25:55 +0900
- $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