Commits · 9e7bf1e5ca4f292b6a7c498f1d1122a1d25e5abc · bluejoyq / searchGuide

09 Dec, 2019 10 commits
- conflict problem solved · 9e7bf1e5
  9e7bf1e5 Browse Files
  
  김서영 authored 2019-12-09 23:48:16 +0900
- update design3 · 952c6f95
  952c6f95 Browse Files
  
  김서영 authored 2019-12-09 23:34:00 +0900
- rate line add · 32f2a1ca
  32f2a1ca Browse Files
  
  bluejoyq authored 2019-12-09 23:13:48 +0900
- merge complete really · b3458e1f
  b3458e1f Browse Files
  
  bluejoyq authored 2019-12-09 23:09:09 +0900
- pie chart · e2d40125
  e2d40125 Browse Files
  
  김서영 authored 2019-12-09 23:01:15 +0900
- .expo 폴더 좀 올리지마라!!!!! · 88098c91
  88098c91 Browse Files
  
  bluejoyq authored 2019-12-09 22:59:12 +0900
- hidden error! · 46a9d0c4
  46a9d0c4 Browse Files
  
  bluejoyq authored 2019-12-09 22:56:44 +0900
- Merge branch 'master' into 2018102169/searchGuide-design2 · 86b8c027 ...
  86b8c027 Browse Files
```
# Conflicts:
#	searchGuide/.expo/packager-info.json
#	searchGuide/.expo/settings.json
#	searchGuide/app.json
#	searchGuide/components/PromptSearch/PromptSearch.js
#	searchGuide/components/RateBar/RateBar.js
#	searchGuide/components/RateLine/RateLine.js
#	searchGuide/components/RateMessage/RateMessage.js
#	searchGuide/components/RateSentence/RateSentence.js
```
  bluejoyq authored 2019-12-09 22:50:36 +0900
- change rate card flex · 8016738c
  8016738c Browse Files
  
  김서영 authored 2019-12-09 11:36:47 +0900
- flex · 000fd662
  000fd662 Browse Files
  
  김서영 authored 2019-12-09 11:21:05 +0900
08 Dec, 2019 8 commits
- delete expo folder · eeff34a9
  eeff34a9 Browse Files
  
  bluejoyq authored 2019-12-08 17:50:20 +0900
- change · 49913dff
  49913dff
  
  김서영 authored 2019-12-08 17:46:53 +0900
- add expo folder to gitignore · 96b772be
  96b772be Browse Files
  
  bluejoyq authored 2019-12-08 17:46:17 +0900
- color change · 808d2d68
  808d2d68 Browse Files
  
  bluejoyq authored 2019-12-08 17:40:14 +0900
- Merge branch '2018102169/searchGuide-design' into 'master' · 780c8fe7 ...
  780c8fe7 Browse Files
```
2018102169/search guide design

merge conflict 해결중

See merge request !10
```
  bluejoyq authored 2019-12-08 16:52:16 +0900
- edit gitignore and merge · 1c167be0
  1c167be0 Browse Files
  
  bluejoyq authored 2019-12-08 16:49:10 +0900
- Merge branch 'master' into 2018102169/searchGuide-design · 19183f26 ...
  19183f26 Browse Files
```
# Conflicts:
#	searchGuide/.expo/packager-info.json
```
  bluejoyq authored 2019-12-08 16:42:55 +0900
- change design · 432249b7
  432249b7 Browse Files
  
  김서영 authored 2019-12-08 13:53:01 +0900
07 Dec, 2019 4 commits
- change design · 9c577427
  9c577427 Browse Files
  
  김서영 authored 2019-12-07 19:56:33 +0900
- font add · 4e6dc209
  4e6dc209 Browse Files
  
  bluejoyq authored 2019-12-07 19:28:40 +0900
- add date db for record · d4924fb6
  d4924fb6 Browse Files
  
  bluejoyq authored 2019-12-07 15:34:46 +0900
- edit try catch in client for server timeout error · 3431812d
  3431812d Browse Directory
  
  bluejoyq authored 2019-12-07 15:02:51 +0900
05 Dec, 2019 7 commits
- finish backend server · 2f013120
  2f013120 Browse Directory
  
  bluejoyq authored 2019-12-05 23:01:33 +0900
- fixing backend error · c1495cd3
  c1495cd3 Browse Files
  
  bluejoyq authored 2019-12-05 22:54:42 +0900
- fixing~ · 55fda3db
  55fda3db Browse Directory
  
  bluejoyq authored 2019-12-05 19:39:12 +0900
- fixing error · 61f27dd6
  61f27dd6 Browse Directory
  
  bluejoyq authored 2019-12-05 19:22:56 +0900
- fixing error · b3a9b104
  b3a9b104 Browse Directory
  
  bluejoyq authored 2019-12-05 19:14:31 +0900
- edit backend server for machine read · 024bbea0
  024bbea0 Browse Directory
  
  bluejoyq authored 2019-12-05 18:53:32 +0900
- Merge branch 'changshin' into 'master' · 3204b228 ...
  3204b228 Browse Directory
```
Changshin

Add machineRead.js
Add STT.js

See merge request !8
```
  bluejoyq authored 2019-12-05 18:30:43 +0900
04 Dec, 2019 5 commits
- Merge branch 'apiPR' into 'master' · d2da3253 ...
  d2da3253 Browse Directory
```
search pr

까먹고 pull 안하고 
branch push 했으니ㅜㅜ
search만 merge 부탁합니다.

See merge request !7
```
  bluejoyq authored 2019-12-05 02:09:43 +0900
- add search.js description · 494f4ddc
  494f4ddc Browse Directory
  
  김서영 authored 2019-12-05 01:57:03 +0900
- search.js add error check · 8ce55ce5
  8ce55ce5 Browse Directory
  
  김서영 authored 2019-12-05 01:54:29 +0900
- add search.js search browser · 4675a060
  4675a060 Browse Directory
  
  김서영 authored 2019-12-05 01:53:17 +0900
- add search.js · 105387ca
  105387ca Browse Directory
  
  김서영 authored 2019-12-05 01:51:14 +0900
03 Dec, 2019 6 commits
- add machine server · 0f1e86dc
  0f1e86dc Browse Directory
  
  bluejoyq authored 2019-12-03 19:38:48 +0900
- complete STT.js · c76d00d2
  c76d00d2 Browse Directory
  
  윤창신 authored 2019-12-03 19:09:36 +0900
- fix STT.js · e39f8402
  e39f8402 Browse Directory
  
  윤창신 authored 2019-12-03 19:06:55 +0900
- add machineRead.js · c2e7e947
  c2e7e947 Browse Directory
  
  윤창신 authored 2019-12-03 19:03:55 +0900
- change port · d2ee1668
  d2ee1668
  
  bluejoyq authored 2019-12-03 19:02:25 +0900
- write STT.js · a3b6fc42
  a3b6fc42 Browse Directory
  
  윤창신 authored 2019-12-03 19:01:30 +0900