439d2dd999
Merge branch 'feature-15910/BPK_soll_mit_Berechtigung_im_FAS_sichtbar_editierbar_sein'
2021-11-04 17:09:04 +01:00
6d69d572ee
Merge branch 'feature-15795/DVUH_Mehrsprachigkeit'
2021-11-04 15:56:26 +01:00
46e3f91a6e
Zeitaufzeichnungsspalten zu Gegencheck hinzugefügt
2021-11-04 14:42:20 +01:00
38aa578528
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-11-04 14:32:59 +01:00
fce92f78d4
Merge branch 'master' into feature-15795/DVUH_Mehrsprachigkeit
2021-11-04 12:05:32 +01:00
a02e470970
displaying and editing BPK field in FAS with permission student/bpk
2021-11-02 11:28:10 +01:00
a111503e04
Merge branch 'feature-15091/personen_zusammenlegen_fehlende_berechtigung'
2021-10-25 10:36:17 +02:00
2a8d91119a
Öhbeitrag Management GUI: using phrases
2021-10-21 05:48:18 +02:00
4c62b003df
Merge branch 'master' into FHBGLD-set_gemeinde_skript
2021-10-15 17:18:20 +02:00
4777c0414f
dbupdate_3.3.php: fixed line break
2021-10-13 09:15:58 +02:00
901f9ba7fa
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-10-13 09:05:05 +02:00
5954237851
update rechte tbl_person_lock fuer benutzer vilesci
2021-10-08 10:51:13 +02:00
cb25efceca
added NOT NULL constraint to fehlercode field of tbl_fehler_zustaendigkeiten
2021-09-29 21:11:52 +02:00
307ba9ce83
Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter
2021-09-27 08:12:00 +02:00
61044e9a3d
Merge branch 'master' into feature-12808/LVNeuesAttributLehrmodus
2021-09-21 07:39:08 +02:00
45e4d5576c
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-21 00:59:26 +02:00
4c21d5364c
- added issue management functionality - adding, and displaying issues with filter widget.
2021-09-21 00:58:29 +02:00
32dc9e1a2d
Index für AnrechnungID in tbl_anrechnung_anrechnungstatus hinzugefügt
2021-09-17 10:38:19 +02:00
30dc436442
Berechtigung für basis/gemeinde hinzugefügt
...
Pfade korrigiert
2021-09-15 13:49:20 +02:00
6927b668e3
Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter
2021-09-15 12:10:59 +02:00
e412125dd0
Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864'
2021-09-15 10:34:06 +02:00
493bf0edda
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-06 22:35:40 +02:00
40d686cb21
Merge branch 'feature-13092/Monitoring_Schnittstellen_Dashboard' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# system/dbupdate_3.3.php
2021-09-06 22:33:47 +02:00
30c2705b99
fix syntax error system/dbupdate_3.3.php
2021-09-02 11:43:43 +02:00
d3158b8ce0
merge dbupdate_3.3.php
2021-09-02 11:31:58 +02:00
25cc8c6d49
matr_aktiv field in dbupdate_3.3.php: only set to true if not NULL
2021-08-30 18:11:08 +02:00
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +02:00
b9ac73955a
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-08-24 01:19:26 +02:00
6960a958f7
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-08-22 20:58:38 +02:00
73ce635188
Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung
2021-08-20 10:34:55 +02:00
d091374622
create merged branch with all features on topic Wiederholer - feature 13864
2021-08-19 15:26:20 +02:00
1d9ba9c232
create merged branch with all features on topic Wiederholer - feature 12997
2021-08-19 14:58:00 +02:00
4d08dc58db
merge master into feature-12808
2021-08-18 15:38:17 +02:00
d8804730ba
Merge branch 'master' into feature-13218/BewerbungstoolMasterDokumente
2021-08-18 11:18:33 +02:00
6ff8df6ac3
merged master into anpassung_infocenter
2021-08-18 08:45:28 +02:00
9eae959b15
Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig
2021-07-28 12:10:28 +02:00
7bd68775e9
statusgrund_kurzbz in dbupdate ergänzt
2021-07-23 13:44:28 +02:00
e145a3854a
added system.tbl_issues for issue tracking
2021-07-15 16:13:43 +02:00
f60e923829
Merge branch 'master' into feature-12997/Neue_Noten
2021-07-12 10:38:07 +02:00
cee6156646
- added Bisioaufenthaltfoerderung_model.php
...
- dbupdate_3.3.php: added Buchungstyp "ZuschussIO"
2021-07-07 20:22:53 +02:00
635974fa22
Merge branch 'master' into feature/Anrechnungen_NEU
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-07-07 15:05:31 +02:00
1ce0045f86
- Prestudent_model.php: added getStandortCode and getFoerderrelevant methods
...
- indent formatting
2021-06-25 13:19:02 +02:00
f4ddbd3084
Added DB-Index for lehre.tbl_pruefung to speed up queries
2021-06-25 11:15:12 +02:00
9a24d2d7c7
dbupdate_3.3.php: removed inserts for bis.tbl_bisstandort, FHs should insert their data as needed
2021-06-23 17:57:31 +02:00
72b7e5b1fe
dbupdate_3.3.php: foerderrelevant field of tbl_prestudent: prefill with false where possible
2021-06-23 15:55:51 +02:00
264ba0e66f
dbupdate_3.3.php:
...
- added bis.tbl_bisstandort
- added LIMIT 1 to melderelevant SELECT
- added columns foerderrelevant and standort to public.tbl_studiengang and public.tbl_prestudent
2021-06-22 16:48:06 +02:00
948a26beac
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-06-17 09:12:02 +02:00
8fa40a843b
Merge branch 'feature-11001/zgv_ueberpruefung' into feature-13277/anpassung_infocenter
...
# Conflicts:
# application/controllers/system/infocenter/InfoCenter.php
# application/views/system/infocenter/dokpruefung.php
# application/views/system/infocenter/infocenterData.php
# application/views/system/infocenter/infocenterFreigegebenData.php
# application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
2021-06-16 09:26:03 +02:00
27b0679640
dbupdate_3.3.php: column melderelevant prefill with values, added comment
2021-06-15 19:03:41 +02:00
2682026fec
add column melderelevant to public.tbl_studiengang
2021-06-14 19:13:38 +02:00
Andreas Österreicher