Niels Zwemmer
|
b20534aaec
|
Merge branch 'master' into 'niels-profile'
# Conflicts:
# app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
# app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
# app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
|
2017-06-26 16:20:45 +02:00 |
|
Niels Zwemmer
|
d4d10e3f6f
|
Profile page working, better quality picture aswell. Only needs personal feed.
|
2017-06-26 16:13:44 +02:00 |
|
Niels Zwemmer
|
e54e423847
|
Made some changes to process gitmerge.
|
2017-06-26 11:53:04 +02:00 |
|
Niels Zwemmer
|
5181128504
|
Committed files for others to look at and improve: Photo upload does not work properly.
|
2017-06-24 13:40:02 +02:00 |
|
Niels Zwemmer
|
83d2bda5c1
|
Resolved conflicts.
|
2017-06-23 20:39:57 +02:00 |
|
Niels Zwemmer
|
da765832f1
|
Merge remote-tracking branch 'origin/marijn-appje' into niels-profile
|
2017-06-23 19:19:48 +02:00 |
|
Niels Zwemmer
|
3855d9d917
|
Cleared up code and made first (failed) attempt at progressDialog.
|
2017-06-23 17:30:29 +02:00 |
|
Niels Zwemmer
|
6aeacbfc8a
|
Merge remote-tracking branch 'origin/master' into niels-profile
|
2017-06-23 16:11:53 +02:00 |
|
Niels Zwemmer
|
a8a026d18f
|
Merge remote-tracking branch 'origin/marijn-appje' into niels-profile
|
2017-06-23 15:27:46 +02:00 |
|
Niels Zwemmer
|
c78f01dbfe
|
Merge remote-tracking branch 'origin/marijn-appje' into niels-profile
|
2017-06-23 14:35:50 +02:00 |
|
Niels Zwemmer
|
0e25ff63cc
|
Cleaned code, added an invalidate. Needs testing.
|
2017-06-23 14:35:25 +02:00 |
|