Marijn Jansen
|
37507c3f5f
|
Merge branch 'master' into 'paul-profile'
# Conflicts:
# app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
# app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
|
2017-06-22 11:39:07 +02:00 |
|
Paul Lagerweij
|
9a8feee49f
|
small improvement to ProfileFragment.java
|
2017-06-22 11:11:50 +02:00 |
|
Paul Lagerweij
|
cd45463f6a
|
improved some code layout ProfileFragment.java
|
2017-06-22 11:07:33 +02:00 |
|
Niels Zwemmer
|
60e58b40bc
|
Added password reset functionality as well as username display in the app. Also, round launcher icons have been uploaded.
|
2017-06-21 20:54:14 +02:00 |
|
Niels Zwemmer
|
cafe39d045
|
Minor changes.
|
2017-06-21 15:47:45 +02:00 |
|
Niels Zwemmer
|
84a2c75c85
|
Merge remote-tracking branch 'origin/paul-profile' into niels-profile
|
2017-06-21 14:40:32 +02:00 |
|
Paul Lagerweij
|
63bef257da
|
overlay change profile picture button
|
2017-06-21 14:39:40 +02:00 |
|
Niels Zwemmer
|
fa3f42da7e
|
Added password change functions.
|
2017-06-21 14:38:05 +02:00 |
|
Paul Lagerweij
|
6faf1c9400
|
add padding to profile fragment
|
2017-06-21 14:12:32 +02:00 |
|
Niels Zwemmer
|
d0386a533f
|
Added a new default profile picture. Tested and working, changed filename of avatar
|
2017-06-21 14:10:13 +02:00 |
|
Niels Zwemmer
|
d326785082
|
Added a new default profile picture. Tested and working, changed filename of avatar
|
2017-06-21 14:09:59 +02:00 |
|
Niels Zwemmer
|
fe1960fdce
|
Merge remote-tracking branch 'origin/paul-profile' into niels-profile
|
2017-06-21 14:06:49 +02:00 |
|
Paul Lagerweij
|
4005bef38c
|
added change psw button to profile fragment
|
2017-06-21 14:06:05 +02:00 |
|
Niels Zwemmer
|
1a944364c4
|
Added a new default profile picture.
|
2017-06-21 14:06:00 +02:00 |
|
Niels Zwemmer
|
e48ddd6b82
|
Merge remote-tracking branch 'origin/paul-profile' into niels-profile
|
2017-06-21 13:43:09 +02:00 |
|
Niels Zwemmer
|
80e2935b23
|
Added new launcher logo, made some minor changes to ProfileFragment.java
|
2017-06-21 13:42:42 +02:00 |
|
Paul Lagerweij
|
d982c8ba49
|
change layout profile fragment
|
2017-06-21 13:42:32 +02:00 |
|
Paul Lagerweij
|
6db7ca20ae
|
default picture if no profile photo in firebase
|
2017-06-21 13:07:29 +02:00 |
|
Niels Zwemmer
|
e787204ce7
|
Fixed bugs in profile fragment.
|
2017-06-21 12:32:06 +02:00 |
|
Niels Zwemmer
|
72003c75ff
|
Merge remote-tracking branch 'origin/paul-profile' into niels-profile
|
2017-06-21 12:22:39 +02:00 |
|
Niels Zwemmer
|
92bf29dd84
|
Small changes made to appearance.
|
2017-06-21 12:17:23 +02:00 |
|
Paul Lagerweij
|
bb69d3f695
|
first implementation of profile picture
|
2017-06-21 12:16:00 +02:00 |
|
Niels Zwemmer
|
27416aae85
|
Added functionality framework for the profile pic button for Paul. He can now bind actions to the button.
|
2017-06-21 12:04:26 +02:00 |
|
Paul Lagerweij
|
291261fcee
|
fragment_profile.xml test
|
2017-06-20 13:39:07 +02:00 |
|
Paul Lagerweij
|
3aac4fc96d
|
login-, picture-button to fragment_profile.xml
button's are next to each other
|
2017-06-20 13:01:51 +02:00 |
|
Paul Lagerweij
|
b9ab2676a6
|
Merge remote-tracking branch 'origin/niels-profile' into paul-profile
|
2017-06-20 11:40:43 +02:00 |
|
Niels Zwemmer
|
bd2b69a330
|
Added some changes to form a baseline for Paul
|
2017-06-20 11:39:50 +02:00 |
|
Paul Lagerweij
|
c27b608168
|
Merge remote-tracking branch 'origin/marijn-appje' into paul-profile
|
2017-06-20 11:29:03 +02:00 |
|
Niels Zwemmer
|
720865fd7e
|
Merge remote-tracking branch 'origin/marijn-appje' into niels-profile
|
2017-06-20 11:28:24 +02:00 |
|