Sem van der Hoeven
aa79365784
apparently the changes that were supposed to be made weren't committed in my previous commit, so here is the right one
...
REMOVE:: removed the .gradle and build folders from the Client, Server and Common folders, also moved the contents that was in the src folders of these folders, to the folders themselves and deleted the src folders
EDIT:: edited the build.gradle file, build should now work
combined the build.gradle files in the Client, Server and Common folders into the build.gradle file in the root
2019-03-06 21:22:29 +01:00
Sem van der Hoeven
7a60ecb60f
REMOVE:: removed the .gradle and build folders from the Client, Server and Common folders, also moved the contents that was in the src folders of these folders, to the folders themselves and deleted the src folders
...
EDIT:: edited the build.gradle file, build should now work
combined the build.gradle files in the Client, Server and Common folders into the build.gradle file in the root
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix_gradle_build_file
2019-03-06 21:20:09 +01:00
Sem van der Hoeven
7b1dc88653
REMOVE:: removed the .idea and .gradle files from the GoGreen subfolders
...
REMOVE:: removed the Client and Server folders from the src folder
they were no longer necessary since everything now is in the GoGreen folder
EDIT:: edited .gitignore file
.gitignore file should now exclude the .idea and .gradle directories
FIX:: fixed the gradle build file.
had to set the main class, for testing purposes I set the GUI.logincontroller class as main class, but this will change
2019-03-06 16:07:26 +01:00
Sem van der Hoeven
7bdd47ba90
ADD::added .gitlab-ci.yml
...
added because it was deleted with merge of branch 'cleanUpRepository', but we need it for the ci
2019-03-06 14:06:08 +00:00
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
3dc679983a
FIX:: changed project name in gradle settings from OOP Project to OOPP
...
Merge branch 'cleanUpRepository' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template
2019-03-06 11:08:02 +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
Sem van der Hoeven
ccf71de156
Sem van der Hoeven estimated hours filled in
2019-03-04 12:47:10 +01:00
Sem van der Hoeven
302a7d8d9e
Merge branch 'Development'
2019-03-04 11:57:15 +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
97fb18f6af
Add LICENSE
2019-03-01 12:21:25 +00: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
40d1b04caf
updated gitignore, Merge branch 'updateCientServer' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template
2019-02-27 09:51:09 +01:00
Sem van der Hoeven
3f333fa420
manually removed the directories that were to be ignored
2019-02-27 09:47:03 +01:00
Sem van der Hoeven
992dadce97
Delete .classpath
2019-02-27 08:28:17 +00:00
Sem van der Hoeven
5b84f43c72
Delete .project
2019-02-27 08:27:15 +00:00
Sem van der Hoeven
9e5a90215b
Add .gitlab-ci.yml
2019-02-27 08:22:12 +00:00
Sem van der Hoeven
651dd6cf39
Update 20190225_agenda.md
2019-02-25 15:22:34 +00:00
Sem van der Hoeven
b52319380b
small update to gitignore, it should now exclude the .gradle and .idea folders in the client and server folder
2019-02-25 16:02:04 +01:00
Sem van der Hoeven
10cbf84cde
Update 20190225_agenda.md
2019-02-25 14:59:00 +00:00
Sem van der Hoeven
f0d30fa3e8
Update 20190225_agenda.md
2019-02-25 14:47:47 +00:00
Sem van der Hoeven
42b493c9ea
Update 20190225_agenda.md
2019-02-25 14:25:18 +00:00
Sem van der Hoeven
09f5492e57
Update 20190225_agenda.md
2019-02-25 14:17:32 +00:00
Sem van der Hoeven
d7da1944fb
Update 20190225_agenda.md
2019-02-25 14:14:58 +00:00
Sem van der Hoeven
115402896a
Added a few comments to server java files
2019-02-25 07:59:10 +01:00
Sem van der Hoeven
bbaa0c4ada
Added a general overview of the API's and frameworks we've come across
2019-02-25 07:52:56 +01:00
Sem van der Hoeven
05d5a5495b
added gitignore to server folder
2019-02-24 13:22:54 +01:00
Sem van der Hoeven
62a64c5b2a
Updated agenda with points from meetup on 22-2-2019
2019-02-22 13:30:44 +01:00
Sem van der Hoeven
3b63b33643
Updated the agenda for meeting 25-02
2019-02-22 07:27:15 +01:00
Sem van der Hoeven
56c7eda8c6
Merge branch 'Hello_World_Testing'
2019-02-20 22:56:24 +01:00
Sem van der Hoeven
890dd979fc
Added agenda for meeting 2 (25 feb)
2019-02-20 22:53:13 +01:00
Sem van der Hoeven
e6b543a4f8
Merge commit '3f2d58875de6f3bf6cf638f1ee6d0e845b715095' into Hello_World_Testing
2019-02-19 14:53:48 +01:00
Sem van der Hoeven
e466033b10
updated gitignore file with gitignore.io. commented out the part that was already there
2019-02-18 16:33:17 +01:00
Sem van der Hoeven
fd350cf9bb
Added javafx part to main client test, instructions are in comments in the code
2019-02-18 16:20:46 +01:00
Sem van der Hoeven
7b1c5e8beb
SourceTree check
2019-02-18 13:20:20 +01:00
Sem van der Hoeven
881e6388dc
Added my core quadrant
2019-02-14 14:41:54 +00:00
Sem van der Hoeven
8966bd3192
added picture
2019-02-14 14:19:40 +00:00
Sem van der Hoeven