Marijn Jansen
|
d8eea0bb70
|
Profile pics working!
|
2017-06-23 12:44:25 +02:00 |
|
Marijn Jansen
|
0f98bdb5ea
|
Merge remote-tracking branch 'origin/niels-profile' into marijn-appje
|
2017-06-23 11:50:04 +02:00 |
|
Marijn Jansen
|
2a89827b63
|
Added Post classess enz.
|
2017-06-23 11:46:30 +02:00 |
|
Niels Zwemmer
|
b0a99b3ab1
|
Bugprone version of Profilefragment.
|
2017-06-23 11:44:43 +02:00 |
|
Felix Atsma
|
66221c4393
|
Merge branch 'felix' into 'master'
Add error strings
See merge request !9
|
2017-06-22 12:45:46 +02:00 |
|
Felix Atsma
|
a93f8a500d
|
Add error strings
|
2017-06-22 12:44:56 +02:00 |
|
Felix Atsma
|
95bb92930e
|
Merge branch 'felix' into 'master'
Felix camera
See merge request !8
|
2017-06-22 11:40:27 +02:00 |
|
Marijn Jansen
|
e5285f91d5
|
Merge branch 'paul-profile' into 'master'
Paul profile
See merge request !6
|
2017-06-22 11:39:34 +02:00 |
|
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 |
|
Marijn Jansen
|
6e08558769
|
Merge branch 'marijn-appje' into 'master'
Paul wanted to merge
See merge request !7
|
2017-06-22 11:37:40 +02:00 |
|
Felix Atsma
|
a2d333c627
|
Camera switching working
|
2017-06-22 11:36:56 +02:00 |
|
Marijn Jansen
|
aabe207594
|
Because Paul wanted to Merge
|
2017-06-22 11:36:17 +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 |
|
Marijn Jansen
|
c040ef495f
|
Merge remote-tracking branch 'origin/master' into marijn-appje
|
2017-06-20 22:19:24 +02:00 |
|
Marijn Jansen
|
75d1e6b4ed
|
Deleted some files
|
2017-06-20 22:00:43 +02:00 |
|
Marijn Jansen
|
442c5bd642
|
Added dialogs and checks to login en register, also started working on Uploads
|
2017-06-20 21:59:53 +02:00 |
|
Felix Atsma
|
1e5239921a
|
Camera preview working, with non working picture button
|
2017-06-20 21:20:54 +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 |
|
Marijn Jansen
|
23db910b92
|
New OnClick and icons
|
2017-06-20 11:27:38 +02:00 |
|
Marijn Jansen
|
c05737575a
|
Merge branch 'marijn-appje' into 'master'
Fragments change working!
See merge request !5
|
2017-06-19 16:03:22 +02:00 |
|
Marijn Jansen
|
2d91516020
|
Fragments change working!
|
2017-06-19 16:02:48 +02:00 |
|
Felix Atsma
|
6727163184
|
Merge branch 'niels-projectplan' into 'master'
Niels projectplan
See merge request !4
|
2017-06-19 14:57:00 +02:00 |
|
Marijn Jansen
|
85aac4f4c0
|
Merge branch 'marijn-appje' into 'master'
Marijn appje
See merge request !3
|
2017-06-19 14:52:58 +02:00 |
|
Marijn Jansen
|
54c9521ef1
|
Added google-services.json
|
2017-06-19 14:52:20 +02:00 |
|