blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-10 00:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,161 Commits 224 Branches 6 Tags
5bdfd447ac83d8af5fd2fed90d655e5fe3739da5
Commit Graph

684 Commits

Author SHA1 Message Date
KarpAlex 9c1d58c447 Merge branch 'master' into feature-24880/Sprachaenderung_in_Projektarbeitsbeurteilung_mit_Token 2023-03-15 21:47:33 +01:00
Andreas Österreicher c411b826d9 Merge branch 'feature-25518/bewerbungstool_messages_direkt_an_permesser' 2023-03-06 16:54:43 +01:00
Andreas Österreicher fd0eed8558 Merge branch 'feature-27665/infocenter_zgv_uebernehmen' 2023-02-06 15:49:18 +01:00
ma0048 e6269b121b - fixed zgv uebernehmen 2023-02-06 13:04:32 +01:00
Andreas Österreicher 5441024c75 Merge branch 'feature-27363/infocenter_alte_dokumente_aus_dem_archiv_sichtbar' 2023-02-02 12:20:42 +01:00
Andreas Österreicher b60e0b712f Merge branch 'feature-25430/stammdaten_im_infocentertool_editierbar' 2023-02-02 10:32:36 +01:00
ma0048 3293a75a79 - berechtigungsabfragen angepasst 
- fit programme aus der config holen
 2023-01-30 11:51:15 +01:00
ma0048 50070bd2ad - Dokumente aus dem Archiv im Infocenter-Tool nicht anzeigen 2023-01-26 10:41:44 +01:00
KarpAlex 911035d5ad added method getBetreuerart to Projektbetreuer model 2022-12-02 19:48:23 +01:00
KarpAlex 763b0bb756 renamed betreuerart of secondary examiner of bachelor thesis with Vorsitz from Senatspruefer to Senatsmitglied 2022-11-16 17:19:13 +01:00
ma0048 ab95544f9f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25518/bewerbungstool_messages_direkt_an_permesser 2022-11-15 15:18:59 +01:00
KarpAlex 83b38b999d Merge branch 'master' into feature-19154/Beurteilungsformulare_Pruefungssenat 2022-11-08 15:35:08 +01:00
ma0048 a8f6ca1670 Merge remote-tracking branch 'origin/master' into feature-25430/stammdaten_im_infocentertool_editierbar 
# Conflicts:
#	application/views/system/infocenter/infocenterDetails.php
 2022-11-03 08:29:10 +01:00
ma0048 f7bd49b408 - master messages an studiengang, wenn bereits bestaetigt 
- lehrgang messages direkt an lehrgang
 2022-10-28 10:56:02 +02:00
Harald Bamberger b3ce06cb90 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-10-24 15:21:11 +02:00
Manfred 409ccd7640 BugFix DISTINCT in getOrganisationunitsByPersonId 2022-10-24 12:21:40 +02:00
Harald Bamberger 50ab6ae5e9 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-10-24 11:02:52 +02:00
ma0048 0bd7d6f7c6 - editieren von stammdaten im infocentertool 2022-10-18 11:00:57 +02:00
KarpAlex 6d457fd573 added codex/Mobilitaet_model for bis.tbl_mobilitaet 2022-10-06 00:32:53 +02:00
KarpAlex 854e0a422f Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen 2022-09-30 18:16:46 +02:00
KarpAlex c00b9006b5 Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen 2022-09-30 18:14:33 +02:00
Andreas Österreicher ae4bf1feb1 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-09-30 14:54:07 +02:00
Andreas Österreicher 17ad37ac8e Merge branch 'feature-24767/infocenter_zgv_pruefungen_und_lehre_error' 2022-09-26 16:45:06 +02:00
Andreas Österreicher 66b9576e15 Merge branch 'bug-24165/Message_reply_token_allow_to_write_to_anybody' 2022-09-19 15:11:51 +02:00
ma0048 f0cec85d8f style anpassungen und funktionen geloescht 2022-09-14 11:57:23 +02:00
Andreas Österreicher d6a35603e1 Merge branch 'feature-23977/ZGVNeueKodextabellen' 2022-09-12 13:06:07 +02:00
ma0048 33b35286d3 Merge remote-tracking branch 'origin/master' into feature-18984/infocenter_tool_fuer_lehrgaenge_anpassen 2022-09-12 10:15:50 +02:00
Andreas Österreicher 393eaea91d Removed Dashboard Testfiles 2022-09-07 09:00:00 +02:00
Cris 522e341d3d Dashboard Test V1 2022-09-06 15:29:42 +02:00
Andreas Österreicher d109747cfc Merge branch 'master' into feature-19173/mobilityonline_grant_agreement_ins_fas_uebernehmen 2022-09-01 15:34:12 +02:00
KarpAlex cc33502ab3 adapted "resend token for Begutachter" mail to Projektarbeitsbeurteilung controller split 2022-09-01 02:23:32 +02:00
KarpAlex 824a148b92 adapted core to Projektarbeitsbeurteilung Zweitbegutachter/Erstbegutacher Controller split 2022-08-31 13:38:38 +02:00
Paolo 8e0734ca8c Added check in CL/Messages_model->sendReply to check that $receiver_id, $relationmessage_id and $token match in the database to avoid to be able to write to anyone using a token 2022-08-30 17:31:04 +02:00
Andreas Österreicher ed9f6e0c9b Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-30 14:44:13 +02:00
ma0048 03535b7589 text aenderung und holen alle studienbeitraege 2022-08-30 14:08:00 +02:00
ma0068 d1bb1b9666 Infocenter: Adaptierungen ZGV-Master und ZGVmasternation Dropdown 2022-08-30 13:10:47 +02:00
ma0068 8fd69ccd26 Infocenter: Anzeige gesperrte Nationen als disabled im Dropdown ZGVNation 2022-08-30 09:41:45 +02:00
Andreas Österreicher 68d6e3c549 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze 2022-08-29 16:23:20 +02:00
ma0068 54a1c486c5 Infocenter: Anzeige inaktive ZGVs als disabled im Dropdown ZGV 2022-08-29 15:12:06 +02:00
KarpAlex 92762c5dc2 Projektarbeitsbeurteilung: 
- getZweitbegutachterWithToken: returns Zweitbegutachter (Senatspruefer) 
from Senatspruefungen as well
- added phrase
 2022-08-27 01:34:03 +02:00
ma0048 a13c010cd5 textaenderungen und getzutrittskarte by uid 2022-08-25 10:43:26 +02:00
KarpAlex 1d5d5e4a84 added getEndabgabe method to Paabgabe model 2022-08-24 18:07:34 +02:00
KarpAlex 82d7891f3c Projektarbeitsbeurteilung possible for Prüfungssenat. Mails are sent to Senat members, Senat members are displayed with correct labels, external Prüfer can get login token 2022-08-23 17:45:12 +02:00
Werner Masik 7b95ca4b92 Merge remote-tracking branch 'origin/feature-19473/VUE_Filter_Navigation_Widgets' into feature-19001/VUE_ROUTER 2022-08-17 22:13:29 +02:00
Werner Masik a3c9d75617 added model for adressentyp 2022-08-16 13:10:20 +02:00
ma0048 979f8d96bc ermoeglicht das sperren der zutrittskarten 2022-08-11 14:29:56 +02:00
Harald Bamberger e63d34132c merged current master 2022-08-08 13:29:44 +02:00
Paolo 4dab69cb15 Reverted changes in application/models/person/Benutzer_model.php, pk => array 2022-07-13 09:45:58 +02:00
KarpAlex f72c165fe6 added codex/Gsprogramm_model 2022-07-12 19:41:08 +02:00
Werner Masik 8c8623ce4f change primary key to string instead of array 
because it is not a composite key and the load method gets confused otherwise
 2022-07-11 17:31:37 +02:00