Ceren Ugurlu
2e745e690c
Merge branch 'createCalculator' into 'master'
...
Merge createCalculator branch into master
See merge request cse1105/2018-2019/oopp-group-43/template!41
2019-03-25 13:40:13 +00:00
Merel Steenbergen
1cec006178
FIX: Create-drop databse. Add ManyToMany annotation
2019-03-25 14:37:45 +01:00
cugurlu
cf0952c7c2
Upload coverage report
2019-03-25 13:54:18 +01:00
cugurlu
b0d69bfc2c
Upload checkstyle report
2019-03-25 13:52:25 +01:00
Ceren Ugurlu
006cf60d17
Delete ActivityDto.java
2019-03-25 12:37:49 +00:00
Ceren Ugurlu
baf516e989
Delete ActivityDtoTest.java
2019-03-25 12:36:42 +00:00
Ceren Ugurlu
5c9c1b8be5
Delete Activity.java
2019-03-25 12:36:12 +00:00
Ceren Ugurlu
d7dcd95278
Delete ActivityTest.java
2019-03-25 12:34:54 +00:00
cugurlu
fc7e718b21
Add new tests
2019-03-25 13:33:38 +01:00
cugurlu
8e58118ac7
Add new classes for calculator
2019-03-25 13:32:01 +01:00
cugurlu
99143a8f20
Fix error
2019-03-25 13:30:25 +01:00
cugurlu
34e010f62d
Fix client errors
2019-03-25 13:18:48 +01:00
cugurlu
e8108498ad
Update UserDto and delete addVeganMealProperty
2019-03-25 13:07:03 +01:00
cugurlu
e79d050b12
Update UserDto in Common
2019-03-25 13:03:06 +01:00
Ceren Ugurlu
b9fb7d81ce
Merge branch 'updateDoc' into 'master'
...
Update doc
See merge request cse1105/2018-2019/oopp-group-43/template!40
2019-03-25 09:22:36 +00:00
Mika Wauben
563ae51408
ADD:: review sprint4
2019-03-25 09:17:58 +00:00
Mika Wauben
caa86f446d
ADD:: notes week6
2019-03-25 09:06:52 +00:00
Mika Wauben
ce669b47d2
ADD:: backlog sprint5
2019-03-25 09:04:16 +00:00
Mika Wauben
97d2a0f6fc
Add new directory
2019-03-25 09:03:54 +00:00
Mika Wauben
2dce37222d
ADD:: retrospective sprint4
2019-03-25 09:03:37 +00:00
Mika Wauben
a973ab0750
ADD:: scrum board sprint4
2019-03-25 09:03:08 +00:00
mlwauben
ae3ab8f563
FIX:: folder names were wrong
2019-03-25 10:02:11 +01:00
Sem van der Hoeven
d5319fc973
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template
...
sourcetree needed to merge this
2019-03-24 12:11:38 +01:00
Sem van der Hoeven
566af39b0d
ADD::added Agenda for next meetinf (25-03-2019)
2019-03-24 12:10:58 +01:00
Ceren Ugurlu
eb3326481a
Merge branch 'Add_friends_to_GUI' into 'master'
...
merge Add_friends_to_gui into master
See merge request cse1105/2018-2019/oopp-group-43/template!39
2019-03-24 11:05:11 +00:00
Sem van der Hoeven
b3d4f573f8
ADD::added table to friends pane
2019-03-24 12:01:34 +01:00
Merel Steenbergen
e494b5294d
Revert "Merge branch 'AddFriends' into 'master'"
...
This reverts merge request !37
2019-03-23 17:31:00 +00:00
Merel Steenbergen
18c3ce0c92
FIX: Database fix
2019-03-23 18:26:01 +01:00
Mika Wauben
5b3896d310
Merge branch 'AddFriends' into 'master'
...
Add basic friends
See merge request cse1105/2018-2019/oopp-group-43/template!37
2019-03-23 12:09:33 +00:00
Merel Steenbergen
f8315700d9
FIX: Uncomment mainClassName
2019-03-22 21:57:05 +01:00
Merel Steenbergen
6385beec06
FIX: Tests now work
2019-03-22 21:51:09 +01:00
Merel Steenbergen
12c2ebab4e
Debugging in progress. FindByName returns null again.
2019-03-22 20:20:39 +01:00
Merel Steenbergen
e69e08ad15
EDIT: Try to fix server, again
2019-03-22 18:44:59 +01:00
Sem van der Hoeven
ae000baba4
EDIT:::edited .gitignore
...
files like .classpath and .project were commented out, they now should be ignored by git
2019-03-22 09:25:48 +01:00
Sem van der Hoeven
caf9e3e1d9
Merge branch 'cleanUp_files' into 'master'
...
Merge cleanUp_files into master
See merge request cse1105/2018-2019/oopp-group-43/template!36
2019-03-22 07:41:37 +00:00
cugurlu
bddf984438
Clean up all unnecessary files
2019-03-21 18:07:14 +01:00
Merel Steenbergen
6323fd06eb
FIX: Bug fixed, Server now works again
2019-03-21 16:14:50 +01:00
Merel Steenbergen
fb69ec280d
Added testing for the friend list and equals in User class in Server
2019-03-21 16:09:23 +01:00
Sem van der Hoeven
dfdbc8d5a9
ADD::added friends pane and button to dashboard
...
ADD::added load animations to register window
2019-03-21 10:45:54 +01:00
Merel Steenbergen
b3a0ddaa68
Retry adding friends. Server down again
2019-03-20 15:44:47 +01:00
Sem van der Hoeven
93aaf19f13
DEBUG/FIX::fixed bug where total amount of vegetarian meals wouldn't update
...
fixed the bug where totalVeganMeals wouldn't update on clicking the activities button if you were already on the activities screen
ADD::added id to 'add activity' button on dashboard
for adding a color change when clicking it, still need to implement it completely
2019-03-20 13:15:12 +01:00
Sem van der Hoeven
8345b6c06f
ADD::Added slide-in transition for the menu bar
...
it gets played on load, right now it sometimes is a bit laggy but not sure if that is JavaFX or just everything getting loaded
2019-03-20 08:08:32 +01:00
Sem van der Hoeven
292035498c
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template
...
SourceTree needed to merge this?
2019-03-19 14:52:19 +01:00
Sem van der Hoeven
1f78805f9b
EDIT::Changed Login screen name from Go Green to Greenify
2019-03-19 14:49:47 +01:00
Sem van der Hoeven
9d38e1e541
Merge branch 'fixMaster' into 'master'
...
Merge fixMaster into master
See merge request cse1105/2018-2019/oopp-group-43/template!35
2019-03-19 13:48:39 +00:00
Ceren Ugurlu
121b86a73e
Merge branch 'master' into 'fixMaster'
2019-03-19 13:09:13 +00:00
Sem van der Hoeven
920c7c798d
ADD::added more comments
2019-03-18 20:47:34 +01:00
Ceren Ugurlu
2c54b8d68c
Merge branch 'AddComments' into 'master'
...
merge AddComments into master
See merge request cse1105/2018-2019/oopp-group-43/template!34
2019-03-18 16:14:49 +00:00
Ceren Ugurlu
0ed8dc34ab
Delete .project
2019-03-18 16:10:19 +00:00
Sem van der Hoeven
b8f4415825
ADD::added comments to most classes to make it more understandable
2019-03-18 17:07:38 +01:00
Ceren Ugurlu