 Marijn Jansen
|
6142e93957
|
Merge branch 'master' into 'marijn-appje'
# Conflicts:
# app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
|
2017-06-26 15:21:20 +02:00 |
|
 Marijn Jansen
|
247a443aba
|
Timeline things working right now Woohoo!
|
2017-06-26 15:20:18 +02:00 |
|
|
Marijn Jansen
|
03d4244daf
|
Merge branch 'marijn-appje' into 'master'
Marijn appje
See merge request !15
|
2017-06-26 11:37:03 +02:00 |
|
|
Marijn Jansen
|
766711faee
|
Merge branch 'niels-notulen' into 'master'
Niels notulen
See merge request !14
|
2017-06-26 10:54:12 +02:00 |
|
|
Marijn Jansen
|
046b04e83a
|
Merge branch 'niels-logboek' into 'master'
Niels logboek
See merge request !13
|
2017-06-26 10:53:27 +02:00 |
|
 Felix Atsma
|
801acc24fa
|
Merge branch 'felix' into 'master'
Camera filter switching and uploading
See merge request !12
|
2017-06-26 10:51:41 +02:00 |
|
|
Felix Atsma
|
d3d5a41037
|
Merge remote-tracking branch 'origin/master' into felix
|
2017-06-26 10:51:36 +02:00 |
|
|
Felix Atsma
|
d90a878a58
|
Camera filter switching and uploading
|
2017-06-26 10:43:59 +02:00 |
|
|
Marijn Jansen
|
a9ad130866
|
Added failure messages.
|
2017-06-25 15:06:13 +02:00 |
|
|
Marijn Jansen
|
c2582c128a
|
Spilt UploadClass in two classes.
Posts are now obtainable from firebase.
|
2017-06-25 15:01:52 +02:00 |
|
 Niels Zwemmer
|
8678cc9111
|
Added today and yesterday's entries. Forgot about adding the meeting. It is now added.
|
2017-06-24 20:58:00 +02:00 |
|
|
Niels Zwemmer
|
cc1b83b0e0
|
Added today and yesterday's entries.
|
2017-06-24 20:24:09 +02:00 |
|
|
Marijn Jansen
|
a71fc80f59
|
Added ProgressDialog to upload.
|
2017-06-23 20:35:47 +02:00 |
|
|
Marijn Jansen
|
8ba9f7f8e3
|
Delete profile pics on replace.
|
2017-06-23 16:40:34 +02:00 |
|
|
Marijn Jansen
|
6d7930ee03
|
Merge branch 'marijn-appje' into 'master'
Marijn appje
See merge request !11
|
2017-06-23 16:08:47 +02:00 |
|
|
Marijn Jansen
|
c056d96138
|
Profile photo update things.
|
2017-06-23 16:08:07 +02:00 |
|
|
Marijn Jansen
|
6e55954dde
|
Made a listener!
|
2017-06-23 15:24:57 +02:00 |
|
|
Marijn Jansen
|
b570e5ef21
|
Unique Profile pic name.
|
2017-06-23 14:35:20 +02:00 |
|
|
Niels Zwemmer
|
06eb90bc9f
|
Added council minutes of today.
|
2017-06-23 13:14:15 +02:00 |
|
|
Marijn Jansen
|
c5c6ba7a47
|
Merge branch 'marijn-appje' into 'master'
Marijn appje
See merge request !10
|
2017-06-23 12:45:10 +02:00 |
|
|
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 |
|
|
Niels Zwemmer
|
d7dcaa6c29
|
Added today's log entry.
|
2017-06-22 20:53:01 +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
|
08ec6e3ee8
|
Added updated log file.
|
2017-06-21 15:52:15 +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 |
|