sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
694 Commits 4 Branches 6 Tags
b266160e934750166b608dfc699fbaef4b6a0e4f
Commit Graph

694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2e244e600f Delete OOPP.kotlin_module 2019-03-18 15:58:27 +00:00
Ceren Ugurlu
32b0554329 Delete .classpath 2019-03-18 15:58:06 +00:00
Ceren Ugurlu
4f089d8408 Delete CSE1105.checkstyle.xml 2019-03-18 15:57:47 +00:00
cugurlu
563c72ffec Update branch 2019-03-18 16:56:44 +01:00
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>"
v0.1.1 		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