Commits · master · 김동훈 / OpenSource_Project

14 Dec, 2018 6 commits
- Merge branch 'WebFront' into 'master' · 9ee9a990 ...
  9ee9a990 Browse Files
```
change image

change image

See merge request !7
```
  김다솜 authored 2018-12-14 09:50:50 +0900
- change image · 494b91e0
  494b91e0 Browse Files
  
  김다솜 authored 2018-12-14 09:47:16 +0900
- merge with master · 4c296c3f
  4c296c3f Browse Files
  
  김다솜 authored 2018-12-14 09:25:12 +0900
- failed at routing · ae65eb55
  ae65eb55 Browse Files
  
  Donghoon Kim authored 2018-12-14 09:18:48 +0900
- added routing · 5b290eb1
  5b290eb1 Browse Files
  
  Donghoon Kim authored 2018-12-14 09:08:43 +0900
- add list · 334a5808
  334a5808
  
  김다솜 authored 2018-12-14 09:07:00 +0900
13 Dec, 2018 16 commits
- major bug fix #3 · ab12ccab
  ab12ccab Browse Files
  
  Donghoon Kim authored 2018-12-14 08:51:47 +0900
- modify photo · 80842acd
  80842acd Browse Files
  
  전수민 authored 2018-12-14 08:27:59 +0900
- photo · a8a03da8
  a8a03da8 Browse Files
  
  전수민 authored 2018-12-14 08:13:06 +0900
- font link · 06e971b5
  06e971b5 Browse Files
  
  전수민 authored 2018-12-14 07:58:15 +0900
- merge with master · 0d3b0504
  0d3b0504 Browse Files
  
  전수민 authored 2018-12-14 05:48:48 +0900
- Show Food List · c8e9c4b3
  c8e9c4b3 Browse Files
  
  전수민 authored 2018-12-14 05:42:03 +0900
- Show Entertainment list · 837cfff8
  837cfff8 Browse Files
  
  Donghoon Kim authored 2018-12-14 05:39:12 +0900
- Merge branch 'master' into api · ffdbf2b6
  ffdbf2b6 Browse Files
  
  Donghoon Kim authored 2018-12-14 05:32:54 +0900
- delete DB property · 4a7d41f9
  4a7d41f9
  
  Donghoon Kim authored 2018-12-14 05:29:18 +0900
- Change Project Sturcture · 88e1c4d9
  88e1c4d9 Browse Files
  
  Donghoon Kim authored 2018-12-14 04:30:05 +0900
- Bug fix #1 · 3dcaf536
  3dcaf536 Browse Files
  
  Donghoon Kim authored 2018-12-14 04:25:42 +0900
- MySQL DB 연동 · 85195391
  85195391 Browse Files
  
  Donghoon Kim authored 2018-12-14 04:23:07 +0900
- Merge remote-tracking branch 'origin/WebFront' · 946a519e
  946a519e Browse Files
  
  Donghoon Kim authored 2018-12-14 04:12:16 +0900
- Change index.html · b82ae0a9
  b82ae0a9 Browse Files
  
  Donghoon Kim authored 2018-12-14 04:10:04 +0900
- food 프론트 · 9f0dcc29
  9f0dcc29 Browse Files
  
  전수민 authored 2018-12-14 02:25:18 +0900
- Update README.md · 461668a9
  461668a9 Browse Files
  
  김다솜 authored 2018-12-13 13:03:14 +0900
11 Dec, 2018 4 commits
- Merge branch 'master' of http://khuhub.khu.ac.kr/2017103963/OpenSource_Project · 7523a206
  7523a206 Browse Files
  
  전수민 authored 2018-12-11 21:54:59 +0900
- get place information and show to web · c08ef504
  c08ef504 Browse Files
  
  Donghoon Kim authored 2018-12-11 21:25:46 +0900
- change logo color · 05676c61
  05676c61 Browse Files
  
  김다솜 authored 2018-12-11 20:12:46 +0900
- Clean Project · ad964e92
  ad964e92 Browse Files
  
  Donghoon Kim authored 2018-12-11 19:39:07 +0900
09 Dec, 2018 10 commits
- Conflict resolved · d00bdbaa
  d00bdbaa Browse Files
  
  김다솜 authored 2018-12-09 14:47:52 +0900
- add location icons · 5a954ce4
  5a954ce4 Browse Files
  
  김다솜 authored 2018-12-09 14:43:49 +0900
- can find places with multiple tags · 3156d6d3
  3156d6d3 Browse Files
  
  Donghoon Kim authored 2018-12-09 13:23:23 +0900
- Merge branch 'dhk' into 'master' · 247afd36 ...
  247afd36 Browse Files
```
place search api

changed project structure and add google place api

See merge request !5
```
  김동훈 authored 2018-12-09 12:55:08 +0900
- place search api · ea1e3b99
  ea1e3b99
  
  Donghoon Kim authored 2018-12-09 12:56:02 +0900
- Merge branch 'WebFront' into 'master' · 09495464 ...
  09495464 Browse Files
```
Web front



See merge request !4
```
  김다솜 authored 2018-12-09 11:12:39 +0900
- delete setting page · 99587eca
  99587eca Browse Files
  
  김다솜 authored 2018-12-09 11:11:01 +0900
- modify title · 804aae29
  804aae29 Browse Files
  
  김다솜 authored 2018-12-09 11:10:32 +0900
- modfiy webpage foods, favorite, rooms, entertainment, settings · b35a5261
  b35a5261 Browse Files
  
  김다솜 authored 2018-12-09 11:06:52 +0900
- changed project structure · 4bb8b14c
  4bb8b14c
  
  Donghoon Kim authored 2018-12-09 11:01:34 +0900
07 Dec, 2018 4 commits
- Merge branch 'WebFront' into 'master' · 27eeedf6 ...
  27eeedf6 Browse Files
```
Web front

Modfiy webpage and add google map

See merge request !3
```
  김다솜 authored 2018-12-08 00:19:23 +0900
- modify mainpage and add google map · 0a65bca7
  0a65bca7 Browse Files
  
  김다솜 authored 2018-12-08 00:17:36 +0900
- mainpage menu modify · aa8b77ea
  aa8b77ea Browse Files
  
  김다솜 authored 2018-12-07 17:48:33 +0900
- Merge branch 'WebFront' into 'master' · a08e5daa ...
  a08e5daa Browse Files
```
Web front



See merge request !2
```
  김다솜 authored 2018-12-07 16:54:30 +0900