Sem van der Hoeven
ecdc9f3a4f
ADD::Added hover effects
2019-03-18 15:48:10 +01:00
Sem van der Hoeven
2c32b7d65b
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template
...
SourceTree needed to merge this?
2019-03-18 15:31:41 +01:00
Sem van der Hoeven
8dd8ae28d4
ADD::added animations
...
added animations for switching between panes in the main stage
2019-03-18 15:30:55 +01:00
cugurlu
68036b3c2f
Update coverage report
2019-03-18 15:27:05 +01:00
Sem van der Hoeven
6a71823885
ADD::added stylesheet for login window
...
added style to the buttons, the same as in the register window
changed the font of the title
changed the font and color of the 'forgot password' link
ADD::added display of name on dashboard
added initialize method to set the 'welcome back' text to include the username of the user
2019-03-18 14:43:15 +01:00
Sem van der Hoeven
baa681833e
Merge branch 'Add_report' into 'master'
...
Merge Add_report branch into master
See merge request cse1105/2018-2019/oopp-group-43/template!33
2019-03-18 13:40:02 +00:00
cugurlu
166945871d
Fix UserService and UserServiceTest
2019-03-18 14:35:30 +01:00
cugurlu
17d5591146
Add coverage report
2019-03-18 14:17:22 +01:00
Sem van der Hoeven
874c6fba06
ADD::added title to main program stage
...
now displays "Greenify - <username>"
2019-03-18 13:34:34 +01:00
Ceren Ugurlu
f89470458b
Merge branch 'add_veganMealCounter' into 'master'
...
Merge branch add_veganMealCounter into master
See merge request cse1105/2018-2019/oopp-group-43/template!32
2019-03-18 12:16:32 +00:00
Ceren Ugurlu
318900b203
Merge branch 'master' into 'add_veganMealCounter'
2019-03-18 12:14:04 +00:00
cugurlu
584e5bf90c
Update GUI
2019-03-18 13:06:04 +01:00
Mika Wauben
436343d170
Merge branch 'updateDoc' into 'master'
...
Update doc
See merge request cse1105/2018-2019/oopp-group-43/template!31
2019-03-18 11:46:30 +00:00
mlwauben
4863ae4d3f
Merge branch 'updateDoc' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into updateDoc
2019-03-18 12:43:14 +01:00
mlwauben
97807293f9
ADD: meeting folders
2019-03-18 12:42:21 +01:00
Mika Wauben
8caf3bdac9
ADD: review sprint3
2019-03-18 11:38:29 +00:00
Mika Wauben
2e747fdc89
Delete 20190318_sprint_review.txt
2019-03-18 11:37:20 +00:00
Mika Wauben
0ca0a516bd
ADD: review sprint3
2019-03-18 11:37:10 +00:00
Mika Wauben
bb89b67e87
ADD: review sprint2
2019-03-18 11:36:41 +00:00
Mika Wauben
ba4b40efab
ADD: review sprint1
2019-03-18 11:36:21 +00:00
Mika Wauben
dbde18d3f2
ADD: scrum board sprint2
2019-03-18 11:35:19 +00:00
Mika Wauben
a15cfc21fc
Delete 20191003_scrumboard.png
2019-03-18 11:35:02 +00:00
Mika Wauben
9c9a98c738
ADD: scrum board sprint1
2019-03-18 11:34:50 +00:00
Mika Wauben
3af4d1778f
Delete 20190403_scrumboard.png
2019-03-18 11:34:31 +00:00
Mika Wauben
d3c42e70fe
ADD: backlog sprint4
2019-03-18 11:34:02 +00:00
Mika Wauben
8870ed1f56
Add new directory
2019-03-18 11:33:42 +00:00
mlwauben
b2ae1d75a5
DELETE: wrong folder
2019-03-18 12:33:03 +01:00
Mika Wauben
f018484556
ADD: retrospective sprint3
2019-03-18 11:31:44 +00:00
Mika Wauben
e12d5945ff
Upload scrum board sprint3
2019-03-18 11:31:05 +00:00
Sem van der Hoeven
6945eddf5d
Merge branch 'Get_UserControllerTest_Working'
...
# Conflicts:
# src/Server/src/test/java/UserControllerTest.java
2019-03-18 12:20:44 +01:00
cugurlu
f76a6827f7
Fix tests
2019-03-18 12:15:00 +01:00
cugurlu
a2e432d453
Add totalVeganMeal property and fix checkstyle errors
2019-03-18 12:14:30 +01:00
Sem van der Hoeven
3e5957b807
EDIT::commented out usercontrollertest, as it is still not working, but want to merge this branch to get the gui properly
2019-03-18 12:10:43 +01:00
Sem van der Hoeven
f66191f136
Merge branch 'Add_tests' into 'master'
...
Merge Add_tests branch into master
See merge request cse1105/2018-2019/oopp-group-43/template!28
2019-03-17 23:39:20 +00:00
cugurlu
711b16449c
Add RestExceptionHandler test
2019-03-18 00:35:29 +01:00
cugurlu
d7960103ee
Add UserRepository test
2019-03-18 00:34:51 +01:00
cugurlu
2546355eba
Add UserController test
2019-03-18 00:34:26 +01:00
cugurlu
8864320832
Add tests
2019-03-18 00:33:59 +01:00
Sem van der Hoeven
3c5bc0a651
FIX::fixed the fxml Label names
...
there were exceptions when trying to add a vegetarian meal, this was caused by the method not accessing the right label to change
2019-03-17 22:14:27 +01:00
Sem van der Hoeven
aa393da53b
FIX::fixed FXML declarations under fields
2019-03-17 22:05:29 +01:00
Ceren Ugurlu
76ebd018bd
Delete UserControllerTest.java
2019-03-17 20:50:20 +00:00
Ceren Ugurlu
88e7afb8fb
Update the location of ActivityTest.java
2019-03-17 20:49:01 +00:00
Ceren Ugurlu
e92dd0ba2b
Delete UserTest.java
2019-03-17 20:47:53 +00:00
Ceren Ugurlu
e0f0e38241
Delete MainController.java
2019-03-17 20:45:22 +00:00
Sem van der Hoeven
282d2026ba
FIX::fixed UserDto names
...
ADD::tried to add second test to see what was the problem, but no luck so far
2019-03-17 21:42:52 +01:00
Ceren Ugurlu
874b0bcd72
Merge branch 'add_documents' into 'master'
...
Merge add_documents branch into master
See merge request cse1105/2018-2019/oopp-group-43/template!27
2019-03-17 20:12:33 +00:00
cugurlu
a9e659fc9f
Add checkstyle screenshot
2019-03-17 21:04:24 +01:00
cugurlu
2c3314c693
Add week 5 agenda
2019-03-17 21:01:36 +01:00
Ceren Ugurlu
8524bb2e89
Update .gitlab-ci.yml
2019-03-17 19:13:47 +00:00
Ceren Ugurlu
8a4134c52b
Update .gitlab-ci.yml
2019-03-17 18:46:17 +00:00
