Commits · master · IF3111-2018-Batere3A / android

23 Feb, 2018 35 commits
- Update README.md · f24c9e86
  Girvandi Ilyas authored Feb 23, 2018
  
  f24c9e86
- Update README.md · 366065ac
  Girvandi Ilyas authored Feb 23, 2018
  
  366065ac
- Merge branch 'orderDetailPage' into 'master' · 160e49cb
  Aldrich Valentino Halim authored Feb 23, 2018
```
Order detail page

See merge request !14
```
  160e49cb
- final Change · a8674cae
  Aditya Pratama authored Feb 23, 2018
  
  a8674cae
- minor fix after merge · f4cf5cfa
  Aldrich Valentino Halim authored Feb 23, 2018
  
  f4cf5cfa
- Merge branch 'pushnotif' into 'orderDetailPage' · 3e8a8307
  Aldrich Valentino Halim authored Feb 23, 2018
```
Pushnotif

See merge request !13
```
  3e8a8307
- Merge branch 'orderDetailPage' into 'pushnotif' · c9eb08ee
  Aldrich Valentino Halim authored Feb 23, 2018
```
# Conflicts:
#   app/src/main/AndroidManifest.xml
#   app/src/main/java/com/example/batere3a/joggingpartner/MainActivity.java
#   app/src/main/java/com/example/batere3a/joggingpartner/MakeOrderActivity.java
#   app/src/main/java/com/example/batere3a/joggingpartner/order/OpenOrderAdapter.java
#   app/src/main/java/com/example/batere3a/joggingpartner/order/OrderDetails.java
#   app/src/main/res/values/strings.xml
```
  c9eb08ee
- Change name on title bar to appointments · cdbbb906
  Girvandi Ilyas authored Feb 23, 2018
  
  cdbbb906
- added notification for android 8 · 52381e8e
  Aldrich Valentino Halim authored Feb 23, 2018
  
  52381e8e
- notification enabled with GCM in android 7 · 556499f1
  Aldrich Valentino Halim authored Feb 23, 2018
  
  556499f1
- Changed text in loginactivity · b82f118e
  Girvandi Ilyas authored Feb 23, 2018
  
  b82f118e
- Changed application logo and splash screen logo · a8ae117f
  Girvandi Ilyas authored Feb 23, 2018
  
  a8ae117f
- Fix Merge Bug · c36621a6
  Aditya Pratama authored Feb 23, 2018
  
  c36621a6
- Merge branch 'backgroundservice' into 'orderDetailPage' · 828a38b2
  Aditya Pratama authored Feb 23, 2018
```
# Conflicts:
#   app/src/main/AndroidManifest.xml
#   app/src/main/java/com/example/batere3a/joggingpartner/MainActivity.java
```
  828a38b2
- Fix Maps MakeOrder minor bugs · 79256221
  Aditya Pratama authored Feb 23, 2018
  
  79256221
- Fix temporary bugs · 308fc486
  Aditya Pratama authored Feb 23, 2018
  
  308fc486
- Fix Minor Bugs · 735c133e
  Aditya Pratama authored Feb 23, 2018
  
  735c133e
- Fixed Login Page · 52e15e38
  Aditya Pratama authored Feb 23, 2018
  
  52e15e38
- added notif · 5d3b59c4
  Aldrich Valentino Halim authored Feb 23, 2018
  
  5d3b59c4
- Added icon into settings · 3848b66b
  Girvandi Ilyas authored Feb 23, 2018
  
  3848b66b
- Added color on selected tab indicator · a22af1de
  Girvandi Ilyas authored Feb 23, 2018
  
  a22af1de
- Minor change on orderDetailsActivity · d50fecdf
  Girvandi Ilyas authored Feb 23, 2018
  
  d50fecdf
- Merge commit and add launcher icon · 077956bb
  Girvandi Ilyas authored Feb 23, 2018
  
  077956bb
- Changed android manifest · 26e83a75
  Girvandi Ilyas authored Feb 23, 2018
  
  26e83a75
- Added Colorful Button Make Order · 0fd6262b
  Aditya Pratama authored Feb 23, 2018
  
  0fd6262b
- Fixed Open Order Filtering Bug · 6daf97a7
  Aditya Pratama authored Feb 23, 2018
  
  6daf97a7
- Fixed Minor Bugs · a8a24a56
  Aditya Pratama authored Feb 23, 2018
  
  a8a24a56
- Fixed Part of Bug · 464b2bf0
  Girvandi Ilyas authored Feb 23, 2018
  
  464b2bf0
- Merge branch 'newmakeorder' into 'orderDetailPage' · ff2c5003
  Girvandi Ilyas authored Feb 23, 2018
```
Newmakeorder

See merge request !10
```
  ff2c5003
- Merge branch 'orderDetailPage' into 'newmakeorder' · 7efab1fb
  Girvandi Ilyas authored Feb 23, 2018
```
# Conflicts:
#   app/src/main/AndroidManifest.xml
#   app/src/main/java/com/example/batere3a/joggingpartner/LoginActivity.java
#   app/src/main/java/com/example/batere3a/joggingpartner/MainActivity.java
#   app/src/main/java/com/example/batere3a/joggingpartner/ProfileActivity.java
#   app/src/main/res/layout/activity_main.xml
#   app/src/main/res/layout/activity_profile.xml
#   app/src/main/res/layout/content_main.xml
```
  7efab1fb
- added gcm token · 38ac6bb3
  Aldrich Valentino Halim authored Feb 23, 2018
  
  38ac6bb3
- Merge branch 'orderDetailPage' of... · 315a1f9f
  Aditya Pratama authored Feb 23, 2018
```
Merge branch 'orderDetailPage' of http://gitlab.informatika.org/IF3111-2018-Batere3A/android into orderDetailPage
```
  315a1f9f
- Fixed Minor Bugs Open Order · d8db7903
  Aditya Pratama authored Feb 23, 2018
  
  d8db7903
- Added landscape layout for pedometer · b4b0cc52
  Girvandi Ilyas authored Feb 23, 2018
  
  b4b0cc52
- Modified PedometerActivity · 11d6d932
  Girvandi Ilyas authored Feb 23, 2018
  
  11d6d932
22 Feb, 2018 5 commits
- generated GCM token · 4d66d973
  Aldrich Valentino Halim authored Feb 23, 2018
  
  4d66d973
- Merge branch 'orderDetailPage' of... · 2afd358f
  Girvandi Ilyas authored Feb 23, 2018
```
Merge branch 'orderDetailPage' of http://gitlab.informatika.org/IF3111-2018-Batere3A/android into orderDetailPage
```
  2afd358f
- Added auto scroll to bottom on chat activity · 43ed23ca
  Girvandi Ilyas authored Feb 23, 2018
  
  43ed23ca
- Added Patch ID Partner · 24984f65
  Aditya Pratama authored Feb 23, 2018
  
  24984f65
- Added new Atribute POST · f28f8d1c
  Aditya Pratama authored Feb 23, 2018
  
  f28f8d1c