Commit Graph

2812 Commits

Author SHA1 Message Date
Cris d34f5b92f4 Added new phrases for softwarebereitstellung- and for core app 2024-03-28 13:14:34 +01:00
Andreas Österreicher 4ccf2aebcc Prüfungstyp Termin3 wird nicht automatisch angelegt 2024-03-27 12:57:17 +01:00
ma0068 3023cd2e94 Refactor status for api-controller, add phrases for alerts 2024-03-27 11:23:38 +01:00
Andreas Österreicher 1e9a681c9a Gegencheck für tbl_tmp_store und tbl_audit_log entfernt da dies Tabellen
aus der Personalveraltung Extension sind
Gegencheck für Habiliation hinzugefügt
2024-03-26 09:19:36 +01:00
Harald Bamberger 5413292529 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-03-25 14:55:46 +01:00
Harald Bamberger 8a86bce567 Merge branch 'feature-33003/BIS_Meldung_Personal' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-03-25 14:55:11 +01:00
ma0068 65c7db7ae4 bugfix phrases tabulator, refactor Prestudent.js using FHCAPI_CONTROLLER 2024-03-25 13:28:28 +01:00
Andreas Österreicher 5fd4ded184 Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung 2024-03-25 13:12:35 +01:00
Harald Bamberger 9f2dd82009 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2024-03-25 13:08:10 +01:00
ma0068 b907f01ebb Phrases History and Status, Formvalidation Prestudent 2024-03-25 09:09:40 +01:00
ma0068 9038910303 phrases 2024-03-22 10:36:57 +01:00
Werner Masik 426a439552 added sort column to frist 2024-03-20 00:13:55 +01:00
Werner Masik e28627a676 removed verantwortlich column from tbl_frist 2024-03-12 17:34:13 +01:00
cgfhtw 874f08f6dd Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-03-12 15:16:54 +01:00
cgfhtw 77ebf1d857 Apply to changes from master 2024-03-12 15:08:33 +01:00
Harald Bamberger 7bdf5b832b Merge branch 'master' into feature-36016/Studstatus_QMB 2024-03-12 11:32:25 +01:00
cgfhtw 1a39abf7c7 Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-03-12 11:31:49 +01:00
Harald Bamberger 9504b713fc add missing insertvon to phrases definition 2024-03-12 11:31:12 +01:00
Harald Bamberger d9e44c8c23 Merge branch 'master' into feature-33003/BIS_Meldung_Personal 2024-03-08 11:08:40 +01:00
Cris 03e166dc89 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
#	system/filtersupdate.php
2024-03-06 14:07:19 +01:00
Werner Masik 77666e5210 added column verantwortlich_uid 2024-03-06 08:27:39 +01:00
KarpAlex 1085b9243d Merge branch 'master' into feature-33003/BIS_Meldung_Personal 2024-03-05 17:07:17 +01:00
Harald Bamberger 3d6b2eb202 add app fhctemplate if it does not exist 2024-03-05 17:04:43 +01:00
Harald Bamberger d5d190777a Merge branch 'feature-34543/UX_Template' 2024-03-05 16:46:48 +01:00
ma0068 fdbbba5038 add phrase location 2024-03-05 16:42:06 +01:00
ma0068 5b795c2ccf phrases update merge conflict 2024-03-05 16:36:43 +01:00
ma0068 7bec7016c3 merge master into branch FHC4 2024-03-05 16:31:41 +01:00
Andreas Österreicher 7524d054db Merge branch 'feature-36530/bis_internationalisierung_codextabelle_neuerungen' 2024-03-05 13:04:25 +01:00
SimonGschnell dd309e972b js alert messages update, need to update the phrasesupdate.php 2024-03-04 15:03:49 +01:00
Werner Masik c60f7ed8b0 dbUpdate for fristenmanagement completed 2024-03-01 15:43:15 +01:00
Werner Masik 7a6d095b78 create db tables for fristenmanagement 2024-02-29 17:09:59 +01:00
cgfhtw 6500708f90 Code Quality 2024-02-29 09:02:20 +01:00
cgfhtw 2d2098984a Pause feature 2024-02-29 08:34:58 +01:00
Andreas Österreicher 23b1a76190 Merge branch 'feature-36148/tdb_uebersicht_erweitert_und_job_bug' 2024-02-28 13:43:19 +01:00
Cris f94b1700e7 Renamed filter- and phrases app for Fhc-Core-Extension
Renamed from extension to fhctemplate
2024-02-28 13:38:59 +01:00
Andreas Österreicher e243980ae6 Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung 2024-02-26 15:58:49 +01:00
Alexei Karpenko d9ec506c86 Codextabelle Mobilitaetsprogramm Neuerungen: changed name of some programs, set correct sichtbar and sichtbar_outgoing booleans 2024-02-23 16:54:51 +01:00
SimonGschnell ee7a819094 Merge branch 'master' into feature-25999/C4_ma0594dev 2024-02-22 12:06:16 +01:00
Cris c232eddf89 Added filter and phrases for Fhc-Core-Extension 2024-02-22 11:17:27 +01:00
ma0048 6f92698631 - bewerbungstool payments uebersetzungen anpassungen 2024-02-20 17:01:49 +01:00
Werner Masik cd64df28bb added phrase for habilitation 2024-02-20 15:02:14 +01:00
KarpAlex dfe0434cce added new mobilitaetsprogramm codes 2024-02-19 17:59:20 +01:00
Andreas Österreicher e433ca3d9b Fehlende Gegenpruefungen im DB Check hinzugefuegt 2024-02-19 09:22:54 +01:00
Andreas Österreicher 126defadb7 Link hinzugefügt beim Zusammenlegen von Personen wenn beide Personen
UHSTAT ausgefüllt haben damit diese direkt verglichen und gelöscht
werden können.
Fehlende DB checks hinzugefügt
2024-02-16 14:59:53 +01:00
SimonGschnell 501224b9b7 sends emails on insertion of an profil update to the studiengänge in case of students and to hr in case of a mitarbeiter 2024-02-16 14:33:49 +01:00
Andreas Österreicher 01c3a67762 Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI 2024-02-16 14:11:02 +01:00
cgfhtw ab2fc11797 PDF Download Wiederholung Deadline 2024-02-16 11:44:27 +01:00
SimonGschnell 34b995ed6d adds dms_kategorie for profil updates as an insert into statement in the dbupdate file 2024-02-15 16:20:54 +01:00
SimonGschnell 04f6ee6156 Merge branch 'master' into feature-25999/C4_ma0594dev 2024-02-15 15:16:07 +01:00
Cris acb29c5c69 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	application/views/templates/FHC-Footer.php
#	composer.json
#	public/js/components/Bootstrap/Modal.js
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
2024-02-13 11:54:55 +01:00