 XXNitramandGitHub
|
ddc4e9885e
|
Merge pull request #167 from hhu-propra2/dev
Dev
|
2020-04-05 22:01:33 +02:00 |
|
|
XXNitramandGitHub
|
95da5e6cd8
|
Merge pull request #157 from hhu-propra2/CI-include-dev-branch
include new dev-branch in actions
|
2020-03-30 00:52:31 +02:00 |
|
|
|
b1069b5049
|
Fix tests and checkstyle
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-27 16:30:59 +01:00 |
|
|
|
82ae081f95
|
Fix tests
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-27 16:17:45 +01:00 |
|
|
|
59e9ff4d4d
|
Merge with master
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-27 15:55:23 +01:00 |
|
|
XXNitram
|
bf122457c2
|
Merge remote-tracking branch 'origin/master' into controllerAndControllerServiceRefactor
# Conflicts:
# src/main/java/mops/gruppen2/service/ValidationService.java
# src/test/java/mops/gruppen2/service/ControllerServiceTest.java
|
2020-03-27 15:33:45 +01:00 |
|
|
|
2e3f705544
|
Fix merge confilcts
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-27 15:26:32 +01:00 |
|
|
XXNitram
|
aa5481afdb
|
Merge remote-tracking branch 'origin/master' into controllerAndControllerServiceRefactor
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/test/java/mops/gruppen2/service/ControllerServiceTest.java
|
2020-03-27 15:18:32 +01:00 |
|
|
|
289299f6e8
|
Further further further refactor
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-27 15:02:33 +01:00 |
|
|
XXNitramandTalha Caliskan
|
677ed4e37b
|
Add validation for setting a new userMaximum
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-26 14:14:45 +01:00 |
|
|
XXNitramandTalha Caliskan
|
1cc52d7dce
|
Fix checkFields
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-26 14:14:06 +01:00 |
|
|
XXNitram
|
4f833c3c5f
|
Refactor WrongFileException
|
2020-03-26 14:12:53 +01:00 |
|
|
XXNitramandTalha Caliskan
|
dbfa260c4d
|
Refactor after merge with master
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-25 16:07:31 +01:00 |
|
|
XXNitram
|
2c70deeb7b
|
Merge remote-tracking branch 'origin/master' into add-ValidationService
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-25 15:51:10 +01:00 |
|
|
XXNitramandTalha Caliskan
|
0c43050166
|
Refactor WebController and ValidationService
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-25 15:43:41 +01:00 |
|
|
XXNitram
|
8e914d8011
|
Refactoring
|
2020-03-25 13:36:47 +01:00 |
|
|
XXNitram
|
f4935b9a33
|
Merge remote-tracking branch 'origin/master' into fix-group-search-number-of-users
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
# src/main/resources/templates/detailsMember.html
# src/main/resources/templates/search.html
|
2020-03-25 13:32:47 +01:00 |
|
|
XXNitram
|
7b47a78e99
|
Fix handing over of parent
|
2020-03-24 17:57:23 +01:00 |
|
|
|
9954f685f5
|
Fix Group Search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-24 16:59:45 +01:00 |
|
|
XXNitram
|
efc3625215
|
Change active list entry of detailsNoMember.html
|
2020-03-24 15:44:34 +01:00 |
|
|
XXNitramandGitHub
|
43d17fcf45
|
Merge pull request #125 from hhu-propra2/feature-change-title-description
Feature change title description
|
2020-03-24 15:23:53 +01:00 |
|
|
|
fe931a35c8
|
Fix pencil button styling
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
|
2020-03-24 15:18:47 +01:00 |
|
|
|
c5de7fa46e
|
Fix parameters
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
|
2020-03-24 15:12:39 +01:00 |
|
|
XXNitram
|
18ab147703
|
Merge remote-tracking branch 'origin/master' into feature-change-title-description
|
2020-03-24 15:09:50 +01:00 |
|
|
|
ff22f0c1e7
|
Change button
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
|
2020-03-24 14:55:17 +01:00 |
|
|
|
59bea22d8e
|
Add changeMetadata feature
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
|
2020-03-24 14:34:52 +01:00 |
|
|
XXNitram
|
90e0a1ff52
|
Add more architecture tests
|
2020-03-23 16:45:57 +01:00 |
|
|
|
c37535ea05
|
Display infinite members message in group search details site
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-23 16:22:57 +01:00 |
|
|
|
15054685f5
|
Fix getAllGroupWithVisibilityPublic method
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-23 16:22:02 +01:00 |
|
|
|
2737febdcd
|
Fix filter in stream to find public lectures
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-23 16:12:07 +01:00 |
|
|
XXNitramandGitHub
|
430336ae9c
|
Merge pull request #121 from hhu-propra2/fix_maxUser
fix userMax
|
2020-03-23 15:59:48 +01:00 |
|
|
XXNitram
|
acac3ca17c
|
Change badge colour
|
2020-03-20 02:59:41 +01:00 |
|
|
XXNitram
|
5b106d7746
|
Add function that collapses the drop-down list if the lecture checkbox is checked
|
2020-03-20 02:39:59 +01:00 |
|
|
XXNitram
|
066d425d35
|
Add badge that displays parent group in detail site
|
2020-03-20 02:38:24 +01:00 |
|
|
XXNitram
|
820782c2ce
|
Add feature to link a group to a lecture
|
2020-03-20 02:36:51 +01:00 |
|
|
XXNitram
|
479db666a3
|
Add method to get all lectures that are public
|
2020-03-20 02:32:37 +01:00 |
|
|
XXNitramandGitHub
|
ca1743f175
|
Merge pull request #109 from hhu-propra2/max_userNumber
Max user number
|
2020-03-19 17:34:01 +01:00 |
|
|
XXNitram
|
b24f6d273f
|
Fix merge with master
|
2020-03-19 17:24:10 +01:00 |
|
|
XXNitram
|
ef044cbdf7
|
Merge remote-tracking branch 'origin/master' into csv-error-handling
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/domain/User.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/resources/templates/createStudent.html
|
2020-03-19 17:01:32 +01:00 |
|
|
XXNitram
|
cd1d7183e7
|
Add exceptions for csv errors
|
2020-03-19 16:51:40 +01:00 |
|
|
|
dc11536db3
|
Merge Erstellen and Veranstaltung into a single site
add two Erstellen sites, one for orga and one for student
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-19 16:50:52 +01:00 |
|
|
XXNitram
|
59487fc4c7
|
Fix User class so that csv works
|
2020-03-19 16:44:08 +01:00 |
|
|
XXNitram
|
a1ee6a18cd
|
Refactor Gruppen2Controller and change redirect in addUsersFromCsv method
|
2020-03-18 18:03:02 +01:00 |
|
|
XXNitram
|
40d1c898e8
|
Refactor ControllerService
|
2020-03-18 18:02:11 +01:00 |
|
|
XXNitram
|
c631f243a1
|
Refactor indentation in html files
|
2020-03-18 18:00:47 +01:00 |
|
|
XXNitram
|
4b6e8eae39
|
Merge remote-tracking branch 'origin/master' into import-csv-in-overview
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/resources/templates/editMembers.html
|
2020-03-18 17:36:06 +01:00 |
|
|
|
4450a091de
|
Add addUsersFromCsv in editMembers Overview
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-18 16:42:06 +01:00 |
|
|
XXNitram
|
90124a7c15
|
Fix file input alignment
|
2020-03-18 16:40:40 +01:00 |
|
|
XXNitram
|
6f664326c3
|
Merge remote-tracking branch 'origin/edit-User' into import-csv-in-overview
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-18 15:15:06 +01:00 |
|
|
XXNitramandLukas Ettel
|
7e52935b77
|
Add check for empty csv file
and set required parameter to false
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 15:05:09 +01:00 |
|
|
XXNitram
|
6929b1ead4
|
Add Service Annotation
|
2020-03-18 14:43:26 +01:00 |
|
|
XXNitram
|
f408391f4c
|
Refactor Gruppen2Controller
|
2020-03-18 14:40:39 +01:00 |
|
|
XXNitram
|
ba4a531337
|
Merge remote-tracking branch 'origin/master' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
|
2020-03-18 14:38:50 +01:00 |
|
|
XXNitram
|
f292700c78
|
Merge remote-tracking branch 'origin/master' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-18 14:27:54 +01:00 |
|
|
|
838bff1d9f
|
Update GroupType in createGroup
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 14:19:00 +01:00 |
|
|
|
0db03f2ab5
|
Add createLecture feature
also add private checkbox again and delete the uploadCsv methods in APIController
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 14:13:58 +01:00 |
|
|
|
051196f766
|
Add CSV methods and createLecture.html
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 13:36:57 +01:00 |
|
|
|
af573f2353
|
Add list entry in html
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 13:36:22 +01:00 |
|
|
|
eabbcc7e04
|
Add jackson dependency
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 13:35:41 +01:00 |
|
|
XXNitram
|
4b1627a993
|
Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/APIController.java
# src/main/resources/templates/create.html
|
2020-03-18 03:23:22 +01:00 |
|
|
|
179062eed9
|
Add createLecture for orga only
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-17 17:07:30 +01:00 |
|
|
XXNitram
|
801ef1998c
|
Change UpdateGroupTitleEvent and UpdateGroupDescriptionEvent
|
2020-03-16 15:44:31 +01:00 |
|
|
XXNitram
|
26f26a1c1a
|
Add JavaDoc comments to SerializationService
|
2020-03-13 13:47:05 +01:00 |
|
|
XXNitram
|
6b788beb4b
|
Refactor ControllerService and add an UpdateRoleEvent to createGroup
|
2020-03-13 13:46:34 +01:00 |
|
|
XXNitram
|
3608e05ad4
|
Disable Tests
|
2020-03-12 16:23:46 +01:00 |
|
|
XXNitram
|
6f213af10e
|
Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user
|
2020-03-12 16:18:25 +01:00 |
|
|
XXNitram
|
80a9566d6f
|
Add ControllerService and refactor Gruppen2Controller
|
2020-03-12 16:18:15 +01:00 |
|
|
XXNitram
|
70d911c576
|
Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent to Gruppen2Controller
|
2020-03-12 15:22:10 +01:00 |
|
|
XXNitram
|
0db2ab2714
|
Fix Architecture tests in ServiceTest
|
2020-03-12 13:16:44 +01:00 |
|
|
XXNitram
|
18560c1e35
|
Fix Architecture tests in LayeredArchitectureTest
|
2020-03-12 13:15:00 +01:00 |
|
|
XXNitram
|
9b004bef58
|
Create new package config and move Gruppen2Config to it
|
2020-03-12 13:14:22 +01:00 |
|
|
XXNitram
|
4f619c6963
|
Add tests for Service Architecture in ServiceTest
|
2020-03-10 16:44:58 +01:00 |
|
|
XXNitram
|
7dc1414e76
|
Add tests for Domain Architecture in DomainTest
|
2020-03-10 16:44:15 +01:00 |
|
|
XXNitram
|
fba7136d57
|
Add Tests for Repository and add Repository Annotation in EventRepository
|
2020-03-10 16:43:25 +01:00 |
|
|
XXNitram
|
05218e8167
|
Separate Tests into different classes, starting with ControllerTest
|
2020-03-10 16:41:05 +01:00 |
|
|
XXNitram
|
4add26ff52
|
Rename ArchUnitTest to LayeredArchitectureTest and define/test a layered Architecture
|
2020-03-10 16:36:00 +01:00 |
|
|
XXNitram
|
09a1e3e380
|
Add Architecture Tests with ArchUnit
|
2020-03-09 16:47:16 +01:00 |
|
|
XXNitram
|
82552a82b2
|
Merge remote-tracking branch 'origin/Services' into Services
|
2020-03-06 15:12:55 +01:00 |
|
|
XXNitram
|
60446f4789
|
Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent
|
2020-03-06 15:12:39 +01:00 |
|
|
XXNitram
|
6a3483db9d
|
add RequestMapping
|
2020-03-04 13:56:12 +01:00 |
|
|
XXNitram
|
13af32cff4
|
add controller, index.html, admin in application.properties
|
2020-03-04 13:45:37 +01:00 |
|
|
XXNitramandGitHub
|
7940988e98
|
Merge pull request #12 from hhu-propra2/styleguide
Styleguide
|
2020-03-03 16:58:09 +01:00 |
|
|
XXNitram
|
775ee68c79
|
fix style guide dependencies
|
2020-03-03 16:45:21 +01:00 |
|
|
XXNitram
|
9e4205a1e8
|
Merge remote-tracking branch 'origin/master' into styleguide
|
2020-03-03 16:42:01 +01:00 |
|
|
XXNitram
|
a4ceb11bca
|
add style guide dependencies
|
2020-03-03 16:05:37 +01:00 |
|