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

510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Merel Steenbergen
6a2eb27627 Merge branch 'Feature/delete_a_friend' into 'master' 
Feature/remove a friend

See merge request cse1105/2018-2019/oopp-group-43/template!60
 2019-04-03 14:29:36 +00:00
Merel Steenbergen
01e03782c2 Remove addFriend part from removeFriendTest from UserControllerTest.java 2019-04-03 13:40:53 +00:00
Merel Steenbergen
7b6457b286 ADD::RemoveFriend method and test in server.userController 2019-04-03 14:19:30 +02:00
Sem van der Hoeven
54d0537f95 EDIT::changed miles to kilometres in calculator 2019-04-03 11:52:03 +02:00
Ceren Ugurlu
b781727703 Delete suppression.xml 2019-04-01 17:54:41 +00:00
cugurlu
4c50eea99a Add meeting notes for week 8 2019-04-01 19:54:09 +02:00
Ceren Ugurlu
a38cd45e2a Merge branch 'add_weekly_reports' into 'master' 
Add weekly reports

See merge request cse1105/2018-2019/oopp-group-43/template!59
 2019-04-01 17:12:52 +00:00
Merel Steenbergen
e48264a667 EDIT:: Uncomment build.gradle mainClassName 2019-04-01 16:53:16 +02:00
Merel Steenbergen
12b05f3b73 ADD:: RemoveFriend method and test in client.userService 2019-04-01 16:46:01 +02:00
Merel Steenbergen
6d37b99c14 ADD:: RemoveFriend method and tests in Server.UserService 2019-04-01 16:43:10 +02:00
Merel Steenbergen
52291ac10f ADD:: Friend remove methods and tests in server.User 2019-04-01 16:36:12 +02:00
cugurlu
ae5d4a1496 Add coverage and checkstyle reports 2019-04-01 14:22:31 +02:00
Ceren Ugurlu
d7454345be Delete 20190401_checkstyle.png 2019-04-01 12:19:37 +00:00
Ceren Ugurlu
26693e8782 Merge branch 'add_savedCO2_property' into 'master' 
Add co2 saved property tables and tests

See merge request cse1105/2018-2019/oopp-group-43/template!58
v0.2 		2019-04-01 12:14:42 +00:00
cugurlu
e78be7ac9f Add co2 saved property tables and tests 2019-04-01 13:59:54 +02:00
Merel Steenbergen
a25c5da5ac Merge branch 'add/final_report_draft' into 'master' 
Add the draft of the final report

See merge request cse1105/2018-2019/oopp-group-43/template!57
 2019-04-01 11:59:32 +00:00
Merel Steenbergen
5ab7deb210 Rename the draft final report 2019-04-01 11:57:52 +00:00
Merel Steenbergen
9ad503db0d ADD: Right version of the draft of the final report 2019-04-01 13:51:24 +02:00
Mika Wauben
5a412cd170 Merge branch 'fix/checkstyle' into 'master' 
Fix/checkstyle

See merge request cse1105/2018-2019/oopp-group-43/template!55
 2019-04-01 11:38:24 +00:00
Mika Wauben
644f466696 Merge branch 'fix/checkstyle' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix/checkstyle 2019-04-01 11:38:23 +00:00
Merel Steenbergen
118ae797f5 Upload draft of the final report 2019-04-01 11:37:02 +00:00
Mika Wauben
fcaf3ddb49 Merge branch 'update/doc' into 'master' 
Update/doc

See merge request cse1105/2018-2019/oopp-group-43/template!54
 2019-03-31 17:45:31 +00:00
Mika Wauben
8f026a960e UPDATE:: readme, wow 4 commits for one file 2019-03-31 17:31:28 +00:00
Mika Wauben
b8bb8dc91c UPDATE:: readme, slowly getting there 2019-03-31 17:30:09 +00:00
Sem van der Hoeven
d824a3b819 EDIT::changed activities textfields to labels 2019-03-31 19:28:29 +02:00
Mika Wauben
a5dd8667b9 UPDATE:: readme because I am an idiot and didn't save my file yet ... 2019-03-31 17:27:56 +00:00
Mika Wauben
947ae660a0 UPDATE:: readme (start of the great readme) 2019-03-31 17:26:58 +00:00
Mika Wauben
c85432fb48 ADD:: agenda week8 2019-03-31 16:57:50 +00:00
Mika Wauben
f133e80ce3 Add new directory 2019-03-31 16:57:31 +00:00
Mika Wauben
97577cfd1c ADD:: backlog sprint6 2019-03-31 16:57:01 +00:00
Mika Wauben
0cfead72af Add new directory 2019-03-31 16:56:39 +00:00
Mika Wauben
c3124f509e ADD:: scrumboard sprint5 2019-03-31 16:56:24 +00:00
Mika Wauben
d484898ba1 ADD:: retrospective sprint5 2019-03-31 16:54:52 +00:00
Mika Wauben
bd225edea1 ADD:: review sprint5 2019-03-31 16:54:10 +00:00
Ceren Ugurlu
608d3ec40f Merge branch 'addActivitySummary_newTests' into 'master' 
Add activity summary and new tests

See merge request cse1105/2018-2019/oopp-group-43/template!53
 2019-03-31 14:12:44 +00:00
Ceren Ugurlu
c8b9b4d78f Solve the conflict 2019-03-31 13:36:21 +00:00
Sem van der Hoeven
a9f63f6fab Merge branch 'Add_extras_to_calculator' into 'master' 
edit/edited back javafx imports for checkstyle

See merge request cse1105/2018-2019/oopp-group-43/template!52
 2019-03-31 13:31:08 +00:00
Ceren Ugurlu
3f4e7cb9a9 Update README.md 2019-03-31 13:28:42 +00:00
Sem van der Hoeven
9f3597124d EDIT::edited back javafx imports for checkstyle 2019-03-31 15:28:08 +02:00
cugurlu
f4f79484fa Test all new methods 2019-03-31 15:27:07 +02:00
cugurlu
3b4add03ee Add new activity page properties 2019-03-31 15:26:48 +02:00
cugurlu
32c9713835 Add acitivitySummary to GUI 2019-03-31 15:26:06 +02:00
cugurlu
8e11ecbcf4 Add new methods for getInputMap from database 2019-03-31 15:25:40 +02:00
Ceren Ugurlu
9f45b1c8ac Merge branch 'Add_extras_to_calculator' into 'master' 
Extra section is added to the calculator

See merge request cse1105/2018-2019/oopp-group-43/template!51
 2019-03-31 13:19:54 +00:00
Sem van der Hoeven
c03538ff34 ADD::added section indicator bars to calculator 
Somehow they were deleted, so I added them again. Also added to the extra section
 2019-03-31 14:41:19 +02:00
Sem van der Hoeven
7805122c06 ADD::added 'extra' section to calculator 
added checkboxes to add extra activities
 2019-03-31 14:26:05 +02:00
Ceren Ugurlu
61ed9fc497 Merge branch 'fixBugs_addLeaderboard' into 'master' 
Fix bugs & add leaderboard

See merge request cse1105/2018-2019/oopp-group-43/template!50
 2019-03-31 11:07:47 +00:00
Sem van der Hoeven
85412af2a6 ADD::added style to friends table 2019-03-31 12:41:45 +02:00
cugurlu
5449c664bd Update README.md 2019-03-31 00:54:50 +01:00
cugurlu
b4a00fade2 Add new tests 2019-03-31 00:51:55 +01:00