 Ceren Ugurlu
|
7043f7253d
|
Merge branch 'fix/sorting_bugs' into 'master'
Fix sorting bugs
See merge request cse1105/2018-2019/oopp-group-43/template!76
|
2019-04-08 12:37:57 +00:00 |
|
|
cugurlu
|
b99b66b87b
|
Fix sorting errors
|
2019-04-08 14:34:38 +02:00 |
|
|
Ceren Ugurlu
|
dbe6fc4e33
|
Delete README.md
|
2019-04-08 10:38:36 +00:00 |
|
|
Ceren Ugurlu
|
231c580f7a
|
Merge branch 'connect_new_extras' into 'master'
Fix errors for new extras and upload docs
See merge request cse1105/2018-2019/oopp-group-43/template!73
|
2019-04-08 09:27:16 +00:00 |
|
|
cugurlu
|
7867853cdb
|
Upload coverage report
|
2019-04-08 11:18:04 +02:00 |
|
|
cugurlu
|
39b108626b
|
Upload checkstyle report
|
2019-04-08 11:17:49 +02:00 |
|
|
cugurlu
|
8195650226
|
Fix all errors for extra activities
|
2019-04-08 11:17:34 +02:00 |
|
|
cugurlu
|
9310674301
|
Fix checkstyle errors
|
2019-04-08 11:17:02 +02:00 |
|
|
Ceren Ugurlu
|
55fe2b6795
|
Merge branch 'develop_achievements' into 'master'
Develop achievements
See merge request cse1105/2018-2019/oopp-group-43/template!72
|
2019-04-07 16:00:55 +00:00 |
|
|
cugurlu
|
e1489bda27
|
Update controllers for new properties of achievements
|
2019-04-07 15:51:27 +02:00 |
|
|
cugurlu
|
a2805c2a9f
|
Update dashboard.fxml
|
2019-04-07 15:50:31 +02:00 |
|
|
cugurlu
|
16fb86c513
|
Update achievements in userService
|
2019-04-07 15:49:51 +02:00 |
|
|
cugurlu
|
1cd46940cf
|
Add new achievement photos
|
2019-04-07 15:48:55 +02:00 |
|
|
Ceren Ugurlu
|
86ec4bbd7d
|
Merge branch 'update_calculator' into 'master'
Update calculator and new tests
See merge request cse1105/2018-2019/oopp-group-43/template!71
|
2019-04-06 21:57:33 +00:00 |
|
|
cugurlu
|
d210e22788
|
Fix ButtonSkin error
|
2019-04-06 22:35:13 +02:00 |
|
|
cugurlu
|
1cf3af45be
|
Add many new tests
|
2019-04-06 22:30:46 +02:00 |
|
|
cugurlu
|
24be00d28a
|
Update methods for extras
|
2019-04-06 21:29:49 +02:00 |
|
|
cugurlu
|
e30f312c6a
|
Update calculator methods for new changes
|
2019-04-06 21:26:52 +02:00 |
|
|
cugurlu
|
95d5b2b971
|
Fix the number of decimal points of footprints
|
2019-04-06 21:26:17 +02:00 |
|
|
Ceren Ugurlu
|
733c0c5920
|
Merge branch 'Test/achievement' into 'master'
Test/achievement
See merge request cse1105/2018-2019/oopp-group-43/template!66
|
2019-04-06 10:40:14 +00: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 |
|
|
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
|
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 |
|
|
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 |
|
|
Ceren Ugurlu
|
3f4e7cb9a9
|
Update README.md
|
2019-03-31 13:28:42 +00: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 |
|
|
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 |
|
|
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 |
|
|
cugurlu
|
cf1704e872
|
Connect server and client for getAllUsers, saveFootprint and getFootprint methods
|
2019-03-31 00:51:34 +01:00 |
|
|
cugurlu
|
383d505f52
|
Fix checkstyle errors and delete unused methods for high coverage
|
2019-03-31 00:50:21 +01:00 |
|
|
cugurlu
|
cc236c46b6
|
Add tests for userService
|
2019-03-31 00:49:16 +01:00 |
|
|
cugurlu
|
ed695f941d
|
Add leaderboard and fix friend bugs
|
2019-03-31 00:47:21 +01:00 |
|
|
cugurlu
|
a41b697510
|
Fix calculator bugs
|
2019-03-31 00:45:50 +01:00 |
|
|
Ceren Ugurlu
|
1437bbc1bc
|
Merge branch 'connect_friends_GUI' into 'master'
Edit GUI for friend property
See merge request cse1105/2018-2019/oopp-group-43/template!49
|
2019-03-30 10:58:18 +00:00 |
|
|
Ceren Ugurlu
|
026cd15009
|
Update DashBoardController.java
|
2019-03-30 09:36:41 +00:00 |
|
|
cugurlu
|
a64b31001a
|
Edit dashboard for new properties
|
2019-03-29 18:11:39 +01:00 |
|
|
cugurlu
|
704854e8b5
|
Add new controller friends
|
2019-03-29 18:11:16 +01:00 |
|
|
cugurlu
|
25c8951530
|
Add fxml file for add friend page
|
2019-03-29 18:10:55 +01:00 |
|
|
cugurlu
|
e41f434a28
|
Add new class for tableView
|
2019-03-29 18:10:01 +01:00 |
|
|
cugurlu
|
0530fc4ddb
|
Add new icons
|
2019-03-29 18:09:31 +01:00 |
|
|
Ceren Ugurlu
|
36f36d4100
|
Merge branch 'connect_calculator&GUI' into 'master'
Connect calculator with GUI
See merge request cse1105/2018-2019/oopp-group-43/template!48
|
2019-03-29 13:17:15 +00:00 |
|
|
cugurlu
|
d0beb236ea
|
Edit to connect calculator with GUI
|
2019-03-29 12:47:24 +01:00 |
|
|
Ceren Ugurlu
|
7267a73cbe
|
Merge branch 'develop_calculator' into 'master'
Merge working version of calculator and tests
See merge request cse1105/2018-2019/oopp-group-43/template!46
|
2019-03-27 13:35:10 +00:00 |
|
|
cugurlu
|
c9178362cc
|
Update CalculatorServiceTest .java
|
2019-03-27 13:47:00 +01:00 |
|
|
cugurlu
|
42cf5a5ee4
|
Add new tests to increase coverage
|
2019-03-27 13:46:23 +01:00 |
|
|
cugurlu
|
56829cca6b
|
Add new methods and tests for requesting
|
2019-03-27 13:45:28 +01:00 |
|
|
cugurlu
|
e51ef99bc9
|
Edit for saving setted new inputs and calculated footprint
|
2019-03-27 13:44:24 +01:00 |
|
|
cugurlu
|
4a31b52e69
|
Update InputValidator and its test for API
|
2019-03-27 13:42:34 +01:00 |
|
|
cugurlu
|
20c37c4899
|
Add tests for footprint
|
2019-03-27 13:41:32 +01:00 |
|
|
cugurlu
|
07f5eb0449
|
Add methods for calculator and fix checktsyle errors
|
2019-03-27 13:40:52 +01:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
cugurlu
|
bddf984438
|
Clean up all unnecessary files
|
2019-03-21 18:07:14 +01:00 |
|
|
Ceren Ugurlu
|
121b86a73e
|
Merge branch 'master' into 'fixMaster'
|
2019-03-19 13:09:13 +00: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 |
|
|
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 |
|
|
cugurlu
|
68036b3c2f
|
Update coverage report
|
2019-03-18 15:27:05 +01: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|