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

Mono Color

• c2582c128a Spilt UploadClass in two classes. Posts are now obtainable from firebase. Marijn Jansen 2017-06-25 15:01:52 +02:00
• 8678cc9111 Added today and yesterday's entries. Forgot about adding the meeting. It is now added. niels-logboek Niels Zwemmer 2017-06-24 20:58:00 +02:00
• cc1b83b0e0 Added today and yesterday's entries. Niels Zwemmer 2017-06-24 20:24:09 +02:00
• 5181128504 Committed files for others to look at and improve: Photo upload does not work properly. Niels Zwemmer 2017-06-24 13:40:02 +02:00
• 83d2bda5c1 Resolved conflicts. Niels Zwemmer 2017-06-23 20:39:57 +02:00
• a71fc80f59 Added ProgressDialog to upload. Marijn Jansen 2017-06-23 20:35:47 +02:00
• da765832f1 Merge remote-tracking branch 'origin/marijn-appje' into niels-profile Niels Zwemmer 2017-06-23 19:19:48 +02:00
• 3855d9d917 Cleared up code and made first (failed) attempt at progressDialog. Niels Zwemmer 2017-06-23 17:30:29 +02:00
• 8ba9f7f8e3 Delete profile pics on replace. Marijn Jansen 2017-06-23 16:40:34 +02:00
• 6aeacbfc8a Merge remote-tracking branch 'origin/master' into niels-profile Niels Zwemmer 2017-06-23 16:11:53 +02:00
• 6d7930ee03 Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-23 16:08:47 +02:00
• c056d96138 Profile photo update things. Marijn Jansen 2017-06-23 16:08:07 +02:00
• a8a026d18f Merge remote-tracking branch 'origin/marijn-appje' into niels-profile Niels Zwemmer 2017-06-23 15:27:46 +02:00
• 6e55954dde Made a listener! Marijn Jansen 2017-06-23 15:24:57 +02:00
• c78f01dbfe Merge remote-tracking branch 'origin/marijn-appje' into niels-profile Niels Zwemmer 2017-06-23 14:35:50 +02:00
• 0e25ff63cc Cleaned code, added an invalidate. Needs testing. Niels Zwemmer 2017-06-23 14:35:25 +02:00
• b570e5ef21 Unique Profile pic name. Marijn Jansen 2017-06-23 14:35:20 +02:00
• 06eb90bc9f Added council minutes of today. Niels Zwemmer 2017-06-23 13:14:15 +02:00
• c5c6ba7a47 Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-23 12:45:10 +02:00
• d8eea0bb70 Profile pics working! Marijn Jansen 2017-06-23 12:44:25 +02:00
• 0f98bdb5ea Merge remote-tracking branch 'origin/niels-profile' into marijn-appje Marijn Jansen 2017-06-23 11:50:04 +02:00
• 2a89827b63 Added Post classess enz. Marijn Jansen 2017-06-23 11:46:30 +02:00
• b0a99b3ab1 Bugprone version of Profilefragment. Niels Zwemmer 2017-06-23 11:44:43 +02:00
• d7dcaa6c29 Added today's log entry. Niels Zwemmer 2017-06-22 20:53:01 +02:00
• 66221c4393 Merge branch 'felix' into 'master' Felix Atsma 2017-06-22 12:45:46 +02:00
• a93f8a500d Add error strings Felix Atsma 2017-06-22 12:44:56 +02:00
• 95bb92930e Merge branch 'felix' into 'master' Felix Atsma 2017-06-22 11:40:27 +02:00
• e5285f91d5 Merge branch 'paul-profile' into 'master' Marijn Jansen 2017-06-22 11:39:34 +02:00
• 37507c3f5f Merge branch 'master' into 'paul-profile' Marijn Jansen 2017-06-22 11:39:07 +02:00
• 6e08558769 Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-22 11:37:40 +02:00
• a2d333c627 Camera switching working Felix Atsma 2017-06-22 11:36:56 +02:00
• aabe207594 Because Paul wanted to Merge Marijn Jansen 2017-06-22 11:36:17 +02:00
• 9a8feee49f small improvement to ProfileFragment.java Paul Lagerweij 2017-06-22 11:11:50 +02:00
• cd45463f6a improved some code layout ProfileFragment.java Paul Lagerweij 2017-06-22 11:07:33 +02:00
• 60e58b40bc Added password reset functionality as well as username display in the app. Also, round launcher icons have been uploaded. Niels Zwemmer 2017-06-21 20:54:14 +02:00
• 08ec6e3ee8 Added updated log file. Niels Zwemmer 2017-06-21 15:52:15 +02:00
• cafe39d045 Minor changes. Niels Zwemmer 2017-06-21 15:47:45 +02:00
• 84a2c75c85 Merge remote-tracking branch 'origin/paul-profile' into niels-profile Niels Zwemmer 2017-06-21 14:40:32 +02:00
• 63bef257da overlay change profile picture button Paul Lagerweij 2017-06-21 14:39:40 +02:00
• fa3f42da7e Added password change functions. Niels Zwemmer 2017-06-21 14:38:05 +02:00
• 6faf1c9400 add padding to profile fragment Paul Lagerweij 2017-06-21 14:12:32 +02:00
• d0386a533f Added a new default profile picture. Tested and working, changed filename of avatar Niels Zwemmer 2017-06-21 14:10:13 +02:00
• d326785082 Added a new default profile picture. Tested and working, changed filename of avatar Niels Zwemmer 2017-06-21 14:09:59 +02:00
• fe1960fdce Merge remote-tracking branch 'origin/paul-profile' into niels-profile Niels Zwemmer 2017-06-21 14:06:49 +02:00
• 4005bef38c added change psw button to profile fragment Paul Lagerweij 2017-06-21 14:06:05 +02:00
• 1a944364c4 Added a new default profile picture. Niels Zwemmer 2017-06-21 14:06:00 +02:00
• e48ddd6b82 Merge remote-tracking branch 'origin/paul-profile' into niels-profile Niels Zwemmer 2017-06-21 13:43:09 +02:00
• 80e2935b23 Added new launcher logo, made some minor changes to ProfileFragment.java Niels Zwemmer 2017-06-21 13:42:42 +02:00
• d982c8ba49 change layout profile fragment Paul Lagerweij 2017-06-21 13:42:32 +02:00
• 6db7ca20ae default picture if no profile photo in firebase Paul Lagerweij 2017-06-21 13:07:29 +02:00
• e787204ce7 Fixed bugs in profile fragment. Niels Zwemmer 2017-06-21 12:32:06 +02:00
• 72003c75ff Merge remote-tracking branch 'origin/paul-profile' into niels-profile Niels Zwemmer 2017-06-21 12:22:39 +02:00
• 92bf29dd84 Small changes made to appearance. Niels Zwemmer 2017-06-21 12:17:23 +02:00
• bb69d3f695 first implementation of profile picture Paul Lagerweij 2017-06-21 12:16:00 +02:00
• 27416aae85 Added functionality framework for the profile pic button for Paul. He can now bind actions to the button. Niels Zwemmer 2017-06-21 12:04:26 +02:00
• 86ab31a681 Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/TheReturnOfTheMyHyvesBookPlus into niels-notulen Niels Zwemmer 2017-06-21 11:08:10 +02:00
• c040ef495f Merge remote-tracking branch 'origin/master' into marijn-appje Marijn Jansen 2017-06-20 22:19:24 +02:00
• 75d1e6b4ed Deleted some files Marijn Jansen 2017-06-20 22:00:43 +02:00
• 442c5bd642 Added dialogs and checks to login en register, also started working on Uploads Marijn Jansen 2017-06-20 21:59:53 +02:00
• 1e5239921a Camera preview working, with non working picture button Felix Atsma 2017-06-20 21:20:54 +02:00
• 39a48044d3 Removed produced PDF of counsil minutes and replaced it with .tex file. Also, added a new .tex file for today's meeting. Niels Zwemmer 2017-06-20 19:53:56 +02:00
• f3ee792d22 Added today's log Niels Zwemmer 2017-06-20 19:21:30 +02:00
• 01a27d8a95 Added logboek template Niels Zwemmer 2017-06-20 14:39:37 +02:00
• 291261fcee fragment_profile.xml test Paul Lagerweij 2017-06-20 13:39:07 +02:00
• 3aac4fc96d login-, picture-button to fragment_profile.xml button's are next to each other Paul Lagerweij 2017-06-20 13:01:51 +02:00
• b9ab2676a6 Merge remote-tracking branch 'origin/niels-profile' into paul-profile Paul Lagerweij 2017-06-20 11:40:43 +02:00
• bd2b69a330 Added some changes to form a baseline for Paul Niels Zwemmer 2017-06-20 11:39:50 +02:00
• c27b608168 Merge remote-tracking branch 'origin/marijn-appje' into paul-profile Paul Lagerweij 2017-06-20 11:29:03 +02:00
• 720865fd7e Merge remote-tracking branch 'origin/marijn-appje' into niels-profile Niels Zwemmer 2017-06-20 11:28:24 +02:00
• 23db910b92 New OnClick and icons Marijn Jansen 2017-06-20 11:27:38 +02:00
• c05737575a Merge branch 'marijn-appje' into 'master' niels-projectplan Marijn Jansen 2017-06-19 16:03:22 +02:00
• 2d91516020 Fragments change working! Marijn Jansen 2017-06-19 16:02:48 +02:00
• 6727163184 Merge branch 'niels-projectplan' into 'master' Felix Atsma 2017-06-19 14:57:00 +02:00
• 85aac4f4c0 Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-19 14:52:58 +02:00
• 54c9521ef1 Added google-services.json Marijn Jansen 2017-06-19 14:52:20 +02:00
• 8cdb00c9d6 Merge branch 'master' into marijn-appje Marijn Jansen 2017-06-19 14:48:02 +02:00
• 6547e2dfbb Merge remote-tracking branch 'origin/master' into marijn-appje Marijn Jansen 2017-06-19 14:46:45 +02:00
• f9597feecd Merge branch 'marijn-appje' into 'master' Marijn Jansen 2017-06-19 14:41:21 +02:00
• 854bc46c1b Made some fragments :) Marijn Jansen 2017-06-19 12:18:38 +02:00
• d6ed35e02a Minor changes were made on recommendation by Marijn. Final version which was also handed in on BlackBoard. Niels Zwemmer 2017-06-18 20:27:58 +02:00
• 7297ab00b9 Minor changes were made on recommendation by Marijn. Final version which was also handed in on BlackBoard. Niels Zwemmer 2017-06-18 20:23:24 +02:00
• 3df953c0fd Cleanup and reorganisation. Marijn Jansen 2017-06-16 14:53:44 +02:00
• 3bad43e3a5 LogIn and register works! Marijn Jansen 2017-06-15 12:48:13 +02:00
• 33ed3f93c0 Merge branch 'niels-projectplan' into 'master' Niels Zwemmer 2017-06-14 11:50:10 +02:00
• a734204433 First version of project plan, excluding the planning Niels Zwemmer 2017-06-14 11:42:56 +02:00
• a2902e4546 Removed placeholder Marijn Jansen 2017-06-14 09:12:01 +02:00
• 48b84cad93 Begin of the app Marijn Jansen 2017-06-14 09:11:13 +02:00
• 7eab8f2257 First, unofficial council minutes. Niels Zwemmer 2017-06-13 20:10:26 +02:00
• bacb3616bf Added ignore file. Marijn Jansen 2017-06-13 11:40:48 +02:00
• e5add9379f Init and Organisation of the repo Marijn Jansen 2017-06-13 11:37:13 +02:00