 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 |
|
|
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 |
|
|
Ceren Ugurlu
|
4fa6ac7f53
|
Merge branch 'FixDTO' into 'master'
Merge FixDTO into master
See merge request cse1105/2018-2019/oopp-group-43/template!26
|
2019-03-17 18:01:55 +00:00 |
|
|
cugurlu
|
1da7f62c95
|
Fix the branch and add a test
|
2019-03-17 18:58:56 +01:00 |
|
|
Ceren Ugurlu
|
5b13f26dee
|
Update UserDTOTest.java
|
2019-03-17 16:30:41 +00:00 |
|
|
Ceren Ugurlu
|
561cca7f5a
|
Update UserDTO.java
|
2019-03-17 16:29:56 +00:00 |
|
|
cugurlu
|
20b6e89781
|
Fix checkstyle errors
|
2019-03-17 17:27:29 +01:00 |
|
|
Ceren Ugurlu
|
0d0b78f6d0
|
Update Application.java
|
2019-03-17 16:13:05 +00:00 |
|
|
cugurlu
|
07c76dd385
|
Fix checkstyle errors
|
2019-03-17 17:08:46 +01:00 |
|
|
cugurlu
|
f5fa03b104
|
Add checkstyle plugin
|
2019-03-17 17:06:50 +01:00 |
|
|
cugurlu
|
a605e1a92e
|
Update changes
|
2019-03-17 15:19:43 +01:00 |
|
|
Ceren Ugurlu
|
c23344e8ef
|
Revert "Merge branch 'master' into 'vegetarian_meal'"
This reverts commit b3eeffdb32aa058f9f1aa6b9cbec3d05e2d07b8f
|
2019-03-17 13:24:32 +00:00 |
|
|
cugurlu
|
4b702bc63b
|
Add configurations for basic authentication
|
2019-03-16 22:43:30 +01:00 |
|
|
Ceren Ugurlu
|
7fb44f6867
|
Delete ApplicationTest.java
|
2019-03-16 13:34:12 +00:00 |
|
|
Ceren Ugurlu
|
98df90b0b2
|
Delete UserJpaRepository.java
|
2019-03-16 13:27:07 +00:00 |
|
|
Ceren Ugurlu
|
80d5e42c00
|
Update build.gradle
|
2019-03-16 13:25:01 +00:00 |
|
|
cugurlu
|
4b9e6fce66
|
Update changes
|
2019-03-16 14:21:38 +01:00 |
|
|
cugurlu
|
479ed8e7f2
|
Add new tests
|
2019-03-16 14:18:40 +01:00 |
|
|
cugurlu
|
59c84f2c09
|
Add new classes for database
|
2019-03-16 14:17:35 +01:00 |
|
|
cugurlu
|
928c6f89a6
|
Edit common classes
|
2019-03-16 14:16:29 +01:00 |
|
|
cugurlu
|
20735380e5
|
Edit client classes
|
2019-03-16 14:14:17 +01:00 |
|
|
cugurlu
|
31499adc00
|
Add application.properties
|
2019-03-16 14:10:22 +01:00 |
|
|
cugurlu
|
2b04ce2306
|
Fix build.gradle files
|
2019-03-16 14:06:46 +01:00 |
|
|
Ceren Ugurlu
|
c07ea93176
|
Update build.gradle
|
2019-03-14 12:48:32 +00:00 |
|
|
cugurlu
|
a5b4a2e8f0
|
Update build.gradle in common
|
2019-03-14 13:43:03 +01:00 |
|
|
cugurlu
|
f959ffc066
|
Fix fxml files
|
2019-03-14 13:41:32 +01:00 |
|
|
cugurlu
|
80bc87922c
|
Update build.gradle in common
|
2019-03-14 12:05:41 +01:00 |
|
|
cugurlu
|
d02393400e
|
Fix names of directories
|
2019-03-12 10:27:30 +01:00 |
|
|
cugurlu
|
7548df160d
|
Add tests for server
|
2019-03-12 10:22:07 +01:00 |
|
|
cugurlu
|
a9827b8573
|
Add client test
|
2019-03-12 10:18:34 +01:00 |
|
|
Ceren Ugurlu
|
5a0bd855c2
|
Merge branch 'updateCientServer' into 'master'
User Registration
See merge request cse1105/2018-2019/oopp-group-43/template!4
|
2019-03-04 16:08:47 +00:00 |
|
|
Ceren Ugurlu
|
85e62256c1
|
Ceren Ugurlu estimated hours filled in
|
2019-03-04 12:58:27 +00:00 |
|