Commit Graph

Select branches

Hide Pull Requests

dev

master

Mono Color

• 244f3fa675 fix checkstyle errors killerber4t 2020-03-27 14:46:09 +01:00
• e387206205 Merge pull request #149 from hhu-propra2/invite-link-update ChristophandGitHub 2020-03-27 14:40:39 +01:00
• 64dd8f5ad3 Merge remote-tracking branch 'origin/invite-link-update' into invite-link-update [Mahgs] 2020-03-27 14:38:17 +01:00
• 9c984f8572 fixed checkstyle in tests [Mahgs] 2020-03-27 14:38:07 +01:00
• 63d9b76d40 caching Christoph 2020-03-27 14:33:01 +01:00
• 30abcc4085 fix checkstyle errors killerber4t 2020-03-27 14:21:50 +01:00
• 9ccb7c77a2 fix invite Christoph 2020-03-27 14:04:32 +01:00
• ee1beaeccb Update ControllerServiceTest.java 3 people 2020-03-27 13:59:30 +01:00
• ef00c42f6f fix invite Christoph 2020-03-27 13:45:11 +01:00
• 858efd57d3 fixfixfix Christoph 2020-03-27 13:17:09 +01:00
• 8c29d04740 fix schema Christoph 2020-03-27 13:15:05 +01:00
• 56a81ce66f caching Christoph 2020-03-27 12:57:47 +01:00
• 215a10c8fc Merge remote-tracking branch 'origin/master' into JavaDocComments [Mahgs] 2020-03-27 12:56:23 +01:00
• cc64943663 only show link to admin Christoph 2020-03-26 21:35:52 +01:00
• 02e7bcbcc4 fix api Christoph 2020-03-26 21:19:59 +01:00
• b37f2349aa secure invite link Christoph 2020-03-26 20:53:59 +01:00
• 5e5939aa42 Merge branch 'csrf' into invite-link-update Christoph 2020-03-26 18:28:34 +01:00
• 853a5bcb03 fix forms to automatically generate csrf tokens Christoph 2020-03-26 18:21:52 +01:00
• 832a03c82f Merge remote-tracking branch 'origin/master' Christoph 2020-03-26 17:22:46 +01:00
• b50783cd8c merge fix Christoph 2020-03-26 17:21:28 +01:00
• 82e9611d47 merge fix Christoph 2020-03-26 17:20:58 +01:00
• bacf9be7cc added link to controller [Mahgs] 2020-03-26 17:14:49 +01:00
• 68a9ddeecc create links Christoph 2020-03-26 17:10:15 +01:00
• 9302bc68b5 queries + inviteservice Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-26 17:04:12 +01:00
• 482d556f51 add arc42 full file kasch309 2020-03-26 17:03:59 +01:00
• 12eb4b9534 add more testcases killerber4t 2020-03-26 16:59:50 +01:00
• 3fc4d82dbe Futher further refactor 3 people 2020-03-26 16:57:46 +01:00
• f581169afc queries Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-26 16:45:54 +01:00
• 4a2ed5e755 Merge pull request #148 from hhu-propra2/documentation-merge Talha CaliskanandGitHub 2020-03-26 16:45:51 +01:00
• 46e01aed9b add last file kasch309 2020-03-26 16:41:31 +01:00
• d336c10802 schema fix + repo + dto Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-26 16:41:18 +01:00
• 8956b7a91a add documentation into branch to merge into master kasch309 2020-03-26 16:40:23 +01:00
• 598ec3ea6e Merge pull request #147 from hhu-propra2/serchAll ChristophandGitHub 2020-03-26 16:40:16 +01:00
• a1e67eac9c Merge remote-tracking branch 'origin/master' into serchAll [Mahgs] 2020-03-26 16:38:14 +01:00
• dbe3cc7f51 added show all to search.html [Mahgs] 2020-03-26 16:37:28 +01:00
• 666bab0c03 entrypoint Christoph 2020-03-26 16:35:31 +01:00
• 72eaed4279 Merge pull request #146 from hhu-propra2/docker-profile-security Talha CaliskanandGitHub 2020-03-26 16:33:19 +01:00
• d58cde597b Futher refactor 3 people 2020-03-26 16:31:17 +01:00
• 63c924dbb9 add mysql schema entrypoint Christoph 2020-03-26 16:30:29 +01:00
• 083044bbbb update dockerfile: pull wait-for-it from github Christoph 2020-03-26 16:28:28 +01:00
• a79ab6473b add more testcases killerber4t 2020-03-26 16:26:07 +01:00
• 33e3d9d3f5 docker profiles, docker compose, mysql entrypoint, security Christoph 2020-03-26 16:06:40 +01:00
• 2443179ad5 add Multiple tests And rename 1 Method killerber4t 2020-03-26 16:00:16 +01:00
• 41e035d901 a [Mahgs] 2020-03-26 15:38:39 +01:00
• b5d688311d Refactor of all addFromCsv in Deteils complete Lukas EttelandAndiBuls 2020-03-26 15:23:52 +01:00
• 25595c9380 merged with master [Mahgs] 2020-03-26 15:11:12 +01:00
• c62524aa8a Merge remote-tracking branch 'origin/master' into JavaDocComments [Mahgs] 2020-03-26 15:06:44 +01:00
• bbf4f0b6e5 changed Titel in error.html [Mahgs] 2020-03-26 15:03:30 +01:00
• 566c99565a Merge pull request #143 from hhu-propra2/refactor-controllerService AndiBulsandGitHub 2020-03-26 14:55:00 +01:00
• 5394b5d47a Refactor of all createGroups complete Lukas EttelandAndiBuls 2020-03-26 14:52:11 +01:00
• 7f1aab017e Merge remote-tracking branch 'origin/master' into refactor-controllerService Lukas Ettel 2020-03-26 14:45:43 +01:00
• c88990a3ed Refactor of all createGroups complete Lukas EttelandAndiBuls 2020-03-26 14:42:32 +01:00
• 4d0968b2d9 Merge remote-tracking branch 'origin/master' into JavaDocComments [Mahgs] 2020-03-26 14:25:01 +01:00
• e7df8a50e2 Merge pull request #142 from hhu-propra2/refactor-ValidationService Talha CaliskanandGitHub 2020-03-26 14:19:46 +01:00
• 677ed4e37b Add validation for setting a new userMaximum XXNitramandTalha Caliskan 2020-03-26 14:14:45 +01:00
• 1cc52d7dce Fix checkFields XXNitramandTalha Caliskan 2020-03-26 14:14:06 +01:00
• 4f833c3c5f Refactor WrongFileException XXNitram 2020-03-26 14:12:53 +01:00
• 7b9af1320c Refactor of all createGroups complete Lukas EttelandAndiBuls 2020-03-26 14:06:13 +01:00
• 91e745e939 Merge remote-tracking branch 'origin/master' into refactor-controllerService Lukas Ettel 2020-03-26 13:57:10 +01:00
• 8c1eb876c5 Refactor of all createGroups complete Lukas EttelandAndiBuls 2020-03-26 13:50:22 +01:00
• de0e8ee4fe fixed some problems in WebController [Mahgs] 2020-03-26 13:48:17 +01:00
• 2c6c844edd delete InviteLinkDTO [Mahgs] 2020-03-26 13:38:11 +01:00
• eb59a70dd4 added javaDoc for UserService [Mahgs] 2020-03-26 13:32:48 +01:00
• 3c05dbef75 added javaDoc for EventService and fix Todo fix Todo in EventRepository [Mahgs] 2020-03-26 13:28:23 +01:00
• ae468f4afc added javaDoc for GroupService [Mahgs] 2020-03-26 13:14:35 +01:00
• 923dd713df Merge remote-tracking branch 'origin/master' into refactor-ValidationService killerber4t 2020-03-26 13:04:17 +01:00
• d1c8865580 html fix title alignment in detailsMember.html AndiBuls 2020-03-25 17:05:06 +01:00
• b7bf21f4c3 Merge remote-tracking branch 'origin/refactor-controllerService' into refactor-ValidationService killerber4t 2020-03-25 16:57:38 +01:00
• f15d1f850d Merge pull request #141 from hhu-propra2/prevent-private-lectures Max OerterandGitHub 2020-03-25 16:55:15 +01:00
• eaf8631c9f Merge pull request #139 from hhu-propra2/checkstyle ChristophandGitHub 2020-03-25 16:53:34 +01:00
• 57df0263d4 refactor ValidationService killerber4t 2020-03-25 16:52:43 +01:00
• b193327f9c Merge remote-tracking branch 'origin/master' into checkstyle [Mahgs] 2020-03-25 16:47:08 +01:00
• 0d3f59d710 Merge pull request #140 from hhu-propra2/uiBadges kasch309andGitHub 2020-03-25 16:46:13 +01:00
• a140cd22a0 Merge branch 'master' into refactor-controllerService AndiBuls 2020-03-25 16:45:01 +01:00
• 02d81d4ee8 prevent private lectures in frontend, still needs validation Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-25 16:44:53 +01:00
• a812de398e add float for badges kasch309 2020-03-25 16:44:05 +01:00
• 81b93266e5 fixed checkstyle problems [Mahgs] 2020-03-25 16:36:37 +01:00
• 95e3c38dd9 refactor createOrga AndiBulsandLukasEttel 2020-03-25 16:30:22 +01:00
• 9045cace9c Merge pull request #138 from hhu-propra2/add-ValidationService ChristophandGitHub 2020-03-25 16:12:05 +01:00
• 7be3db7e0d Merge pull request #137 from hhu-propra2/group-list-ordering ChristophandGitHub 2020-03-25 16:10:11 +01:00
• f09b498369 Merge remote-tracking branch 'origin/master' into group-list-ordering Christoph 2020-03-25 16:09:46 +01:00
• c00ee2f235 Merge branch 'master' into add-ValidationService Talha CaliskanandGitHub 2020-03-25 16:09:20 +01:00
• dbfa260c4d Refactor after merge with master XXNitramandTalha Caliskan 2020-03-25 16:07:31 +01:00
• 0ec805f3ae Merge pull request #136 from hhu-propra2/killertester ChristophandGitHub 2020-03-25 16:07:12 +01:00
• bc903e2543 fix tests tomvahl 2020-03-25 16:04:56 +01:00
• cff8b2c800 fix test tomvahl 2020-03-25 15:59:20 +01:00
• f0e49dfc55 slight changes 3 people 2020-03-25 15:57:07 +01:00
• 6f9ab00ba1 fix UUID tomvahl 2020-03-25 15:56:30 +01:00
• 48b8617cbb Merge branch 'master' into killertester tomvahlandGitHub 2020-03-25 15:52:53 +01:00
• 2c70deeb7b Merge remote-tracking branch 'origin/master' into add-ValidationService XXNitram 2020-03-25 15:51:10 +01:00
• ed4a9b5728 add badges in group lists Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-25 15:46:58 +01:00
• 0c43050166 Refactor WebController and ValidationService XXNitramandTalha Caliskan 2020-03-25 15:43:41 +01:00
• 5736de146d refactor createGroup and createOrga AndiBuls 2020-03-25 15:38:37 +01:00
• dd7404553c Merge pull request #135 from hhu-propra2/fix_createGroup AndiBulsandGitHub 2020-03-25 14:50:41 +01:00
• 74038428df Merge pull request #134 from hhu-propra2/fix-group-search-number-of-users ChristophandGitHub 2020-03-25 14:48:26 +01:00
• d703b1f255 refactor Exceptions 3 people 2020-03-25 14:47:46 +01:00
• 22ae8a81dc partial fix search: max user anzahl display 3 people 2020-03-25 14:46:02 +01:00
• be37fcbd50 add Exceptions 3 people 2020-03-25 14:40:59 +01:00
• 0e7f1d6865 Merge pull request #133 from hhu-propra2/fixNoAccessPrivateGroupExeption AndiBulsandGitHub 2020-03-25 14:08:47 +01:00
• 1dd3f9b6fe create ValidationService killerber4tandxxnitram 2020-03-25 14:08:00 +01:00