Marijn Jansen
|
c9eb4b62a1
|
Merge remote-tracking branch 'origin/master' into marijn-appje
|
2017-06-29 13:34:20 +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 |
|
Niels Zwemmer
|
017b5890c2
|
Neated up the code.
|
2017-06-28 13:11:30 +02:00 |
|
Marijn Jansen
|
fe15764d2b
|
Merge branch 'marijn-appje' into 'master'
Option to get own posts.
See merge request !24
|
2017-06-28 12:47:33 +02:00 |
|
Felix Atsma
|
ba832682bf
|
Merge branch 'felix' into 'master'
Image preview + cancel + change icons
See merge request !23
|
2017-06-28 12:05:34 +02:00 |
|
Felix Atsma
|
f0719c51f9
|
Add cancel button, fix button switching, change icons to vector
|
2017-06-28 12:01:05 +02:00 |
|
Niels Zwemmer
|
3aab463143
|
Added error message-shows and mail_successful/mail_failed to the error messages.
|
2017-06-28 11:13:39 +02:00 |
|
Felix Atsma
|
2db1254750
|
Image preview working
|
2017-06-28 10:25:54 +02:00 |
|
Niels Zwemmer
|
16c3b727fc
|
Working profile page with Adapter. Need Marijn to fix the downloadclass to show user-only content instead of entire timeline.
|
2017-06-27 16:12:42 +02:00 |
|
Felix Atsma
|
d3395f3e9b
|
Add negative filter + rotate half working
|
2017-06-27 15:06:20 +02:00 |
|
Niels Zwemmer
|
7ed5c36884
|
Merge remote-tracking branch 'origin/paul-profile' into niels-profile
|
2017-06-27 13:22:40 +02:00 |
|
Paul Lagerweij
|
0c3ed94bb7
|
put back profile naming
|
2017-06-27 13:21:30 +02:00 |
|
Niels Zwemmer
|
744ab1a9c0
|
Merge remote-tracking branch 'origin/paul-profile' into niels-profile
|
2017-06-27 13:20:29 +02:00 |
|
Paul Lagerweij
|
b11cc95000
|
put back 'niet slecht count profile'
|
2017-06-27 13:19:25 +02:00 |
|
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 |
|