Commit Graph

Select branches

Hide Pull Requests

dev

master

Mono Color

• 9541188350 Merge pull request #95 from hhu-propra2/updateCheckGroup ChristophandGitHub 2020-03-18 14:25:36 +01:00
• 9934249cb5 Merge pull request #94 from hhu-propra2/defaultRoute ChristophandGitHub 2020-03-18 14:24:48 +01:00
• 3b09d2a3a2 Merge remote-tracking branch 'origin/edit-User' into edit-User kasch309 2020-03-18 14:23:27 +01:00
• 69141705ab fixed tests [Mahgs] 2020-03-18 14:22:23 +01:00
• b89b47ec81 set redirection to index instead of previous page kasch309 2020-03-18 14:21:39 +01:00
• 75a4701bd0 fix table and functionality kasch309 2020-03-18 14:21:05 +01:00
• 45679c7d2a Update .gitignore killerber4t 2020-03-18 14:20:32 +01:00
• 838bff1d9f Update GroupType in createGroup 4 people 2020-03-18 14:19:00 +01:00
• 0db03f2ab5 Add createLecture feature 4 people 2020-03-18 14:13:58 +01:00
• 56f82203cd fix entering group youre already part of killerber4t 2020-03-18 14:11:52 +01:00
• b236e3bb9d changed checkGroup Method to a Query [Mahgs] 2020-03-18 14:09:30 +01:00
• 523d7d2ad9 added a default route [Mahgs] 2020-03-18 13:52:48 +01:00
• e2326d5f23 added a default route [Mahgs] 2020-03-18 13:46:51 +01:00
• 19e8ef9c07 remove unnecessary line killerber4t 2020-03-18 13:43:12 +01:00
• 5703ad4678 fix random error killerber4t 2020-03-18 13:40:07 +01:00
• 051196f766 Add CSV methods and createLecture.html 4 people 2020-03-18 13:36:57 +01:00
• af573f2353 Add list entry in html 4 people 2020-03-18 13:36:22 +01:00
• eabbcc7e04 Add jackson dependency 4 people 2020-03-18 13:35:41 +01:00
• 5f1cdca4ee fix text overflow in groupdescription killerber4t 2020-03-18 13:21:44 +01:00
• e9ee776047 Merge pull request #93 from hhu-propra2/group-invite-links Max OerterandGitHub 2020-03-18 13:21:34 +01:00
• b431361eec merged with master [Mahgs] 2020-03-18 13:19:19 +01:00
• 722cd80831 Merge remote-tracking branch 'origin/master' into group-invite-links [Mahgs] 2020-03-18 13:18:34 +01:00
• a6667e4091 fix text overflow in groupdescription killerber4t 2020-03-18 13:08:35 +01:00
• 0828c278dc fix visibility recognition in detailsMember.html killerber4t 2020-03-18 12:47:03 +01:00
• b8936052cb fix role recognition in detailsMember.html killerber4t 2020-03-18 12:43:49 +01:00
• 4b1627a993 Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv XXNitram 2020-03-18 03:23:22 +01:00
• 179062eed9 Add createLecture for orga only 4 people 2020-03-17 17:07:30 +01:00
• 61dc1eb928 Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User killerber4t 2020-03-17 16:57:25 +01:00
• 9491f83cca fix roles on detailsMember.html killerber4t 2020-03-17 16:57:13 +01:00
• 06eb174c42 add table column kasch309 2020-03-17 16:56:38 +01:00
• aa67bd2e88 Add missing service Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-17 16:55:32 +01:00
• a67d8fa993 Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User killerber4t 2020-03-17 16:44:09 +01:00
• 47ee171070 fix roles on detailsMember.html killerber4t 2020-03-17 16:42:31 +01:00
• e9199857b7 change table class kasch309 2020-03-17 16:35:00 +01:00
• b0186eee66 fix edit members button (add margin) kasch309 2020-03-17 16:32:04 +01:00
• b648920c42 fix template kasch309 2020-03-17 16:29:55 +01:00
• 6e067d1b47 Fix InviteLink DB Schema + Implement Frontend InviteLink Handling Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-17 16:16:58 +01:00
• 3036f76b37 Merge remote-tracking branch 'origin/master' into edit-User killerber4t 2020-03-17 16:16:44 +01:00
• e412c051f7 Merge pull request #91 from hhu-propra2/quickFix Talha CaliskanandGitHub 2020-03-17 16:15:26 +01:00
• 49c38b583c Quick fix on master Lukas Ettel 2020-03-17 16:13:29 +01:00
• d2f71e6390 delete table column kasch309 2020-03-17 16:11:24 +01:00
• 90a07e7b2a Merge pull request #90 from hhu-propra2/eventExeptionHandling Talha CaliskanandGitHub 2020-03-17 16:06:54 +01:00
• 72ae173307 Merge remote-tracking branch 'origin/ui-edit-user' into edit-User killerber4t 2020-03-17 16:02:26 +01:00
• ca80b7ca2b add changeRole and refactor Event-Methods in ControllerService 5 people 2020-03-17 16:00:04 +01:00
• 991bcf2aaa Implementation of old EventExeptions Lukas Ettel 2020-03-17 15:57:26 +01:00
• 9b6a168fb6 Add rough template for editing embers of a group kasch309 2020-03-17 15:55:51 +01:00
• a868ea86b4 add edit-members to controller killerber4tandxxnitram 2020-03-17 15:31:53 +01:00
• f7678073db Merge pull request #89 from hhu-propra2/Join_Group AndiBulsandGitHub 2020-03-17 15:25:54 +01:00
• bd9e1bb28e add Join Group tomvahl 2020-03-17 15:11:40 +01:00
• bafdea881a Merge pull request #88 from hhu-propra2/delete-User XXNitramandGitHub 2020-03-17 15:00:34 +01:00
• c052ec6ae6 refactor code killerber4tandxxnitram 2020-03-17 14:58:02 +01:00
• 2738b6a35f Merge branch 'delete-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into delete-User killerber4t 2020-03-17 14:47:02 +01:00
• aa843f1d8e fix html killerber4t 2020-03-17 14:46:20 +01:00
• 921a7c1b3e Merge pull request #87 from hhu-propra2/delete-User XXNitramandGitHub 2020-03-17 14:41:02 +01:00
• ea0810174a Merge branch 'master' into delete-User Talha CaliskanandGitHub 2020-03-17 14:39:02 +01:00
• 61e007e4d8 add leaving group killerber4tandxxnitram 2020-03-17 14:36:55 +01:00
• a28f9a215c Merge pull request #86 from hhu-propra2/details-ui-fix kasch309andGitHub 2020-03-17 14:02:21 +01:00
• 4bcf931246 spacing still wrong AndiBuls 2020-03-17 13:58:34 +01:00
• 41833b2a07 fixed spacing for details AndiBuls 2020-03-17 13:56:03 +01:00
• 1acfcc449f Merge pull request #85 from hhu-propra2/ui-improvements AndiBulsandGitHub 2020-03-17 13:50:02 +01:00
• bddffd48c1 Merge pull request #84 from hhu-propra2/change-to-polymorphie XXNitramandGitHub 2020-03-17 13:49:39 +01:00
• bae8805972 fix styling, add missing attributes kasch309 2020-03-17 13:47:09 +01:00
• 0467d3c6a6 removed outdated test 4 people 2020-03-17 13:46:19 +01:00
• 906585ce9a added InviteLinkRepository [Mahgs]andChristoph 2020-03-17 13:42:35 +01:00
• e045dc54ee Add InviteLinkDTO + add dto folder Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-17 13:33:02 +01:00
• db11178ccd Add db table for invite links Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-17 13:25:37 +01:00
• f05b92994f Merge pull request #83 from hhu-propra2/design-change kasch309andGitHub 2020-03-17 13:19:23 +01:00
• e2dcee44af added deleted button in search.html and changed design of index.html AndiBuls 2020-03-17 13:15:21 +01:00
• 325c5d84f9 Merge branch 'master' into change-to-polymorphie Lukas Ettel 2020-03-17 13:05:20 +01:00
• cbf69e387b fix search funktion tomvahl 2020-03-17 12:35:06 +01:00
• 8387b58e35 change createGroup Methode in ControllerService tomvahl 2020-03-17 11:09:27 +01:00
• 1b8fa04826 change createGroup Methode in ControllerService tomvahl 2020-03-17 10:45:03 +01:00
• ca469d83af even further stuff 5 people 2020-03-16 17:01:44 +01:00
• 6991a18405 fix UpdateRoleEvent and DeleteUserEvent 5 people 2020-03-16 16:50:32 +01:00
• abd99f6a5e further refactor of eventhandling 5 people 2020-03-16 16:33:26 +01:00
• 7c2d5ecb28 Merge pull request #81 from hhu-propra2/keycloakRestApi ChristophandGitHub 2020-03-16 16:28:35 +01:00
• 6c8a5fbe78 changed docker.properties 3 people 2020-03-16 16:25:04 +01:00
• d0a42c4569 Merge remote-tracking branch 'origin/master' into keycloakRestApi [Mahgs] 2020-03-16 16:18:25 +01:00
• 7e2c1dec81 tested APIController 3 people 2020-03-16 16:16:46 +01:00
• ee6d2cca9f Merge branch 'change-to-polymorphie' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into change-to-polymorphie killerber4t 2020-03-16 15:53:34 +01:00
• 4f6ec4ed96 Merge branch 'change-to-polymorphie' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into change-to-polymorphie killerber4t 2020-03-16 15:53:03 +01:00
• 266c1d6da9 Merge remote-tracking branch 'origin/change-to-polymorphie' into change-to-polymorphie tomvahl 2020-03-16 15:48:16 +01:00
• 8d0b81b65f delete applyEvent-Methods from Group killerber4t 2020-03-16 15:47:07 +01:00
• 315d1d6011 change AddUserEvent and DeleteUserEvent killerber4t 2020-03-16 15:46:23 +01:00
• 06fa9f5284 change UpdateRoleEvent tomvahl 2020-03-16 15:45:26 +01:00
• 801ef1998c Change UpdateGroupTitleEvent and UpdateGroupDescriptionEvent XXNitram 2020-03-16 15:44:31 +01:00
• e12f0c1d59 added @Secured and fixed 3 people 2020-03-16 15:40:46 +01:00
• 22eede051b change CreateGroupEvent 5 people 2020-03-16 15:36:28 +01:00
• 3f144d14e4 update KeyCloakConfig like in the KeycloakDemo 3 people 2020-03-16 15:16:43 +01:00
• 523b7a8f16 Merge pull request #80 from hhu-propra2/details-templates ChristophandGitHub 2020-03-16 14:55:15 +01:00
• 7c3942c10d Merge branch 'master' into details-templates kasch309andGitHub 2020-03-16 14:53:19 +01:00
• f4cee7ee82 Add template for error page, that redirects the user to the previous page (rename later) kasch309 2020-03-16 14:51:13 +01:00
• 2c3531657d csv proof of concept Christoph 2020-03-16 14:09:30 +01:00
• 314336fd5a Merge pull request #79 from hhu-propra2/design-changes AndiBulsandGitHub 2020-03-16 14:00:54 +01:00
• 9f464fe859 init csv support Christoph 2020-03-16 13:56:05 +01:00
• 54d5028693 Add template for detailsNoMember.html, that displays the details when you search a page. Add connection to the controller kasch309 2020-03-16 13:31:51 +01:00
• eecfc0351f made ui look more consistent AndiBuls 2020-03-16 13:31:51 +01:00
• 6a310c4b1f Merge pull request #78 from hhu-propra2/EventServiceTests Lukas EttelandGitHub 2020-03-16 13:28:40 +01:00
• 061d6d2390 merged with master Mahgs 2020-03-16 13:15:54 +01:00
• db11bdb8a9 Merge remote-tracking branch 'origin/master' into EventServiceTests Mahgs 2020-03-16 13:14:10 +01:00