Sem van der Hoeven
8b94c80ca0
Merge branch 'cleanUpRepository'
...
# Conflicts:
# src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock
# src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties
Conflicts resolved using 'Theirs'
2019-03-06 15:01:11 +01:00
Sem van der Hoeven
5b802068ab
MOVE::moved GoGreen folder into src folder
...
because all our code is in the src folder, the gogreen folder should be here too
2019-03-06 14:53:22 +01:00
Sem van der Hoeven
7953d50409
ADD::Added build.gradle file in root
...
combined the contents of the two gradle build files into one, and put it into the root directory.
DELETE::removed pom.xml
deleted the pom.xml file, since it was used for maven and we use gradle in our project
2019-03-06 10:53:59 +01:00
mlwauben
dfc797fab2
DELETE: template files src
2019-03-04 17:03:08 +01:00
Sem van der Hoeven
f92f436bf7
Added some javadoc comments to GUI
2019-03-04 10:54:55 +01:00
Sem van der Hoeven
30e421d367
Added GUI backbone (login and redirect to main stage)
2019-03-04 09:37:21 +01:00
Sem van der Hoeven
77aa7fbb58
made packages for server and client in src folder
2019-03-01 13:03:38 +01:00
Sem van der Hoeven
890dd979fc
Added agenda for meeting 2 (25 feb)
2019-02-20 22:53:13 +01:00
OOP Project Team
d001b5ac26
OOP Project Template
2019-02-14 01:11:37 +01:00
