Commit Graph

131 Commits

Author SHA1 Message Date
Felix Atsma
1e5239921a Camera preview working, with non working picture button 2017-06-20 21:20:54 +02:00
Niels Zwemmer
39a48044d3 Removed produced PDF of counsil minutes and replaced it with .tex file. Also, added a new .tex file for today's meeting. 2017-06-20 19:53:56 +02:00
Niels Zwemmer
f3ee792d22 Added today's log 2017-06-20 19:21:30 +02:00
Niels Zwemmer
01a27d8a95 Added logboek template 2017-06-20 14:39:37 +02:00
Paul Lagerweij
291261fcee fragment_profile.xml test 2017-06-20 13:39:07 +02:00
Paul Lagerweij
3aac4fc96d login-, picture-button to fragment_profile.xml
button's are next to each other
2017-06-20 13:01:51 +02:00
Paul Lagerweij
b9ab2676a6 Merge remote-tracking branch 'origin/niels-profile' into paul-profile 2017-06-20 11:40:43 +02:00
Niels Zwemmer
bd2b69a330 Added some changes to form a baseline for Paul 2017-06-20 11:39:50 +02:00
Paul Lagerweij
c27b608168 Merge remote-tracking branch 'origin/marijn-appje' into paul-profile 2017-06-20 11:29:03 +02:00
Niels Zwemmer
720865fd7e Merge remote-tracking branch 'origin/marijn-appje' into niels-profile 2017-06-20 11:28:24 +02:00
Marijn Jansen
23db910b92 New OnClick and icons 2017-06-20 11:27:38 +02:00
Marijn Jansen
c05737575a Merge branch 'marijn-appje' into 'master'
Fragments change working!

See merge request !5
2017-06-19 16:03:22 +02:00
Marijn Jansen
2d91516020 Fragments change working! 2017-06-19 16:02:48 +02:00
Felix Atsma
6727163184 Merge branch 'niels-projectplan' into 'master'
Niels projectplan

See merge request !4
2017-06-19 14:57:00 +02:00
Marijn Jansen
85aac4f4c0 Merge branch 'marijn-appje' into 'master'
Marijn appje

See merge request !3
2017-06-19 14:52:58 +02:00
Marijn Jansen
54c9521ef1 Added google-services.json 2017-06-19 14:52:20 +02:00
Marijn Jansen
8cdb00c9d6 Merge branch 'master' into marijn-appje 2017-06-19 14:48:02 +02:00
Marijn Jansen
6547e2dfbb Merge remote-tracking branch 'origin/master' into marijn-appje 2017-06-19 14:46:45 +02:00
Marijn Jansen
f9597feecd Merge branch 'marijn-appje' into 'master'
Marijn appje

See merge request !2
2017-06-19 14:41:21 +02:00
Marijn Jansen
854bc46c1b Made some fragments :) 2017-06-19 12:18:38 +02:00
Niels Zwemmer
d6ed35e02a Minor changes were made on recommendation by Marijn. Final version which was also handed in on BlackBoard. 2017-06-18 20:27:58 +02:00
Niels Zwemmer
7297ab00b9 Minor changes were made on recommendation by Marijn. Final version which was also handed in on BlackBoard. 2017-06-18 20:23:24 +02:00
Marijn Jansen
3df953c0fd Cleanup and reorganisation. 2017-06-16 14:53:44 +02:00
Marijn Jansen
3bad43e3a5 LogIn and register works! 2017-06-15 12:48:13 +02:00
Niels Zwemmer
33ed3f93c0 Merge branch 'niels-projectplan' into 'master'
First version of project plan, excluding the planning

See merge request !1
2017-06-14 11:50:10 +02:00
Niels Zwemmer
a734204433 First version of project plan, excluding the planning 2017-06-14 11:42:56 +02:00
Marijn Jansen
a2902e4546 Removed placeholder 2017-06-14 09:12:01 +02:00
Marijn Jansen
48b84cad93 Begin of the app 2017-06-14 09:11:13 +02:00
Niels Zwemmer
7eab8f2257 First, unofficial council minutes. 2017-06-13 20:10:26 +02:00
Marijn Jansen
bacb3616bf Added ignore file. 2017-06-13 11:40:48 +02:00
Marijn Jansen
e5add9379f Init and Organisation of the repo 2017-06-13 11:37:13 +02:00