sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 97807293f9 ADD: meeting folders mlwauben 2019-03-18 12:42:21 +01:00
  • 8caf3bdac9 ADD: review sprint3 Mika Wauben 2019-03-18 11:38:29 +00:00
  • 2e747fdc89 Delete 20190318_sprint_review.txt Mika Wauben 2019-03-18 11:37:20 +00:00
  • 0ca0a516bd ADD: review sprint3 Mika Wauben 2019-03-18 11:37:10 +00:00
  • bb89b67e87 ADD: review sprint2 Mika Wauben 2019-03-18 11:36:41 +00:00
  • ba4b40efab ADD: review sprint1 Mika Wauben 2019-03-18 11:36:21 +00:00
  • dbde18d3f2 ADD: scrum board sprint2 Mika Wauben 2019-03-18 11:35:19 +00:00
  • a15cfc21fc Delete 20191003_scrumboard.png Mika Wauben 2019-03-18 11:35:02 +00:00
  • 9c9a98c738 ADD: scrum board sprint1 Mika Wauben 2019-03-18 11:34:50 +00:00
  • 3af4d1778f Delete 20190403_scrumboard.png Mika Wauben 2019-03-18 11:34:31 +00:00
  • d3c42e70fe ADD: backlog sprint4 Mika Wauben 2019-03-18 11:34:02 +00:00
  • 8870ed1f56 Add new directory Mika Wauben 2019-03-18 11:33:42 +00:00
  • b2ae1d75a5 DELETE: wrong folder mlwauben 2019-03-18 12:33:03 +01:00
  • f018484556 ADD: retrospective sprint3 Mika Wauben 2019-03-18 11:31:44 +00:00
  • e12d5945ff Upload scrum board sprint3 Mika Wauben 2019-03-18 11:31:05 +00:00
  • 6945eddf5d Merge branch 'Get_UserControllerTest_Working' Sem van der Hoeven 2019-03-18 12:20:44 +01:00
  • f76a6827f7 Fix tests cugurlu 2019-03-18 12:15:00 +01:00
  • a2e432d453 Add totalVeganMeal property and fix checkstyle errors cugurlu 2019-03-18 12:14:30 +01:00
  • 3e5957b807 EDIT::commented out usercontrollertest, as it is still not working, but want to merge this branch to get the gui properly Sem van der Hoeven 2019-03-18 12:10:43 +01:00
  • f66191f136 Merge branch 'Add_tests' into 'master' Sem van der Hoeven 2019-03-17 23:39:20 +00:00
  • 711b16449c Add RestExceptionHandler test cugurlu 2019-03-18 00:35:29 +01:00
  • d7960103ee Add UserRepository test cugurlu 2019-03-18 00:34:51 +01:00
  • 2546355eba Add UserController test cugurlu 2019-03-18 00:34:26 +01:00
  • 8864320832 Add tests cugurlu 2019-03-18 00:33:59 +01:00
  • 3c5bc0a651 FIX::fixed the fxml Label names Sem van der Hoeven 2019-03-17 22:14:27 +01:00
  • aa393da53b FIX::fixed FXML declarations under fields Sem van der Hoeven 2019-03-17 22:05:29 +01:00
  • 76ebd018bd Delete UserControllerTest.java Ceren Ugurlu 2019-03-17 20:50:20 +00:00
  • 88e7afb8fb Update the location of ActivityTest.java Ceren Ugurlu 2019-03-17 20:49:01 +00:00
  • e92dd0ba2b Delete UserTest.java Ceren Ugurlu 2019-03-17 20:47:53 +00:00
  • e0f0e38241 Delete MainController.java Ceren Ugurlu 2019-03-17 20:45:22 +00:00
  • 282d2026ba FIX::fixed UserDto names Sem van der Hoeven 2019-03-17 21:42:52 +01:00
  • 874b0bcd72 Merge branch 'add_documents' into 'master' Ceren Ugurlu 2019-03-17 20:12:33 +00:00
  • a9e659fc9f Add checkstyle screenshot cugurlu 2019-03-17 21:04:24 +01:00
  • 2c3314c693 Add week 5 agenda cugurlu 2019-03-17 21:01:36 +01:00
  • 8524bb2e89 Update .gitlab-ci.yml Ceren Ugurlu 2019-03-17 19:13:47 +00:00
  • 8a4134c52b Update .gitlab-ci.yml Ceren Ugurlu 2019-03-17 18:46:17 +00:00
  • b0e2ad2903 ADD::added checkstyle file Sem van der Hoeven 2019-03-17 19:25:50 +01:00
  • 8c13a8bf39 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-03-17 19:23:32 +01:00
  • 01b4ac4287 FIX::Corrected the UserDto name change in Userservice of server Sem van der Hoeven 2019-03-17 19:22:59 +01:00
  • 4fa6ac7f53 Merge branch 'FixDTO' into 'master' Ceren Ugurlu 2019-03-17 18:01:55 +00:00
  • 1da7f62c95 Fix the branch and add a test cugurlu 2019-03-17 18:58:56 +01:00
  • 0c042daa1c DTO changed to Dto. Still some errors Merel Steenbergen 2019-03-17 18:31:55 +01:00
  • bfc9595d21 Changed DTO files to Dto because of checkstyle Merel Steenbergen 2019-03-17 18:23:18 +01:00
  • dd74a97c47 Merge branch 'AddFeatureClass' into 'master' Merel Steenbergen 2019-03-17 17:10:37 +00:00
  • 4b77102205 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-03-17 18:02:30 +01:00
  • 018a164723 Fixed tests Merel Steenbergen 2019-03-17 18:01:59 +01:00
  • 061a6fc957 Delete useless file Merel Steenbergen 2019-03-17 17:57:18 +01:00
  • ba98b30776 Fix merge conflicts Merel Steenbergen 2019-03-17 17:54:24 +01:00
  • ed35c77262 Finish activity class and add tests Merel Steenbergen 2019-03-17 16:57:09 +01:00
  • 09c7817eef Merge branch 'Develop_GUI_further' into master Sem van der Hoeven 2019-03-17 17:52:25 +01:00
  • e79280e470 Some more work done on the feature object Merel Steenbergen 2019-03-14 15:08:49 +01:00
  • 5f4069fcad Add outline of activity class, has bugs Merel Steenbergen 2019-03-14 14:04:04 +01:00
  • dc6682d7fa Finish activity class and add tests Merel Steenbergen 2019-03-17 16:57:09 +01:00
  • 922f8b2657 Some more work done on the feature object Merel Steenbergen 2019-03-14 15:08:49 +01:00
  • 2999359b01 Merge branch 'master' into 'AddFeatureClass' Sem van der Hoeven 2019-03-17 16:37:45 +00:00
  • ec63a64248 Merge branch 'checkstyle' into 'master' Sem van der Hoeven 2019-03-17 16:33:48 +00:00
  • 5b13f26dee Update UserDTOTest.java Ceren Ugurlu 2019-03-17 16:30:41 +00:00
  • 561cca7f5a Update UserDTO.java Ceren Ugurlu 2019-03-17 16:29:56 +00:00
  • 20b6e89781 Fix checkstyle errors cugurlu 2019-03-17 17:27:29 +01:00
  • 249b40572e Add outline of activity class, has bugs Merel Steenbergen 2019-03-14 14:04:04 +01:00
  • dc5ddfa90e Merge branch 'AddFeatureClass' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into AddFeatureClass Merel Steenbergen 2019-03-17 17:17:15 +01:00
  • a80aaf3a59 Finish activity class and add tests Merel Steenbergen 2019-03-17 16:57:09 +01:00
  • 454a0ec1a3 Some more work done on the feature object Merel Steenbergen 2019-03-14 15:08:49 +01:00
  • 82d3f08e2d Fix bugs. Feature abstract class added Merel Steenbergen 2019-03-14 14:31:38 +01:00
  • 72c8a213a1 Add outline of activity class, has bugs Merel Steenbergen 2019-03-14 14:04:04 +01:00
  • 0d0b78f6d0 Update Application.java Ceren Ugurlu 2019-03-17 16:13:05 +00:00
  • 07c76dd385 Fix checkstyle errors cugurlu 2019-03-17 17:08:46 +01:00
  • f5fa03b104 Add checkstyle plugin cugurlu 2019-03-17 17:06:50 +01:00
  • 34d098f188 Finish activity class and add tests Merel Steenbergen 2019-03-17 16:57:09 +01:00
  • b1ab9f4e8a Merge branch 'fix_userTest' into 'master' Sem van der Hoeven 2019-03-17 15:38:58 +00:00
  • b5defaa581 FIX:: fixed the userTest Sem van der Hoeven 2019-03-17 16:23:52 +01:00
  • e1448055f5 ADD::Added checkstyle comments Sem van der Hoeven 2019-03-17 15:58:55 +01:00
  • 4306372a61 Merge branch 'fix_master' into 'master' Sem van der Hoeven 2019-03-17 14:47:44 +00:00
  • a605e1a92e Update changes cugurlu 2019-03-17 15:19:43 +01:00
  • e718e3859b removed .idea folder Sem van der Hoeven 2019-03-17 14:32:57 +01:00
  • 50c58da035 Update .gitignore Sem van der Hoeven 2019-03-17 13:31:26 +00:00
  • c23344e8ef Revert "Merge branch 'master' into 'vegetarian_meal'" Ceren Ugurlu 2019-03-17 13:24:32 +00:00
  • a817d9118a ADD::added buttons and counters for the various activities Sem van der Hoeven 2019-03-17 14:16:29 +01:00
  • fb6dfcdd20 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-03-17 13:11:00 +01:00
  • 7539dd20f6 EDIT::changed GUI name to greenify Sem van der Hoeven 2019-03-17 13:09:27 +01:00
  • af25d85440 Merge branch 'basic_authentication' into 'master' Mika Wauben 2019-03-17 08:57:12 +00:00
  • 4b702bc63b Add configurations for basic authentication cugurlu 2019-03-16 22:43:30 +01:00
  • 5a62ef18dd Merge branch 'Add_registering_GUI' into 'master' Sem van der Hoeven 2019-03-16 19:35:55 +00:00
  • 0fb1991240 Merge branch 'master' into 'Add_registering_GUI' Sem van der Hoeven 2019-03-16 17:40:58 +00:00
  • 592015b1cd ADD::Added GUI for the registering Sem van der Hoeven 2019-03-16 18:37:23 +01:00
  • 9a294930d8 Merge branch 'database_fixes' into 'master' Sem van der Hoeven 2019-03-16 13:50:44 +00:00
  • 33c09581ec Merge branch 'fix_ci_building' into 'master' Sem van der Hoeven 2019-03-16 13:50:29 +00:00
  • 7fb44f6867 Delete ApplicationTest.java Ceren Ugurlu 2019-03-16 13:34:12 +00:00
  • 98df90b0b2 Delete UserJpaRepository.java Ceren Ugurlu 2019-03-16 13:27:07 +00:00
  • 80d5e42c00 Update build.gradle Ceren Ugurlu 2019-03-16 13:25:01 +00:00
  • 4b9e6fce66 Update changes cugurlu 2019-03-16 14:21:38 +01:00
  • 9ff1eb6b09 ADD:: added image to add activity button Sem van der Hoeven 2019-03-16 14:20:40 +01:00
  • 479ed8e7f2 Add new tests cugurlu 2019-03-16 14:18:40 +01:00
  • 59c84f2c09 Add new classes for database cugurlu 2019-03-16 14:17:35 +01:00
  • 928c6f89a6 Edit common classes cugurlu 2019-03-16 14:16:29 +01:00
  • 20735380e5 Edit client classes cugurlu 2019-03-16 14:14:17 +01:00
  • 31499adc00 Add application.properties cugurlu 2019-03-16 14:10:22 +01:00
  • 2b04ce2306 Fix build.gradle files cugurlu 2019-03-16 14:06:46 +01:00
  • ad4e49f65c Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-03-14 19:26:17 +01:00
  • e9bee87a38 FIX::edited correct names in fxml files Sem van der Hoeven 2019-03-14 19:23:30 +01:00