add login, history function#11

Open

ghost wants to merge 15 commits intofeature/mealAPIfrom

feature/workout_history

Commits on Aug 23, 2019

add login, history function
Tak Hyungmin
committed
Merge branch 'feature/mealAPI' of https://github.com/pixtus/Pixtus-App into feature/workout_history
Tak Hyungmin
committed
최종 1
Tak Hyungmin
committed
workout_detaiil
yoo-chaewon
committed
최종2
yoo-chaewon
committed
최종3
yoo-chaewon
committed
mainAPI 수정
yoo-chaewon
committed
메인 oncreateview에 추가
yoo-chaewon
committed
프로그래스바 추가
yoo-chaewon
committed
최종4
yoo-chaewon
committed
ㄹㅇ최종
yoo-chaewon
committed
ㄹㅇ 최종
yoo-chaewon
committed
최종
yoo-chaewon
committed
최종 history
Tak Hyungmin
committed
Merge branch 'dev_yooochw' of https://github.com/pixtus/Pixtus-App into feature/workout_history
Tak Hyungmin
committed