lecture-professional-software-development

christoph/lecture-professional-software-development

Fork 0

4d77e2905f fix UserMax when added through orga killerber4t 2020-03-23 13:01:19 +01:00
de2c1ae245 Merge branch 'master' into design-fix AndiBuls 2020-03-23 12:57:57 +01:00
6c4a598816 link supplied to getMapping in details.html [Mahgs] 2020-03-20 16:47:17 +01:00
d3608e5043 changed template design; title and description now scales with window size AndiBuls 2020-03-20 16:42:12 +01:00
069885a771 add adjusting UserMax killerber4t 2020-03-20 16:38:39 +01:00
a13bdbf6b5 Fixed unauthoriced acsess to group-details
Lukas Ettel andibuls xxnitram
2020-03-20 16:33:56 +01:00
6506ce7bbe Merge pull request #114 from hhu-propra2/adjust_group_size Talha CaliskanandGitHub 2020-03-20 16:08:58 +01:00
755f76ef58 Update createOrga.html tomvahlandTalha Caliskan 2020-03-20 16:06:11 +01:00
8d0c3987d2 prepare search optimization Christoph 2020-03-20 16:00:07 +01:00
ef946c9f82 automatic group size for ogra tomvahlandTalha Caliskan 2020-03-20 15:57:16 +01:00
b6c013e254 fix GroupDelete tomvahlandTalha Caliskan 2020-03-20 15:09:27 +01:00
cb9750efc6 fixed double csv import
Lukas Ettel xxnitram andibuls
2020-03-20 14:49:03 +01:00
c1ce06d60f Merge pull request #113 from hhu-propra2/fix-search tomvahlandGitHub 2020-03-20 14:20:52 +01:00
10f7f8f1fc fix-search killerber4tandtomvahl 2020-03-20 14:18:13 +01:00
42154bd2d0 Merge pull request #112 from hhu-propra2/delete-group-event Talha CaliskanandGitHub 2020-03-20 14:05:29 +01:00
73f6798c2c if group empty gets delete tomvahlandTalha Caliskan 2020-03-20 14:00:41 +01:00
71ea7eec40 add DeleteGoup function tomvahlandTalha Caliskan 2020-03-20 13:45:40 +01:00
33a5f9053b Merge pull request #111 from hhu-propra2/lecture-parent-in-create Talha CaliskanandGitHub 2020-03-20 12:53:26 +01:00
acac3ca17c Change badge colour XXNitram 2020-03-20 02:59:41 +01:00
5b106d7746 Add function that collapses the drop-down list if the lecture checkbox is checked XXNitram 2020-03-20 02:39:59 +01:00
066d425d35 Add badge that displays parent group in detail site XXNitram 2020-03-20 02:38:24 +01:00
820782c2ce Add feature to link a group to a lecture XXNitram 2020-03-20 02:36:51 +01:00
479db666a3 Add method to get all lectures that are public XXNitram 2020-03-20 02:32:37 +01:00
d43e62bb1d Merge pull request #110 from hhu-propra2/merge-create-sites Lukas EttelandGitHub 2020-03-19 18:42:02 +01:00
ca1743f175 Merge pull request #109 from hhu-propra2/max_userNumber XXNitramandGitHub 2020-03-19 17:34:01 +01:00
b24f6d273f Fix merge with master XXNitram 2020-03-19 17:24:10 +01:00
ef044cbdf7 Merge remote-tracking branch 'origin/master' into csv-error-handling XXNitram 2020-03-19 17:01:32 +01:00
1a72ba379f Merge remote-tracking branch 'origin/max_userNumber' into max_userNumber kasch309 2020-03-19 16:54:05 +01:00
2eb9acea51 fix table and buttons kasch309 2020-03-19 16:53:09 +01:00
cd1d7183e7 Add exceptions for csv errors XXNitram 2020-03-19 16:51:40 +01:00
dc11536db3 Merge Erstellen and Veranstaltung into a single site
XXNitram andibuls Talha Caliskan kasch309 tomvahl Lukas Ettel
2020-03-19 16:50:52 +01:00
fd4c4ba0f1 Merge pull request #107 from hhu-propra2/entadminisierung AndiBulsandGitHub 2020-03-19 16:45:26 +01:00
59487fc4c7 Fix User class so that csv works XXNitram 2020-03-19 16:44:08 +01:00
5917d9b0fc fixed exeptionname
Lukas Ettel kasch309 andibuls xxnitram Talha Caliskan
2020-03-19 16:42:27 +01:00
f40268bc13 Merge pull request #105 from hhu-propra2/max_userNumber tomvahlandGitHub 2020-03-19 16:34:53 +01:00
feb21a512b fix tests tomvahl 2020-03-19 16:32:24 +01:00
89a40cb64b removed unwanted filed Lukas Ettel 2020-03-19 16:30:28 +01:00
7358d80528 add data.sql to create groups killerber4t 2020-03-19 16:18:46 +01:00
a96981515f Merge remote-tracking branch 'origin/master' into entadminisierung Lukas Ettel 2020-03-19 16:14:57 +01:00
cf46a549dc admin change when leaving group
Lukas Ettel kasch309 andibuls xxnitram
2020-03-19 16:10:35 +01:00
06b308167d abfangen von wenn letzter admin nicht mehr
Lukas Ettel kasch309 andibuls xxnitram
2020-03-19 16:00:09 +01:00
d2b5b44a0d Merge remote-tracking branch 'origin/master' into max_userNumber killerber4t 2020-03-19 15:55:59 +01:00
c343b5adbe fix button to leave editmembers killerber4tandtomvahl 2020-03-19 15:49:53 +01:00
46203e43f8 Merge branch 'max_userNumber' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into max_userNumber killerber4t 2020-03-19 15:40:16 +01:00
4b5cdee975 fix createVeranstaltung killerber4t 2020-03-19 15:40:00 +01:00
ca59309716 add display of actual and maximum users kasch309 2020-03-19 15:35:58 +01:00
a1e976a805 add exception tomvahl 2020-03-19 15:30:19 +01:00
1a5dc2571a add userMaximum killerber4tandtomvahl 2020-03-19 15:25:05 +01:00
abae802e0c add exception tomvahl 2020-03-19 15:11:20 +01:00
68ec062fdb crated an exeption Lukas Ettel 2020-03-19 14:39:54 +01:00
d9388c282c Merge pull request #103 from hhu-propra2/ui kasch309andGitHub 2020-03-19 14:34:48 +01:00
087e0f7a13 Merge branch 'master' into ui kasch309andGitHub 2020-03-19 14:32:01 +01:00
a2ae464bf0 add UserMaximum function tomvahl 2020-03-19 14:28:15 +01:00
b6c5fcda65 fix styling, rename error page kasch309 2020-03-19 14:22:39 +01:00
560800e847 Merge pull request #102 from hhu-propra2/fix-search-after-leaving tomvahlandGitHub 2020-03-19 14:20:19 +01:00
22bfcf3a05 fix-search after leaving group killerber4t 2020-03-19 14:14:54 +01:00
8291b5c41e Merge pull request #101 from hhu-propra2/error-handling Lukas EttelandGitHub 2020-03-19 13:12:20 +01:00
2192751a01 fix rename errors Christoph 2020-03-19 00:20:14 +01:00
fdd9d44aac fix merge errors Christoph 2020-03-19 00:00:33 +01:00
1c5139da8c Merge refactor into error-handling + fix merge errors Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-18 23:45:07 +01:00
849c94481c Merge branch 'refactoring' into error-handling Christoph 2020-03-18 23:40:39 +01:00
e9bab1bf3f Intellij Code Cleaunp Christoph 2020-03-18 23:25:54 +01:00
a05ffe9e4c Fix Checkstyle Errors :( Christoph 2020-03-18 23:17:57 +01:00
08717611d5 Rename SerializationService to JsonService Christoph 2020-03-18 21:46:14 +01:00
e1a630ae1a adapt tests Christoph 2020-03-18 21:45:33 +01:00
79de4a8540 renaming Christoph 2020-03-18 21:40:36 +01:00
e4d8fb05cb removed unneccessary fields, decreased field visibility Christoph 2020-03-18 21:32:05 +01:00
2ba913f2c8 Formatting Christoph 2020-03-18 20:18:03 +01:00
01c0cac2a2 Merge pull request #100 from hhu-propra2/import-csv-in-overview Lukas EttelandGitHub 2020-03-18 19:00:00 +01:00
b1460abe48 Exception rework: clearer message + origin Christophand[Mahgs] <maxoerter@gmx.de> 2020-03-18 18:49:40 +01:00
a1ee6a18cd Refactor Gruppen2Controller and change redirect in addUsersFromCsv method XXNitram 2020-03-18 18:03:02 +01:00
40d1c898e8 Refactor ControllerService XXNitram 2020-03-18 18:02:11 +01:00
c631f243a1 Refactor indentation in html files XXNitram 2020-03-18 18:00:47 +01:00
4b6e8eae39 Merge remote-tracking branch 'origin/master' into import-csv-in-overview XXNitram 2020-03-18 17:36:06 +01:00
2d8472bd4a Merge remote-tracking branch 'origin/master' into error-handling Christoph 2020-03-18 17:20:31 +01:00
f4513e4f99 Merge pull request #99 from hhu-propra2/edit-User Lukas EttelandGitHub 2020-03-18 17:12:00 +01:00
d2c1de7c9f fix for merge killerber4t 2020-03-18 17:01:33 +01:00
1fbfd49781 show file thats choosen to load up
Lukas Ettel xxnitram andibuls tomvahl
2020-03-18 16:55:07 +01:00
b3107c98f1 Merge branch 'master' into edit-User Talha CaliskanandGitHub 2020-03-18 16:43:33 +01:00
4450a091de Add addUsersFromCsv in editMembers Overview
XXNitram Lukas Ettel tomvahl
2020-03-18 16:42:06 +01:00
90124a7c15 Fix file input alignment XXNitram 2020-03-18 16:40:40 +01:00
4b88742776 add deleteUser button and reconfigure the according method killerber4t 2020-03-18 16:36:54 +01:00
42721e06fc Improve styling on several templates kasch309 2020-03-18 16:32:27 +01:00
df7803f83d add error handling (frontend) + exception changes ChristophandMahgs 2020-03-18 16:26:11 +01:00
dad86bb4b2 Merge remote-tracking branch 'origin/edit-User' into edit-User kasch309 2020-03-18 16:18:14 +01:00
dac0b28efb fix path redirecting killerber4t 2020-03-18 16:16:27 +01:00
0ade9319fb Merge pull request #98 from hhu-propra2/fix_search AndiBulsandGitHub 2020-03-18 16:06:36 +01:00
62397a24ef update search tomvahlandandibuls 2020-03-18 16:03:34 +01:00
e0db7584ac Improve styling on several templates kasch309 2020-03-18 16:00:11 +01:00
22172b5406 cleanup of the search function AndiBuls 2020-03-18 15:25:37 +01:00
9aa7122779 Improve styling on several templates kasch309 2020-03-18 15:23:26 +01:00
2b1d6507e6 fix-search tomvahlandandibuls 2020-03-18 15:17:48 +01:00
6f664326c3 Merge remote-tracking branch 'origin/edit-User' into import-csv-in-overview XXNitram 2020-03-18 15:15:06 +01:00
522d1369ec fix search tomvahlandandibuls 2020-03-18 15:09:14 +01:00
7e52935b77 Add check for empty csv file XXNitramandLukas Ettel 2020-03-18 15:05:09 +01:00
ecd6154580 Merge pull request #96 from hhu-propra2/feature-orga-csv tomvahlandGitHub 2020-03-18 14:46:46 +01:00
6929b1ead4 Add Service Annotation XXNitram 2020-03-18 14:43:26 +01:00
f408391f4c Refactor Gruppen2Controller XXNitram 2020-03-18 14:40:39 +01:00
ba4a531337 Merge remote-tracking branch 'origin/master' into feature-orga-csv XXNitram 2020-03-18 14:38:50 +01:00
f292700c78 Merge remote-tracking branch 'origin/master' into feature-orga-csv XXNitram 2020-03-18 14:27:54 +01:00

... 3 4 5 6 7 ...

Commit Graph Select branches Hide Pull Requests dev master Mono Color

Commit Graph

Select branches

Hide Pull Requests

dev

master