Niels Zwemmer
|
c671674f2d
|
Merge branch 'niels-profile' into 'master'
Niels profile
See merge request !36
|
2017-06-30 10:20:42 +02:00 |
|
Felix Atsma
|
fdcd141f23
|
Merge branch 'felix' into 'master'
Add logboek
See merge request !35
|
2017-06-30 10:10:54 +02:00 |
|
Felix Atsma
|
5f5269ceb8
|
Add logboek
|
2017-06-30 10:10:26 +02:00 |
|
Marijn Jansen
|
d7b2e54306
|
Merge branch 'marijn-logboek' into 'master'
Logboek
See merge request !34
|
2017-06-30 10:07:53 +02:00 |
|
Marijn Jansen
|
8ea692c5a8
|
Logboek
|
2017-06-30 10:07:14 +02:00 |
|
Niels Zwemmer
|
f8265ac3aa
|
Wrong dirname... whoops.
|
2017-06-30 10:05:27 +02:00 |
|
Niels Zwemmer
|
d0bd10a854
|
Added personal log file.
|
2017-06-30 10:04:05 +02:00 |
|
Felix Atsma
|
d4bfe0206b
|
Merge branch 'felix' into 'master'
comments
See merge request !33
|
2017-06-30 00:02:04 +02:00 |
|
Felix Atsma
|
d61b058d0e
|
Merge remote-tracking branch 'origin/master' into felix
|
2017-06-30 00:01:22 +02:00 |
|
Felix Atsma
|
979f1aab9a
|
Add comments
|
2017-06-29 16:46:34 +02:00 |
|
Niels Zwemmer
|
250ee529fe
|
Added comments for the files. Needs reviewing from Paul.
|
2017-06-29 16:46:16 +02:00 |
|
Niels Zwemmer
|
69bbfeaacd
|
Merge branch 'niels-profile' into 'master'
Fixed sepia filter uploading black pictures.
See merge request !32
|
2017-06-29 16:22:15 +02:00 |
|
Niels Zwemmer
|
1f4fa4c768
|
Fixed sepia filter uploading black pictures.
|
2017-06-29 16:21:18 +02:00 |
|
Marijn Jansen
|
dc7690e183
|
Merge branch 'marijn-fixdingen' into 'master'
Fixed double things in timeline :)
See merge request !31
|
2017-06-29 16:02:00 +02:00 |
|
Marijn Jansen
|
a4108e9e19
|
Fixed double things in timeline :)
|
2017-06-29 16:01:04 +02:00 |
|
Niels Zwemmer
|
dc3db134c0
|
Merge branch 'niels-profile' into 'master'
Niels profile
See merge request !30
|
2017-06-29 15:51:29 +02:00 |
|
Niels Zwemmer
|
32f39a35db
|
Profile timeline button remade.
|
2017-06-29 15:51:00 +02:00 |
|
Niels Zwemmer
|
98f986fc0a
|
Merge conflict fixed
|
2017-06-29 15:45:22 +02:00 |
|
Felix Atsma
|
5a6abe85f1
|
Timeline layout now with imagebutton
|
2017-06-29 15:41:16 +02:00 |
|
Niels Zwemmer
|
ab54ffb9ec
|
Merge conflict resolved.
|
2017-06-29 15:23:36 +02:00 |
|
Niels Zwemmer
|
6258c2a91a
|
Fixed the refresh combined with the progressBar.
|
2017-06-29 15:20:40 +02:00 |
|
Paul Lagerweij
|
0a7c49b3a3
|
added animation
|
2017-06-29 15:18:12 +02:00 |
|
Felix Atsma
|
63236c5895
|
Merge remote-tracking branch 'origin/niels-profile' into felix
|
2017-06-29 14:43:34 +02:00 |
|
Felix Atsma
|
d8c04c78ea
|
Fix keyboard hiding crash + prettify findviewbyid's in camerafragment
|
2017-06-29 14:32:03 +02:00 |
|
Niels Zwemmer
|
9d016b8c65
|
Added a progressBar to the profilepage aswell.
|
2017-06-29 14:01:27 +02:00 |
|
Niels Zwemmer
|
7895054743
|
Merge remote-tracking branch 'origin/felix' into niels-profile
|
2017-06-29 13:44:08 +02:00 |
|
Felix Atsma
|
c38cc026fc
|
Add progress bar for timeline
|
2017-06-29 13:42:44 +02:00 |
|
Niels Zwemmer
|
bd4149ccb1
|
Added rotate restriction. Merge-prep with Felix.
|
2017-06-29 13:41:23 +02:00 |
|
Marijn Jansen
|
27b005930f
|
Merge branch 'marijn-appje' into 'master'
Fix!
See merge request !29
|
2017-06-29 13:36:15 +02:00 |
|
Marijn Jansen
|
7936350ede
|
Fix!
|
2017-06-29 13:35:49 +02:00 |
|
Marijn Jansen
|
c517c2ef10
|
Merge branch 'marijn-appje' into 'master'
Marijn appje
See merge request !28
|
2017-06-29 13:34:34 +02:00 |
|
Marijn Jansen
|
c9eb4b62a1
|
Merge remote-tracking branch 'origin/master' into marijn-appje
|
2017-06-29 13:34:20 +02:00 |
|
Marijn Jansen
|
71d412beac
|
Date works
|
2017-06-29 13:28:19 +02:00 |
|
Marijn Jansen
|
af47900288
|
Better name for niet slechts.
|
2017-06-29 13:21:58 +02:00 |
|
Marijn Jansen
|
5ae1d1f964
|
Added NietSlechts!
|
2017-06-29 13:19:12 +02:00 |
|
Niels Zwemmer
|
4eed601b7d
|
WIP: for Felix
|
2017-06-29 12:50:29 +02:00 |
|
Niels Zwemmer
|
26a7239caa
|
Much cleaner code. Known bugs seem to be fixed. Added extra progressDialog for posts downloading.
|
2017-06-29 00:35:55 +02:00 |
|
Niels Zwemmer
|
1fdd21440b
|
Potentially fixed Felix' bug in the camera. Also made some changes for better readability of my own code.
|
2017-06-28 19:46:38 +02:00 |
|
Niels Zwemmer
|
2315d58598
|
Changed some appearances of the personal posts.
|
2017-06-28 18:02:28 +02:00 |
|
Niels Zwemmer
|
ab79fa7d7c
|
Changed some appearances of the personal posts.
|
2017-06-28 17:58:32 +02:00 |
|
Niels Zwemmer
|
52d15a80ca
|
Working refresh, working user-specific posts in profile.
|
2017-06-28 17:44:27 +02:00 |
|
Felix Atsma
|
c8f65c0dca
|
Merge branch 'felix' into 'master'
Fix front facing + layout profile
See merge request !27
|
2017-06-28 16:04:01 +02:00 |
|
Felix Atsma
|
0560e6a0fb
|
Fix front facing camera
|
2017-06-28 16:03:16 +02:00 |
|
Felix Atsma
|
93434a981f
|
Layout profile changes + half of a reloader
|
2017-06-28 15:28:40 +02:00 |
|
Niels Zwemmer
|
2621062c60
|
Merge branch 'niels-profile' into 'master'
Niels profile
See merge request !26
|
2017-06-28 13:16:12 +02:00 |
|
Niels Zwemmer
|
43a1fcd52c
|
Merge remote-tracking branch 'origin/master' into niels-profile
|
2017-06-28 13:15:19 +02:00 |
|
Niels Zwemmer
|
982d7d4279
|
Merge remote-tracking branch 'origin/master' into niels-profile
|
2017-06-28 13:14:10 +02:00 |
|
Felix Atsma
|
a04866ba3f
|
Merge branch 'felix' into 'master'
Timeline improvements
See merge request !25
|
2017-06-28 13:14:09 +02:00 |
|
Felix Atsma
|
f1befdd21c
|
Merge remote-tracking branch 'origin/master' into felix
|
2017-06-28 13:13:34 +02:00 |
|
Felix Atsma
|
cab6728a54
|
Improve timeline layout
|
2017-06-28 13:12:48 +02:00 |
|