 Harald Bamberger
|
f265e20dce
|
Merge branch 'feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp' into feature-25999/C4_cleanup
|
2024-11-12 11:21:16 +01:00 |
|
|
SimonGschnell
|
37dffbba19
|
fix(Dashboard widget Url): adds validation method for both input fields and fixes confirm delete dialog
|
2024-11-05 11:32:02 +01:00 |
|
|
Harald Bamberger
|
20e0e2e910
|
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_cleanup_merge_anrechnungen_bs5
|
2024-11-04 15:59:14 +01:00 |
|
|
Harald Bamberger
|
20715d6ef5
|
add permission basis/cis
|
2024-11-04 15:36:46 +01:00 |
|
|
SimonGschnell
|
86ee48888a
|
fix(Cis Menu): adds Zahlungen to Mein Studium
|
2024-11-04 12:09:26 +01:00 |
|
|
Harald Bamberger
|
e78c2e1bf7
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-10-30 17:19:01 +01:00 |
|
|
SimonGschnell
|
837cc191bf
|
adds another link regex for the link string '../cms/content?content_id=...' and adds the library content to the CIS4 Menu content
|
2024-10-30 10:49:27 +01:00 |
|
|
Harald Bamberger
|
4789bfab42
|
add columns gehaltsbestandteil_von and gehaltsbestandteil_bis to hr.tbl_gehaltshistorie
|
2024-10-24 07:57:54 +02:00 |
|
|
Harald Bamberger
|
8ba2a6852b
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
|
2024-10-22 11:04:07 +02:00 |
|
|
Johann Hoffmann
|
d8c4c6506a
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
|
2024-10-21 10:21:42 +02:00 |
|
|
Harald Bamberger
|
44b81d9dff
|
Merge branch 'feature-25999/C4' into feature-25999/C4_cleanup
|
2024-10-18 15:44:39 +02:00 |
|
|
SimonGschnell
|
59df85b05e
|
adds Zeugnisse und Documents unter dem Mein Studium Menu Punkt
|
2024-10-18 11:55:20 +02:00 |
|
|
Harald Bamberger
|
d4494836b1
|
fix file permissions erroneously commited as a21a292da6
|
2024-10-17 15:34:00 +02:00 |
|
|
SimonGschnell
|
e475fe568e
|
adds the dashboard menu punkt and adds greeting to the dashboard view
|
2024-10-17 09:58:28 +02:00 |
|
|
Harald Bamberger
|
e2cee7ffa3
|
Merge branch 'master' into feature-25999/C4
|
2024-10-15 10:44:56 +02:00 |
|
|
SimonGschnell
|
ed1d4b1a50
|
regex replaces old content links with new CIS4 controller links and adopts the Menu Entry links to not refresh the page when closing the Menu point
|
2024-10-14 10:17:20 +02:00 |
|
|
Harald Bamberger
|
b3258e017c
|
add column path_kurzbz to view vw_oe_path
|
2024-10-09 13:14:54 +02:00 |
|
|
SimonGschnell
|
25a64cbcae
|
fixes cis4 Menu for longest matching urls
|
2024-10-04 12:04:54 +02:00 |
|
|
SimonGschnell
|
567dd816be
|
better descriptions for the cis4_root_menu sql queries
|
2024-10-01 13:54:53 +02:00 |
|
|
SimonGschnell
|
23b7d18906
|
gives the content_childs of the CIS4_ROOT the correct ordering
|
2024-09-30 14:24:48 +02:00 |
|
|
SimonGschnell
|
fa8aec2c2e
|
adds the MyLv and the Stundenplan Menupunkt to the sql inserts and changes the content for the Dokumente redirect
|
2024-09-30 14:13:00 +02:00 |
|
|
SimonGschnell
|
d1070656ac
|
CIS4 MENU sql update COMPLETE
|
2024-09-27 13:38:29 +02:00 |
|
|
SimonGschnell
|
23badc3404
|
CIS4 MENU sql update WIP
|
2024-09-27 12:20:37 +02:00 |
|
|
Johann Hoffmann
|
79d23a4557
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
# Conflicts:
# public/js/components/Form/Upload/Dms.js
|
2024-09-10 11:25:19 +02:00 |
|
|
Johann Hoffmann
|
d9f5646ad1
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
# Conflicts:
# application/models/crm/Prestudentstatus_model.php
# public/js/api/fhcapifactory.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-09-10 10:17:55 +02:00 |
|
|
Harald Bamberger
|
1f4628720a
|
Merge branch 'feature-39911/Suche_um_raeume_erweitern' into feature-25999/C4
|
2024-09-09 11:50:27 +02:00 |
|
|
Harald Bamberger
|
a8141e5dac
|
Merge branch 'master' into feature-25999/C4
|
2024-09-09 11:45:10 +02:00 |
|
|
cgfhtw
|
d33163aae8
|
Add stv_favorites to variablenames
|
2024-08-14 09:09:13 +02:00 |
|
|
SimonGschnell
|
f0db878623
|
changes the headers from the news template from h5 to h2 but adds the bootstrap h5 class
|
2024-08-05 11:48:57 +02:00 |
|
|
SimonGschnell
|
6fcc8cf7e8
|
code review changes
|
2024-08-01 11:49:14 +02:00 |
|
|
Johann Hoffmann
|
c9471c344d
|
added unruly person boolean column to tbl_person; studStatus/leitung added a checkbox to mark persons as unruly unrelated to studstatus datastate;
|
2024-07-31 14:37:26 +02:00 |
|
|
SimonGschnell
|
c2be0a4790
|
adds content to Url.js
|
2024-07-31 12:41:03 +02:00 |
|
|
SimonGschnell
|
284cf711fd
|
adds the sql scripts to create dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence
|
2024-07-30 11:26:22 +02:00 |
|
|
Harald Bamberger
|
d0f3cee7de
|
add permissions for vw_oe_path
|
2024-07-29 18:11:13 +02:00 |
|
|
Harald Bamberger
|
e6684a0116
|
add db view that contains oe path
|
2024-07-29 17:41:24 +02:00 |
|
|
SimonGschnell
|
4b0878b248
|
Merge branch 'master' into feature-39911/Suche_um_raeume_erweitern
|
2024-07-24 13:00:52 +02:00 |
|
|
Johann Hoffmann
|
66b151dce0
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-07-08 14:42:01 +02:00 |
|
|
Harald Bamberger
|
ea9c35a64b
|
Merge branch 'feature-37107/Fristenmanagement' into merge_37107_37133_39212
|
2024-06-19 10:28:39 +02:00 |
|
|
Harald Bamberger
|
04c006a733
|
do not create dummy manual events
|
2024-06-19 10:28:03 +02:00 |
|
|
Harald Bamberger
|
e05fa0f4d8
|
Merge branch 'master' into merge_37107_37133_39212
|
2024-06-14 11:50:32 +02:00 |
|
|
Harald Bamberger
|
c3278ad30f
|
add app softwarebereitstellung to prevent checksystem errors when adding phrases for softwarebereitstellung while not having installed the extension
|
2024-06-14 11:49:43 +02:00 |
|
|
Harald Bamberger
|
e4326e00e4
|
Merge branch 'feature-39212/PV21-Grund_beim_Beenden_eines_DV' into merge_37107_37133_39212
|
2024-06-14 11:02:25 +02:00 |
|
|
Harald Bamberger
|
4e233f760d
|
Merge branch 'master' into feature-37107/Fristenmanagement
|
2024-06-13 13:26:02 +02:00 |
|
|
Johann Hoffmann
|
068aa03b4f
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
|
2024-06-06 11:02:56 +02:00 |
|
|
Harald Bamberger
|
7b148b1a39
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-06-03 17:21:50 +02:00 |
|
|
Johann Hoffmann
|
59a1e84fb2
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
# Conflicts:
# public/js/components/filter/Filter.js
# public/js/plugin/FhcApi.js
# system/dbupdate_3.4.php
|
2024-05-22 15:42:19 +02:00 |
|
|
Harald Bamberger
|
8cba0aec5a
|
vertragsarten dvbund, dvanderegk und dvanderebet hinzugefuegt, MigrateContract default oe und ba1code mapping in config verschoben und config check implementiert
|
2024-05-22 15:32:28 +02:00 |
|
|
SimonGschnell
|
c566d07847
|
fixes little xml layout issue
|
2024-05-21 13:34:58 +02:00 |
|
|
SimonGschnell
|
48bb2ef7e1
|
adds the insert query for the new raum template and the update statement to update the template for every room content
|
2024-05-21 11:05:22 +02:00 |
|
|
SimonGschnell
|
d07c568d5e
|
adds dbupdate queryies for the new raum template
|
2024-05-21 10:37:53 +02:00 |
|