blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-06 14:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 6bdbe91dd9 Merge branch 'master' into bug-19038/AnzeigeOffenerMonatslistenBeiNichtZeitaufzeichnungspflichtig ma0068 2022-09-05 13:36:10 +02:00
  • 8670ab18f8 Zeitaufzeichnung: Berücksichtigung von Attribut Zeitaufzeichnung bei Projekt und Projektphase ma0068 2022-09-05 11:27:33 +02:00
  • d109747cfc Merge branch 'master' into feature-19173/mobilityonline_grant_agreement_ins_fas_uebernehmen Andreas Österreicher 2022-09-01 15:34:12 +02:00
  • cc33502ab3 adapted "resend token for Begutachter" mail to Projektarbeitsbeurteilung controller split KarpAlex 2022-09-01 02:23:32 +02:00
  • 537ce0940c Code quality check improvements Paolo 2022-08-31 15:48:35 +02:00
  • 824a148b92 adapted core to Projektarbeitsbeurteilung Zweitbegutachter/Erstbegutacher Controller split KarpAlex 2022-08-31 13:38:38 +02:00
  • 1ddd5b7f14 Merge branch 'feature-20226/erfassung_internationalisierungsmassnahmen_bekanntgabe' Andreas Österreicher 2022-08-31 13:36:18 +02:00
  • 74331d5e6c dms kategoerie hinzugefuegt ma0048 2022-08-31 11:56:19 +02:00
  • c215b2cb5f Merge branch 'feature-24103/kartenverlaengerung_gueltig_bis_zu_gueltig_fuer' Andreas Österreicher 2022-08-31 11:42:34 +02:00
  • 162858721c Merge branch 'feature-24184/infocenter_messages_bei_statuswechsel' Andreas Österreicher 2022-08-31 11:34:38 +02:00
  • 90a13e445c fix damit messages wieder geschickt werden ma0048 2022-08-31 11:33:29 +02:00
  • 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 Paolo 2022-08-30 17:31:04 +02:00
  • ed9f6e0c9b Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets Andreas Österreicher 2022-08-30 14:44:13 +02:00
  • a2bacae6d7 Merge branch 'feature-19001/VUE_ROUTER' into feature-19473/VUE_Filter_Navigation_Widgets Andreas Österreicher 2022-08-30 14:43:10 +02:00
  • 03535b7589 text aenderung und holen alle studienbeitraege ma0048 2022-08-30 14:08:00 +02:00
  • d1bb1b9666 Infocenter: Adaptierungen ZGV-Master und ZGVmasternation Dropdown ma0068 2022-08-30 13:10:47 +02:00
  • 67f1c9a707 Infocenter: Umbau von disabled auf Zusatz bei Dropdowns ZGV und ZGVNation ma0068 2022-08-30 11:28:16 +02:00
  • 8fd69ccd26 Infocenter: Anzeige gesperrte Nationen als disabled im Dropdown ZGVNation ma0068 2022-08-30 09:41:45 +02:00
  • 81a33654a4 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' Andreas Österreicher 2022-08-30 09:10:40 +02:00
  • 68d6e3c549 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze Andreas Österreicher 2022-08-29 16:23:20 +02:00
  • 54a1c486c5 Infocenter: Anzeige inaktive ZGVs als disabled im Dropdown ZGV ma0068 2022-08-29 15:12:06 +02:00
  • 49647c8ded Textänderungen "KVP" entfernen cgfhtw 2022-08-29 14:05:15 +02:00
  • 079137f497 renamed "dual" checkbox to "duales Studium" KarpAlex 2022-08-29 13:28:26 +02:00
  • ca9281dbf9 Textänderung KVP cgfhtw 2022-08-29 09:08:27 +02:00
  • 8dd7f72e37 added Studienkennung Uni to table in gsprogramm vilesci gui KarpAlex 2022-08-27 01:44:37 +02:00
  • 92762c5dc2 Projektarbeitsbeurteilung: - getZweitbegutachterWithToken: returns Zweitbegutachter (Senatspruefer) from Senatspruefungen as well - added phrase KarpAlex 2022-08-27 01:34:03 +02:00
  • da85c69f36 Problem behoben wodurch die Anrechnungen im FAS nicht angezeigt werden wenn diese ohne Anrechnungstool im FAS erfasst werden Andreas Österreicher 2022-08-25 14:34:40 +02:00
  • 962ec56b3f Merge branch 'feature-20665/kartenautomat_anpassungen' Andreas Österreicher 2022-08-25 12:48:47 +02:00
  • a13c010cd5 textaenderungen und getzutrittskarte by uid ma0048 2022-08-25 10:43:26 +02:00
  • 566f2f6399 prueft beim loeschen des dok noch auf person_id ma0048 2022-08-25 09:54:33 +02:00
  • 2ff067193d added Senatsvorsitz to betreuerart kurzbz in pdfExport KarpAlex 2022-08-24 19:39:59 +02:00
  • 1d408b9d65 added comment to getZweitbegutachterWithToken method in projektbetreuer class KarpAlex 2022-08-24 19:39:31 +02:00
  • 60d675f22b added parbeitDownload phrases for Projektarbeitsbeurteilung KarpAlex 2022-08-24 18:09:53 +02:00
  • 2125fdc219 sending of zweitbetreuer mail with token: correct subject depending on projekttyp KarpAlex 2022-08-24 18:09:30 +02:00
  • 1d5d5e4a84 added getEndabgabe method to Paabgabe model KarpAlex 2022-08-24 18:07:34 +02:00
  • a1622d8b74 made betreuert SenatsprueferIn gender neutral KarpAlex 2022-08-24 17:05:30 +02:00
  • df3f7565e7 Merge branch 'feature-20665/kartenautomat_anpassungen' Andreas Österreicher 2022-08-24 13:39:01 +02:00
  • 8292e00aaf neues Feld aktiv in den ZGV-Tabellen, Ansicht als durchgestrichen der inaktiven ZGV-Einträge in FAS ma0068 2022-08-24 12:52:49 +02:00
  • 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 KarpAlex 2022-08-23 17:45:12 +02:00
  • c234843bfd Satzungsteil Paragrahen korrigiert Andreas Österreicher 2022-08-23 16:20:19 +02:00
  • 282b46d54e Added betreuerart Senatsvorsitz and Senatsprüfer KarpAlex 2022-08-23 15:26:13 +02:00
  • f2fcdf2cbf app per dbupdate hinzufuegen ma0048 2022-08-22 14:40:39 +02:00
  • 06e62cac11 phrasen angepasst ma0048 2022-08-22 14:35:05 +02:00
  • 238810b5a8 workaround issue with resizable columns Harald Bamberger 2022-08-19 12:38:29 +02:00
  • b0ffbea9a5 Composer changes Paolo 2022-08-19 12:21:04 +02:00
  • 5af4f7a405 Merge remote-tracking branch 'origin/feature-19473/VUE_Filter_Navigation_Widgets' into feature-19001/VUE_ROUTER Werner Masik 2022-08-18 21:31:54 +02:00
  • 3138ac3e25 add columns Aktiv and StdKst to MA Uebersicht Filterx Harald Bamberger 2022-08-18 16:38:28 +02:00
  • 582cb20b72 rename Handler functions to do not have a data and methods property error Harald Bamberger 2022-08-18 15:27:02 +02:00
  • c9eb60aade Removed tabulator property from Filter component Paolo 2022-08-18 14:52:50 +02:00
  • a0e2d7e37d Filter component: changed columns handling for the tabulator Paolo 2022-08-18 11:53:54 +02:00
  • 075e8ede0a Job Reminder Reihungstest: sender_id statt organization unit abbilden ma0068 2022-08-18 10:55:49 +02:00
  • 7b95ca4b92 Merge remote-tracking branch 'origin/feature-19473/VUE_Filter_Navigation_Widgets' into feature-19001/VUE_ROUTER Werner Masik 2022-08-17 22:13:29 +02:00
  • a3c9d75617 added model for adressentyp Werner Masik 2022-08-16 13:10:20 +02:00
  • 7dd48b2350 Fixed meta includes Paolo 2022-08-16 10:57:32 +02:00
  • 492014db3a Changed variable names for includes Paolo 2022-08-16 10:28:13 +02:00
  • dd38765237 Merge branch 'feature-19538/Gruppenadministratoren' into feature-19473/VUE_Filter_Navigation_Widgets Harald Bamberger 2022-08-16 10:25:46 +02:00
  • dd6383c57b Merge branch 'master' into feature-19538/Gruppenadministratoren Harald Bamberger 2022-08-16 07:54:43 +02:00
  • 5ea46ece47 added VueRouter to composer; integrate router.php from extensions Werner Masik 2022-08-15 20:25:42 +02:00
  • 2e00f30e71 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets Harald Bamberger 2022-08-11 16:07:39 +02:00
  • dc3364204d Anzeige Casetimeblock nur im aktuellen Jahr, Adaptierung berechneter Urlaubssaldo ma0068 2022-08-11 16:06:11 +02:00
  • 083c360338 remove duplicate body tags Harald Bamberger 2022-08-11 16:05:15 +02:00
  • 73c516cbed Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets Cris 2022-08-11 14:59:39 +02:00
  • 08b1047b09 Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of https://github.com/FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets Cris 2022-08-11 14:59:06 +02:00
  • 1103bb7aa1 Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets Paolo 2022-08-11 14:47:31 +02:00
  • d95cbb39e3 Reverted bootstrap and jquery include order Paolo 2022-08-11 14:46:28 +02:00
  • d7fb91371e added missing includes for infocenter ma0048 2022-08-11 14:34:32 +02:00
  • 979f8d96bc ermoeglicht das sperren der zutrittskarten ma0048 2022-08-11 14:29:56 +02:00
  • f19e13ffd8 ermoeglicht das planen, akzeptieren und erstellen der massnahmen ma0048 2022-08-11 14:11:59 +02:00
  • 6f1ca8e374 Removed unnecessary HTML body tags and added FHC_Footer Cris 2022-08-11 14:00:20 +02:00
  • f85dd2fd2e Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets Cris 2022-08-10 18:21:01 +02:00
  • a5f6ffa237 Changed content in Student view as requested by QM Cris 2022-08-10 18:19:50 +02:00
  • c6aa3c7d9b Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets Cris 2022-08-10 16:28:08 +02:00
  • 4f435fbc20 Removed date limitation for testing Cris 2022-08-10 16:26:36 +02:00
  • fabdb70d72 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets Cris 2022-08-10 16:08:54 +02:00
  • bfa9c2c8a7 Merge remote-tracking branch 'origin/feature-18224/Anrechnungen_ECTS-Grenze' into feature-18224/Anrechnungen_ECTS-Grenze Cris 2022-08-10 16:01:42 +02:00
  • 1d728336a2 Hided colums 'ECTS Schule bisher'/'ECTS Beruf bisher' Cris 2022-08-10 15:59:11 +02:00
  • debfbf7827 Created AnrechnungJob sendMailRemindRecommendation Cris 2022-08-10 15:58:13 +02:00
  • e39bb1ea8a Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets Paolo 2022-08-09 18:43:06 +02:00
  • 7499a7f90a navigation component add option to pass css classes for left menu, verticalsplit add isCollapsed function, searchbar remove search button and prevent page reload on pressing enter Harald Bamberger 2022-08-09 17:12:47 +02:00
  • c0ce8997ba Optimized Usability: Column 'Details' now on very left side of table Cris 2022-08-09 16:52:23 +02:00
  • e56237038d Optimized 'Ablehnen'-/'Nicht empfehlen'-panels for better usability Cris 2022-08-09 16:40:43 +02:00
  • c561a75080 Neues Sancho Mail Stornierte Lehrauftraege ma0068 2022-08-09 15:07:16 +02:00
  • 844bfe9150 Fixed wrong 'Bisher angerechnete ECTS' calculation when approving and withdrawing in one go Cris 2022-08-09 11:10:16 +02:00
  • e63d34132c merged current master Harald Bamberger 2022-08-08 13:29:44 +02:00
  • 6d81e36e68 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets Paolo 2022-08-08 12:11:08 +02:00
  • b912ca9a06 Navigation and Filter components code improvements Paolo 2022-08-08 10:31:30 +02:00
  • 602bd375c4 BugFix PHP 7.4 Milak Manfred 2022-08-04 17:32:03 +02:00
  • 7b0de6b3e1 BugFix PHP 4 Milak Manfred 2022-08-04 14:41:34 +02:00
  • 6fd50d3c8d letzter bearbeiter online satt studentenname ma0048 2022-08-04 13:26:15 +02:00
  • fc94ea4b49 Fixed: Maximale Dokument Uploadgröße Cris 2022-08-03 16:43:34 +02:00
  • fac257a2b1 Corrected: Falsche ECTS Summenberechnung, wenn Genehmigung zurückgenommen wurde, korrigiert. Cris 2022-08-03 16:40:58 +02:00
  • bb8a2a97a5 Fixed: Unclickable URLs after approving Anrechnung are clickable now Cris 2022-08-02 15:25:06 +02:00
  • b27b445ecc Einbau Urlaubssaldo in mail Urlaubstool und Zeitsperre ma0068 2022-08-02 14:20:16 +02:00
  • 5ee7891a91 Anzeige Block zukünftige Urlaube, neue Funktion getUrlaubstage ma0068 2022-08-02 08:50:26 +02:00
  • e9c2bcd690 Merge remote-tracking branch 'origin/master' Manfred 2022-08-01 14:09:10 +02:00
  • 62700194dd Bugfix aktuelles Studiensemester Manfred 2022-08-01 14:09:00 +02:00
  • 1a6b645693 pausefehlt bei 6.5 stunden hinzugefuegt ma0048 2022-08-01 10:49:17 +02:00
  • 80e15b9448 studentenmeldung.php: added field "dualesstudium" KarpAlex 2022-07-27 18:51:59 +02:00
  • bf3ed6e48e Corrected ECTS Summen Display in Detail View when Withdrawing Cris 2022-07-27 16:04:53 +02:00
  • 952d5e51b2 Refactoring der Dynamischen Max-ECTS-Berechnungsspalte, Berechnungen stimmen nun auch nach einem Genehmigungs-Update Cris 2022-07-26 18:27:59 +02:00