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 |
|
Marijn Jansen
|
bfd018ad4a
|
Option to get own posts.
|
2017-06-28 12:46:57 +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 |
|
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 |
|