Niels Zwemmer
|
cebc1bd59b
|
Merge remote-tracking branch 'origin/paul-profile' into niels-profile
|
2017-06-27 13:16:26 +02:00 |
|
Niels Zwemmer
|
1d3537cdde
|
First attempt at ProfileAdapter. Not in working state.
|
2017-06-27 13:15:55 +02:00 |
|
Paul Lagerweij
|
6851009e4b
|
Added new files for profile fragment
new file: fragment_profile_header.xml
new file: fragment_profile_timeline.xml
new file: list_item_timeline_profile.xml
|
2017-06-27 13:13:43 +02:00 |
|
Felix Atsma
|
08849521e1
|
Fix comment box clickable + prettify
|
2017-06-27 12:37:23 +02:00 |
|
Marijn Jansen
|
046e3f9400
|
Merge branch 'marijn-appje' into 'master'
Marijn appje
See merge request !22
|
2017-06-27 12:12:45 +02:00 |
|
Marijn Jansen
|
ab0b105640
|
Fix for timeline
|
2017-06-27 12:11:52 +02:00 |
|
Marijn Jansen
|
2b7965ad61
|
Fix for timeline scrolling
|
2017-06-27 12:10:56 +02:00 |
|
Niels Zwemmer
|
726129db5b
|
Merge branch 'niels-profile' into 'master'
Niels profile
See merge request !21
|
2017-06-27 11:33:29 +02:00 |
|
Niels Zwemmer
|
f60005c29d
|
Merge remote-tracking branch 'origin/master' into niels-profile
|
2017-06-27 11:33:02 +02:00 |
|
Niels Zwemmer
|
9322840d10
|
Minor changes to picture.
|
2017-06-27 11:29:48 +02:00 |
|
Marijn Jansen
|
1c9da2c8dc
|
Merge branch 'marijn-appje' into 'master'
Marijn appje
See merge request !20
|
2017-06-27 11:18:32 +02:00 |
|
Marijn Jansen
|
0b943e3a1a
|
Fixed a crash when switching fast to profile after loading the app.
|
2017-06-27 11:17:31 +02:00 |
|
Niels Zwemmer
|
84353046a5
|
Fixed implement runtime error for Felix. Made some minor changes to both strings.xml and ProfilePictureUploader (error when old picture not present).
|
2017-06-27 11:11:29 +02:00 |
|
Marijn Jansen
|
2ad161049a
|
Merge remote-tracking branch 'origin/master' into marijn-appje
|
2017-06-27 09:10:20 +02:00 |
|
Niels Zwemmer
|
d3558b6344
|
Merge branch 'niels-notulen' into 'master'
Added today's counsil minutes.
See merge request !19
|
2017-06-26 23:39:06 +02:00 |
|
Niels Zwemmer
|
41bacb3b4f
|
Added today's counsil minutes.
|
2017-06-26 23:38:14 +02:00 |
|
Felix Atsma
|
2db99500af
|
Merge branch 'felix' into 'master'
Make camera (mostly) fullscreen + add comment function
See merge request !18
|
2017-06-26 23:37:29 +02:00 |
|
Felix Atsma
|
350e55271e
|
Make camera (mostly) fullscreen + add comment function
|
2017-06-26 23:36:03 +02:00 |
|
Marijn Jansen
|
3f00e09592
|
fix for permissions.
|
2017-06-26 18:54:45 +02:00 |
|
Marijn Jansen
|
2c40a1b8da
|
Merge remote-tracking branch 'origin/master' into marijn-appje
|
2017-06-26 16:23:26 +02:00 |
|
Niels Zwemmer
|
0136868ea8
|
Merge branch 'niels-profile' into 'master'
Niels profile
See merge request !17
|
2017-06-26 16:21:08 +02:00 |
|
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 |
|
Marijn Jansen
|
507fac220c
|
Merge branch 'marijn-appje' into 'master'
Timeline things working right now Woohoo!
See merge request !16
|
2017-06-26 16:16:12 +02:00 |
|
Niels Zwemmer
|
d4d10e3f6f
|
Profile page working, better quality picture aswell. Only needs personal feed.
|
2017-06-26 16:13:44 +02:00 |
|
Marijn Jansen
|
035f94ec66
|
Merge remote-tracking branch 'origin/master' into marijn-appje
# Conflicts:
# app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
|
2017-06-26 15:23:17 +02:00 |
|
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 |
|
Niels Zwemmer
|
e54e423847
|
Made some changes to process gitmerge.
|
2017-06-26 11:53:04 +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 |
|
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 |
|
Marijn Jansen
|
a71fc80f59
|
Added ProgressDialog to upload.
|
2017-06-23 20:35:47 +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 |
|
Marijn Jansen
|
8ba9f7f8e3
|
Delete profile pics on replace.
|
2017-06-23 16:40:34 +02:00 |
|
Niels Zwemmer
|
6aeacbfc8a
|
Merge remote-tracking branch 'origin/master' into niels-profile
|
2017-06-23 16:11:53 +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 |
|
Niels Zwemmer
|
a8a026d18f
|
Merge remote-tracking branch 'origin/marijn-appje' into niels-profile
|
2017-06-23 15:27:46 +02:00 |
|
Marijn Jansen
|
6e55954dde
|
Made a listener!
|
2017-06-23 15:24:57 +02:00 |
|
Niels Zwemmer
|
c78f01dbfe
|
Merge remote-tracking branch 'origin/marijn-appje' into niels-profile
|
2017-06-23 14:35:50 +02:00 |
|