Marijn Jansen
|
c040ef495f
|
Merge remote-tracking branch 'origin/master' into marijn-appje
|
2017-06-20 22:19:24 +02:00 |
|
Marijn Jansen
|
75d1e6b4ed
|
Deleted some files
|
2017-06-20 22:00:43 +02:00 |
|
Marijn Jansen
|
442c5bd642
|
Added dialogs and checks to login en register, also started working on Uploads
|
2017-06-20 21:59:53 +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 |
|
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 |
|