 Talha CaliskanandGitHub
|
4a2ed5e755
|
Merge pull request #148 from hhu-propra2/documentation-merge
Documentation merge
|
2020-03-26 16:45:51 +01:00 |
|
 Talha CaliskanandGitHub
|
72eaed4279
|
Merge pull request #146 from hhu-propra2/docker-profile-security
Docker profile security
|
2020-03-26 16:33:19 +01:00 |
|
 Talha CaliskanandGitHub
|
e7df8a50e2
|
Merge pull request #142 from hhu-propra2/refactor-ValidationService
Refactor validation service
|
2020-03-26 14:19:46 +01:00 |
|
 Talha CaliskanandGitHub
|
c00ee2f235
|
Merge branch 'master' into add-ValidationService
|
2020-03-25 16:09:20 +01:00 |
|
 Talha CaliskanandGitHub
|
fb3a0a9dd7
|
Merge pull request #131 from hhu-propra2/readme-update
Update README.adoc
|
2020-03-25 10:32:04 +01:00 |
|
 Talha CaliskanandGitHub
|
89d7bb52c2
|
Merge pull request #126 from hhu-propra2/slight-chganges
decrease visibility of applyEvent methods + new testbuilder
|
2020-03-24 15:34:46 +01:00 |
|
 Talha CaliskanandGitHub
|
6506ce7bbe
|
Merge pull request #114 from hhu-propra2/adjust_group_size
Adjust group size
|
2020-03-20 16:08:58 +01:00 |
|
 Talha CaliskanandGitHub
|
42154bd2d0
|
Merge pull request #112 from hhu-propra2/delete-group-event
Delete group event
|
2020-03-20 14:05:29 +01:00 |
|
 Talha CaliskanandGitHub
|
33a5f9053b
|
Merge pull request #111 from hhu-propra2/lecture-parent-in-create
Lecture parent in create
|
2020-03-20 12:53:26 +01:00 |
|
 Talha CaliskanandGitHub
|
b3107c98f1
|
Merge branch 'master' into edit-User
|
2020-03-18 16:43:33 +01:00 |
|
 Talha CaliskanandGitHub
|
e412c051f7
|
Merge pull request #91 from hhu-propra2/quickFix
Quick fix on master
|
2020-03-17 16:15:26 +01:00 |
|
 Talha CaliskanandGitHub
|
90a07e7b2a
|
Merge pull request #90 from hhu-propra2/eventExeptionHandling
Implementation of old EventExeptions
|
2020-03-17 16:06:54 +01:00 |
|
 Talha CaliskanandGitHub
|
ea0810174a
|
Merge branch 'master' into delete-User
|
2020-03-17 14:39:02 +01:00 |
|
 Talha CaliskanandGitHub
|
916a386179
|
Merge pull request #73 from hhu-propra2/fix-search
fix problem where search was keeping same search throughout session a…
|
2020-03-14 23:35:38 +01:00 |
|
 Talha CaliskanandGitHub
|
63279d8fe6
|
Merge pull request #72 from hhu-propra2/change_DTO
change EventDTO, add AddUserEventController, add the search function …
|
2020-03-14 09:33:33 +01:00 |
|
 Talha CaliskanandGitHub
|
d939631eac
|
Update EventRepository.java
|
2020-03-14 09:31:48 +01:00 |
|
 Talha CaliskanandGitHub
|
403b32ed76
|
Update EventRepository.java
|
2020-03-14 09:30:49 +01:00 |
|
 Talha CaliskanandGitHub
|
434a69f93d
|
Merge branch 'master' into change_DTO
|
2020-03-14 09:28:39 +01:00 |
|
 Talha CaliskanandGitHub
|
c4f90e0baf
|
Merge pull request #70 from hhu-propra2/group-create
Group create
|
2020-03-13 23:07:36 +01:00 |
|
 Talha CaliskanandGitHub
|
9a802b2f85
|
Merge pull request #64 from hhu-propra2/refactor-controller-service
Refactor controller service and add comments
|
2020-03-13 13:50:59 +01:00 |
|
 Talha CaliskanandGitHub
|
cd60dca352
|
Merge pull request #63 from hhu-propra2/controller-fix
add new Controller to redirect
|
2020-03-12 16:58:30 +01:00 |
|
 Talha CaliskanandGitHub
|
2b7a9a3802
|
Merge branch 'master' into controller-fix
|
2020-03-12 16:49:33 +01:00 |
|
 Talha CaliskanandGitHub
|
c8f24f834d
|
Merge pull request #61 from hhu-propra2/groups-for-user
Groups for user
|
2020-03-12 16:25:36 +01:00 |
|
 Talha CaliskanandGitHub
|
f8237853a8
|
Merge pull request #60 from hhu-propra2/refactor-events
Refactor events
|
2020-03-12 13:23:54 +01:00 |
|
 Talha CaliskanandGitHub
|
aaa3437eed
|
Merge pull request #57 from hhu-propra2/GroupLogicProjection
Group logic projection
|
2020-03-11 14:04:23 +01:00 |
|
 Talha CaliskanandGitHub
|
20cf11af91
|
Merge pull request #55 from hhu-propra2/serialization-tests
added deserialization tests
|
2020-03-10 15:21:25 +01:00 |
|
 Talha CaliskanandGitHub
|
87c3874a28
|
Merge pull request #51 from hhu-propra2/fix-merge-fail
restore things lost in merge ffs
|
2020-03-10 13:38:14 +01:00 |
|
 Talha CaliskanandGitHub
|
a8f2fa32a7
|
Merge branch 'event-db' into html-gruppe
|
2020-03-09 23:34:34 +01:00 |
|
 killerber4tandGitHub
|
94193d4f50
|
Merge pull request #36 from hhu-propra2/general-refactor
General refactor
|
2020-03-09 13:02:25 +01:00 |
|
 killerber4tandGitHub
|
babac2279d
|
Merge pull request #29 from hhu-propra2/adapt-spring-security-to-h2-console
disable csrf + headers.frameoptions, permit /h2-console/**
|
2020-03-05 14:09:35 +01:00 |
|
 killerber4tandGitHub
|
3de9736719
|
Merge pull request #28 from hhu-propra2/DTO
add DTOs
|
2020-03-05 14:01:53 +01:00 |
|
 killerber4tandGitHub
|
737f65c91f
|
Merge pull request #26 from hhu-propra2/workflow-paths-ignore
don't check documentation paths
|
2020-03-05 13:38:36 +01:00 |
|
 killerber4tandGitHub
|
0d4d6259e6
|
Merge branch 'master' into spring-profiles
|
2020-03-05 13:22:10 +01:00 |
|
 killerber4tandGitHub
|
4e1a55e5ce
|
Merge pull request #21 from hhu-propra2/checkstyle-no-import-order
Checkstyle no import order
|
2020-03-04 16:46:49 +01:00 |
|
 killerber4tandGitHub
|
42fad4db3f
|
Merge pull request #19 from hhu-propra2/churl-build.gradle
slight change to spotbugs config
|
2020-03-04 14:20:08 +01:00 |
|
 killerber4tandGitHub
|
3ce45523ba
|
Delete SecurityConfig.java
|
2020-03-04 14:12:45 +01:00 |
|
 killerber4tandGitHub
|
e1ad60ef0b
|
Delete KeycloakConfig.java
|
2020-03-04 14:11:51 +01:00 |
|
 killerber4tandGitHub
|
447860ca13
|
Merge branch 'master' into swagger-api
|
2020-03-04 14:09:43 +01:00 |
|
 killerber4tandGitHub
|
6ce1dd8543
|
Merge pull request #8 from hhu-propra2/andi-doc-branch
added folder for documentation
|
2020-03-03 15:35:04 +01:00 |
|
 killerber4tandGitHub
|
1bbb2f5de0
|
Merge pull request #7 from hhu-propra2/tom_branch
change CI
|
2020-03-03 14:51:45 +01:00 |
|
 killerber4tandGitHub
|
72888fdd1a
|
Merge pull request #4 from hhu-propra2/tomvahl-patch-2
add CI
|
2020-03-03 14:24:13 +01:00 |
|
 killerber4tandGitHub
|
5e2906b2fc
|
Update gruppe.yml
|
2020-01-27 16:15:47 +01:00 |
|
 killerber4tandGitHub
|
7814e58358
|
Update gruppe.yml
|
2020-01-27 12:52:02 +01:00 |
|
 killerber4tandGitHub
|
268bf1aa10
|
Update gruppe.yml
|
2020-01-27 12:50:05 +01:00 |
|
 killerber4tandGitHub
|
8963125556
|
Update gruppe.yml
|
2020-01-27 12:43:10 +01:00 |
|
 killerber4tandGitHub
|
7768a0d0c7
|
Update gruppe.yml
|
2020-01-27 12:41:33 +01:00 |
|