Commit Graph

Select branches

Hide Pull Requests

dev

master

Mono Color

• 062a0505be Deleted the html 3 people 2020-03-25 14:03:12 +01:00
• 473d58ae3b partial fix search: group is displayed again after leaving ChristophandXXNitram 2020-03-25 13:56:43 +01:00
• ddfd21c6ef add MaxMemberException 3 people 2020-03-25 13:44:08 +01:00
• 8e914d8011 Refactoring XXNitram 2020-03-25 13:36:47 +01:00
• f4935b9a33 Merge remote-tracking branch 'origin/master' into fix-group-search-number-of-users XXNitram 2020-03-25 13:32:47 +01:00
• cf685fb6ff Merge pull request #128 from hhu-propra2/refactor-controller ChristophandGitHub 2020-03-25 13:08:01 +01:00
• 551534d4ff Merge branch 'master' into refactor-controller Christoph 2020-03-25 13:03:22 +01:00
• a4d603c580 Merge pull request #132 from hhu-propra2/swagger-doku ChristophandGitHub 2020-03-25 10:44:41 +01:00
• fb3a0a9dd7 Merge pull request #131 from hhu-propra2/readme-update Talha CaliskanandGitHub 2020-03-25 10:32:04 +01:00
• 9bbede1201 add swagger api doku ChristophandGitHub 2020-03-25 10:30:11 +01:00
• 386df44bde Update README.adoc ChristophandGitHub 2020-03-25 10:28:01 +01:00
• a0d6243b5c improved testing Christoph 2020-03-24 22:28:56 +01:00
• 7b47a78e99 Fix handing over of parent XXNitram 2020-03-24 17:57:23 +01:00
• cdb22828aa remove checkGroup Christoph 2020-03-24 17:00:41 +01:00
• 9954f685f5 Fix Group Search 3 people 2020-03-24 16:59:45 +01:00
• dffb927738 Merge pull request #130 from hhu-propra2/pageNotFound tomvahlandGitHub 2020-03-24 16:48:34 +01:00
• 79619a9476 added pageNotFoundException on not existing routs [Mahgs] 2020-03-24 16:46:23 +01:00
• 2e6c6bc26b Merge pull request #129 from hhu-propra2/showInviteLink Max OerterandGitHub 2020-03-24 16:36:02 +01:00
• 55396342bd Merge branch 'master' into showInviteLink kasch309andGitHub 2020-03-24 16:34:06 +01:00
• 2d3e935d64 merged with master and fixed some problems [Mahgs] 2020-03-24 16:31:55 +01:00
• 8eda960e39 remove checkGroup Christoph 2020-03-24 16:30:05 +01:00
• f0a1a9c7bb refactor Controller killerber4t 2020-03-24 16:16:18 +01:00
• 5916acc1c7 refactoring test tomvahl 2020-03-24 16:07:18 +01:00
• cefc122dfc blah test merge fehler manno Christoph 2020-03-24 16:05:44 +01:00
• d957326491 refactor Controller killerber4t 2020-03-24 16:02:16 +01:00
• f907c617a8 refactor WebController killerber4t 2020-03-24 15:57:31 +01:00
• 439bd78b5c fix alignment of title in detailsMember.html AndiBuls 2020-03-24 15:53:19 +01:00
• efc3625215 Change active list entry of detailsNoMember.html XXNitram 2020-03-24 15:44:34 +01:00
• 80ab65febb update UserService killerber4t 2020-03-24 15:38:06 +01:00
• 46aaf3658e refactor createOrga Method in ControllerService killerber4t 2020-03-24 15:36:52 +01:00
• 3b918308c6 Merge branch 'slight-chganges' into killertester Christoph 2020-03-24 15:35:35 +01:00
• 89d7bb52c2 Merge pull request #126 from hhu-propra2/slight-chganges Talha CaliskanandGitHub 2020-03-24 15:34:46 +01:00
• 6cd41d5e29 Merge remote-tracking branch 'origin/master' into showInviteLink [Mahgs] 2020-03-24 15:32:56 +01:00
• aabdc6c58f Merge pull request #127 from hhu-propra2/ui-fixes ChristophandGitHub 2020-03-24 15:29:57 +01:00
• 5c9e1ae80e fix button on error page kasch309 2020-03-24 15:26:01 +01:00
• 4b6257c9f0 set exceptions on join group added emoji to error.html <- wichtig [Mahgs] 2020-03-24 15:24:24 +01:00
• 43d17fcf45 Merge pull request #125 from hhu-propra2/feature-change-title-description XXNitramandGitHub 2020-03-24 15:23:53 +01:00
• ad5d1b3b31 fix each-loop on table kasch309 2020-03-24 15:22:52 +01:00
• 1146308752 rename file killerber4t 2020-03-24 15:21:55 +01:00
• 6ba4ba82de decrease visibility of applyEvent methods + new testbuilder Christoph 2020-03-24 15:20:35 +01:00
• fe931a35c8 Fix pencil button styling 4 people 2020-03-24 15:18:47 +01:00
• c5de7fa46e Fix parameters 4 people 2020-03-24 15:12:39 +01:00
• 18ab147703 Merge remote-tracking branch 'origin/master' into feature-change-title-description XXNitram 2020-03-24 15:09:50 +01:00
• 89354eec26 link now correct displayed [Mahgs] 2020-03-24 15:09:44 +01:00
• ff22f0c1e7 Change button 4 people 2020-03-24 14:55:17 +01:00
• 60837d8cf3 Merge remote-tracking branch 'origin/master' into showInviteLink [Mahgs] 2020-03-24 14:51:33 +01:00
• e61e9d3d25 Merge pull request #124 from hhu-propra2/invite-link-group-id-change Max OerterandGitHub 2020-03-24 14:48:29 +01:00
• 5c6d94753b some uuid improvements Christoph 2020-03-24 14:37:23 +01:00
• 59bea22d8e Add changeMetadata feature 4 people 2020-03-24 14:34:52 +01:00
• 2f8a044c53 Merge branch 'master' into invite-link-group-id-change Christoph 2020-03-24 14:28:30 +01:00
• fe12831dab refactor Tests and delete unnecessary Test killerber4tandtomvahl 2020-03-24 14:22:19 +01:00
• 6adbd06e73 Merge remote-tracking branch 'origin/master' Christoph 2020-03-24 14:15:22 +01:00
• c844f5d4fa some uuid improvements Christoph 2020-03-24 14:12:32 +01:00
• a307476b07 fix JsonService implementation killerber4t 2020-03-24 13:43:36 +01:00
• 365e927845 Merge remote-tracking branch 'origin/killertester' into killertester tomvahl 2020-03-24 13:29:31 +01:00
• f39f22bbf2 refactoring test tomvahl 2020-03-24 13:28:44 +01:00
• 64fe9c387d Merge branch 'master' into killertester tomvahl 2020-03-24 13:08:58 +01:00
• fd3a118b04 refactoring test tomvahl 2020-03-24 13:07:55 +01:00
• 491aeb1b66 Merge pull request #123 from hhu-propra2/ui-scrollbar tomvahlandGitHub 2020-03-24 13:00:54 +01:00
• 1b469ca363 Merge remote-tracking branch 'origin/master' kasch309 2020-03-23 17:08:46 +01:00
• 72a71b1ada fix colors for uniformity kasch309 2020-03-23 17:08:20 +01:00
• 341103b554 add scrollbar, fix template kasch309 2020-03-23 17:07:37 +01:00
• 2eca5e1849 fix api etc Christoph 2020-03-23 17:01:01 +01:00
• 14d657131a Merge remote-tracking branch 'origin/showInviteLink' into showInviteLink Lukas Ettel 2020-03-23 16:54:20 +01:00
• 6fc0cafc61 link is now displayed correctly but still issus with localhost and keykloak Lukas EttelandMax Oerter 2020-03-23 16:53:32 +01:00
• 90e0a1ff52 Add more architecture tests XXNitram 2020-03-23 16:45:57 +01:00
• 8f50442c7b Merge pull request #122 from hhu-propra2/fix-lecture-parent-list AndiBulsandGitHub 2020-03-23 16:26:04 +01:00
• c7445d8dee fix 1 Test killerber4t 2020-03-23 16:24:31 +01:00
• c37535ea05 Display infinite members message in group search details site 4 people 2020-03-23 16:22:57 +01:00
• 15054685f5 Fix getAllGroupWithVisibilityPublic method 4 people 2020-03-23 16:22:02 +01:00
• d562df8826 temporarily disable tests + rough change from groupid to uuid + remove invitelink old system Christoph 2020-03-23 16:17:17 +01:00
• f60214eb64 fix Test-setUp killerber4t 2020-03-23 16:12:56 +01:00
• 2737febdcd Fix filter in stream to find public lectures 4 people 2020-03-23 16:12:07 +01:00
• 22e9379b37 add EventServiceTest tests killerber4t 2020-03-23 16:08:21 +01:00
• 430336ae9c Merge pull request #121 from hhu-propra2/fix_maxUser XXNitramandGitHub 2020-03-23 15:59:48 +01:00
• 27403f2712 Update editMembers.html tomvahlandxxnitram 2020-03-23 15:57:25 +01:00
• 9023fb72a7 fix nullpointer tomvahlandxxnitram 2020-03-23 15:56:15 +01:00
• 6aea99e903 fix userMax tomvahl 2020-03-23 15:47:59 +01:00
• 62efdb784d Merge pull request #120 from hhu-propra2/fix-add-csv tomvahlandGitHub 2020-03-23 15:38:35 +01:00
• cfb13a385c fix th:name kasch309 2020-03-23 15:34:31 +01:00
• feb1223ea8 fix styling kasch309 2020-03-23 15:27:08 +01:00
• a03d3f5b69 link displayed in UI 3 people 2020-03-23 15:08:39 +01:00
• fff8a8a730 Merge remote-tracking branch 'origin/master' Christoph 2020-03-23 15:00:56 +01:00
• 4b5634e45f Merge pull request #118 from hhu-propra2/optimize-db tomvahlandGitHub 2020-03-23 15:00:08 +01:00
• 7bae5e1184 add change_maximum size tomvahlandxxnitram 2020-03-23 14:57:33 +01:00
• 4cb8e4006b fix data.sql Christoph 2020-03-23 14:44:59 +01:00
• 214fd4388e Revert "disable some tests" Christoph 2020-03-23 14:42:17 +01:00
• 56eee36c51 disable some tests Christoph 2020-03-23 14:41:44 +01:00
• 9e588532f5 disable some tests Christoph 2020-03-23 14:41:10 +01:00
• 892c734265 link displayed in UI 3 people 2020-03-23 14:14:24 +01:00
• ec88a6bcad change schema.sql and adapt services + optimized search Christoph 2020-03-23 14:10:24 +01:00
• 25df317be4 Merge pull request #117 from hhu-propra2/ui kasch309andGitHub 2020-03-23 13:28:54 +01:00
• 2a6cf0e529 added create link to createOrga [Mahgs] 2020-03-23 13:27:11 +01:00
• d8242022df change color of buttons and badge to match the rest kasch309 2020-03-23 13:25:15 +01:00
• cfeaf7a5d4 Merge pull request #116 from hhu-propra2/fixSomeErrors AndiBulsandGitHub 2020-03-23 13:23:46 +01:00
• 9b1ad8b3da Merge remote-tracking branch 'origin/master' into showInviteLink [Mahgs] 2020-03-23 13:16:43 +01:00
• 7e021075eb Merge remote-tracking branch 'origin/master' into fixSomeErrors Lukas Ettel 2020-03-23 13:16:06 +01:00
• 06bd77b9e6 merge 3 people 2020-03-23 13:14:22 +01:00
• 37e0f7f8f7 Merge pull request #115 from hhu-propra2/design-fix Lukas EttelandGitHub 2020-03-23 13:06:32 +01:00
• 676245d44d Merge remote-tracking branch 'origin/master' into fixSomeErrors Lukas Ettel 2020-03-23 13:05:32 +01:00