TheReturnOfTheMyHyvesBookPlus

MyHyvesBookPlus/TheReturnOfTheMyHyvesBookPlus

Fork 0

Commit Graph

Select branches

Hide Pull Requests

felix

marijn-appje

marijn-fixdingen

master

niels-logboek

niels-notulen

niels-profile

niels-projectplan

paul-profile

paul-zoom

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#4

#5

#6

#7

#8

#9

c671674f2d Merge branch 'niels-profile' into 'master' master Niels Zwemmer 2017-06-30 10:20:42 +02:00
fdcd141f23 Merge branch 'felix' into 'master' felix Felix Atsma 2017-06-30 10:10:54 +02:00
5f5269ceb8 Add logboek Felix Atsma 2017-06-30 10:10:26 +02:00
d7b2e54306 Merge branch 'marijn-logboek' into 'master' Marijn Jansen 2017-06-30 10:07:53 +02:00
8ea692c5a8 Logboek Marijn Jansen 2017-06-30 10:07:14 +02:00
f8265ac3aa Wrong dirname... whoops. niels-profile Niels Zwemmer 2017-06-30 10:05:27 +02:00
d0bd10a854 Added personal log file. Niels Zwemmer 2017-06-30 10:04:05 +02:00
d4bfe0206b Merge branch 'felix' into 'master' Felix Atsma 2017-06-30 00:02:04 +02:00
d61b058d0e Merge remote-tracking branch 'origin/master' into felix Felix Atsma 2017-06-30 00:01:22 +02:00
5c27584dd2 Added comments modified: ProfileAdapter.java modified: TimeLineAdapter.java paul-zoom Paul Lagerweij 2017-06-29 20:34:15 +02:00
4754c231fe Merge remote-tracking branch 'origin/niels-profile' into paul-zoom Paul Lagerweij 2017-06-29 20:30:19 +02:00
979f1aab9a Add comments Felix Atsma 2017-06-29 16:46:34 +02:00
250ee529fe Added comments for the files. Needs reviewing from Paul. Niels Zwemmer 2017-06-29 16:46:16 +02:00
69bbfeaacd Merge branch 'niels-profile' into 'master' Niels Zwemmer 2017-06-29 16:22:15 +02:00
1f4fa4c768 Fixed sepia filter uploading black pictures. Niels Zwemmer 2017-06-29 16:21:18 +02:00
dc7690e183 Merge branch 'marijn-fixdingen' into 'master' Marijn Jansen 2017-06-29 16:02:00 +02:00
a4108e9e19 Fixed double things in timeline :) marijn-fixdingen Marijn Jansen 2017-06-29 16:01:04 +02:00
dc3db134c0 Merge branch 'niels-profile' into 'master' Niels Zwemmer 2017-06-29 15:51:29 +02:00
32f39a35db Profile timeline button remade. Niels Zwemmer 2017-06-29 15:51:00 +02:00
98f986fc0a Merge conflict fixed Niels Zwemmer 2017-06-29 15:45:22 +02:00
5a6abe85f1 Timeline layout now with imagebutton Felix Atsma 2017-06-29 15:41:16 +02:00
ab54ffb9ec Merge conflict resolved. Niels Zwemmer 2017-06-29 15:23:36 +02:00
6258c2a91a Fixed the refresh combined with the progressBar. Niels Zwemmer 2017-06-29 15:20:40 +02:00
0a7c49b3a3 added animation Paul Lagerweij 2017-06-29 15:18:12 +02:00
63236c5895 Merge remote-tracking branch 'origin/niels-profile' into felix Felix Atsma 2017-06-29 14:43:34 +02:00
d8c04c78ea Fix keyboard hiding crash + prettify findviewbyid's in camerafragment Felix Atsma 2017-06-29 14:32:03 +02:00
9d016b8c65 Added a progressBar to the profilepage aswell. Niels Zwemmer 2017-06-29 14:01:27 +02:00
7895054743 Merge remote-tracking branch 'origin/felix' into niels-profile Niels Zwemmer 2017-06-29 13:44:08 +02:00
c38cc026fc Add progress bar for timeline Felix Atsma 2017-06-29 13:42:44 +02:00
bd4149ccb1 Added rotate restriction. Merge-prep with Felix. Niels Zwemmer 2017-06-29 13:41:23 +02:00
27b005930f Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-29 13:36:15 +02:00
7936350ede Fix! marijn-appje Marijn Jansen 2017-06-29 13:35:49 +02:00
c517c2ef10 Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-29 13:34:34 +02:00
c9eb4b62a1 Merge remote-tracking branch 'origin/master' into marijn-appje Marijn Jansen 2017-06-29 13:34:20 +02:00
71d412beac Date works Marijn Jansen 2017-06-29 13:28:19 +02:00
af47900288 Better name for niet slechts. Marijn Jansen 2017-06-29 13:21:58 +02:00
5ae1d1f964 Added NietSlechts! Marijn Jansen 2017-06-29 13:19:12 +02:00
4eed601b7d WIP: for Felix Niels Zwemmer 2017-06-29 12:50:29 +02:00
26a7239caa Much cleaner code. Known bugs seem to be fixed. Added extra progressDialog for posts downloading. Niels Zwemmer 2017-06-29 00:35:55 +02:00
1fdd21440b Potentially fixed Felix' bug in the camera. Also made some changes for better readability of my own code. Niels Zwemmer 2017-06-28 19:46:38 +02:00
2315d58598 Changed some appearances of the personal posts. Niels Zwemmer 2017-06-28 18:02:28 +02:00
ab79fa7d7c Changed some appearances of the personal posts. Niels Zwemmer 2017-06-28 17:58:32 +02:00
52d15a80ca Working refresh, working user-specific posts in profile. Niels Zwemmer 2017-06-28 17:44:27 +02:00
c8f65c0dca Merge branch 'felix' into 'master' Felix Atsma 2017-06-28 16:04:01 +02:00
0560e6a0fb Fix front facing camera Felix Atsma 2017-06-28 16:03:16 +02:00
93434a981f Layout profile changes + half of a reloader Felix Atsma 2017-06-28 15:28:40 +02:00
2621062c60 Merge branch 'niels-profile' into 'master' Niels Zwemmer 2017-06-28 13:16:12 +02:00
43a1fcd52c Merge remote-tracking branch 'origin/master' into niels-profile Niels Zwemmer 2017-06-28 13:15:19 +02:00
982d7d4279 Merge remote-tracking branch 'origin/master' into niels-profile Niels Zwemmer 2017-06-28 13:14:10 +02:00
a04866ba3f Merge branch 'felix' into 'master' Felix Atsma 2017-06-28 13:14:09 +02:00
f1befdd21c Merge remote-tracking branch 'origin/master' into felix Felix Atsma 2017-06-28 13:13:34 +02:00
cab6728a54 Improve timeline layout Felix Atsma 2017-06-28 13:12:48 +02:00
017b5890c2 Neated up the code. Niels Zwemmer 2017-06-28 13:11:30 +02:00
fe15764d2b Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-28 12:47:33 +02:00
bfd018ad4a Option to get own posts. Marijn Jansen 2017-06-28 12:46:57 +02:00
ba832682bf Merge branch 'felix' into 'master' Felix Atsma 2017-06-28 12:05:34 +02:00
f0719c51f9 Add cancel button, fix button switching, change icons to vector Felix Atsma 2017-06-28 12:01:05 +02:00
3aab463143 Added error message-shows and mail_successful/mail_failed to the error messages. Niels Zwemmer 2017-06-28 11:13:39 +02:00
2db1254750 Image preview working Felix Atsma 2017-06-28 10:25:54 +02:00
16c3b727fc Working profile page with Adapter. Need Marijn to fix the downloadclass to show user-only content instead of entire timeline. Niels Zwemmer 2017-06-27 16:12:42 +02:00
d3395f3e9b Add negative filter + rotate half working Felix Atsma 2017-06-27 15:06:20 +02:00
7ed5c36884 Merge remote-tracking branch 'origin/paul-profile' into niels-profile Niels Zwemmer 2017-06-27 13:22:40 +02:00
0c3ed94bb7 put back profile naming paul-profile Paul Lagerweij 2017-06-27 13:21:30 +02:00
744ab1a9c0 Merge remote-tracking branch 'origin/paul-profile' into niels-profile Niels Zwemmer 2017-06-27 13:20:29 +02:00
b11cc95000 put back 'niet slecht count profile' Paul Lagerweij 2017-06-27 13:19:25 +02:00
cebc1bd59b Merge remote-tracking branch 'origin/paul-profile' into niels-profile Niels Zwemmer 2017-06-27 13:16:26 +02:00
1d3537cdde First attempt at ProfileAdapter. Not in working state. Niels Zwemmer 2017-06-27 13:15:55 +02:00
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 Paul Lagerweij 2017-06-27 13:13:43 +02:00
08849521e1 Fix comment box clickable + prettify Felix Atsma 2017-06-27 12:37:23 +02:00
046e3f9400 Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-27 12:12:45 +02:00
ab0b105640 Fix for timeline Marijn Jansen 2017-06-27 12:11:52 +02:00
2b7965ad61 Fix for timeline scrolling Marijn Jansen 2017-06-27 12:10:56 +02:00
726129db5b Merge branch 'niels-profile' into 'master' Niels Zwemmer 2017-06-27 11:33:29 +02:00
f60005c29d Merge remote-tracking branch 'origin/master' into niels-profile Niels Zwemmer 2017-06-27 11:33:02 +02:00
9322840d10 Minor changes to picture. Niels Zwemmer 2017-06-27 11:29:48 +02:00
1c9da2c8dc Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-27 11:18:32 +02:00
0b943e3a1a Fixed a crash when switching fast to profile after loading the app. Marijn Jansen 2017-06-27 11:17:31 +02:00
84353046a5 Fixed implement runtime error for Felix. Made some minor changes to both strings.xml and ProfilePictureUploader (error when old picture not present). Niels Zwemmer 2017-06-27 11:11:29 +02:00
2ad161049a Merge remote-tracking branch 'origin/master' into marijn-appje Marijn Jansen 2017-06-27 09:10:20 +02:00
d3558b6344 Merge branch 'niels-notulen' into 'master' Niels Zwemmer 2017-06-26 23:39:06 +02:00
41bacb3b4f Added today's counsil minutes. niels-notulen Niels Zwemmer 2017-06-26 23:38:14 +02:00
2db99500af Merge branch 'felix' into 'master' Felix Atsma 2017-06-26 23:37:29 +02:00
350e55271e Make camera (mostly) fullscreen + add comment function Felix Atsma 2017-06-26 23:36:03 +02:00
3f00e09592 fix for permissions. Marijn Jansen 2017-06-26 18:54:45 +02:00
2c40a1b8da Merge remote-tracking branch 'origin/master' into marijn-appje Marijn Jansen 2017-06-26 16:23:26 +02:00
0136868ea8 Merge branch 'niels-profile' into 'master' Niels Zwemmer 2017-06-26 16:21:08 +02:00
b20534aaec Merge branch 'master' into 'niels-profile' Niels Zwemmer 2017-06-26 16:20:45 +02:00
507fac220c Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-26 16:16:12 +02:00
d4d10e3f6f Profile page working, better quality picture aswell. Only needs personal feed. Niels Zwemmer 2017-06-26 16:13:44 +02:00
035f94ec66 Merge remote-tracking branch 'origin/master' into marijn-appje Marijn Jansen 2017-06-26 15:23:17 +02:00
6142e93957 Merge branch 'master' into 'marijn-appje' Marijn Jansen 2017-06-26 15:21:20 +02:00
247a443aba Timeline things working right now Woohoo! Marijn Jansen 2017-06-26 15:20:18 +02:00
e54e423847 Made some changes to process gitmerge. Niels Zwemmer 2017-06-26 11:53:04 +02:00
03d4244daf Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-26 11:37:03 +02:00
766711faee Merge branch 'niels-notulen' into 'master' Marijn Jansen 2017-06-26 10:54:12 +02:00
046b04e83a Merge branch 'niels-logboek' into 'master' Marijn Jansen 2017-06-26 10:53:27 +02:00
801acc24fa Merge branch 'felix' into 'master' Felix Atsma 2017-06-26 10:51:41 +02:00
d3d5a41037 Merge remote-tracking branch 'origin/master' into felix Felix Atsma 2017-06-26 10:51:36 +02:00
d90a878a58 Camera filter switching and uploading Felix Atsma 2017-06-26 10:43:59 +02:00
a9ad130866 Added failure messages. Marijn Jansen 2017-06-25 15:06:13 +02:00

1 2