 ma0068
|
62cfa27473
|
14774 Zeiterfassung: Homeoffice im CSV Import
|
2021-09-02 09:55:14 +02:00 |
|
|
cris-technikum
|
58ce5a9132
|
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
|
2021-09-01 13:58:48 +02:00 |
|
|
Andreas Österreicher
|
6034da43d8
|
Fixed loading of current Geschaeftsjahr if it is the last day of the
year
|
2021-08-31 07:56:59 +02:00 |
|
|
Andreas Österreicher
|
6008d97f36
|
Merge branch 'master' of github.com:FH-Complete/FHC-Core
|
2021-08-30 20:35:31 +02:00 |
|
|
Andreas Österreicher
|
64555c0ca1
|
Mahnspanne kann auch leer sein
|
2021-08-30 20:35:15 +02:00 |
|
|
KarpAlex
|
25cc8c6d49
|
matr_aktiv field in dbupdate_3.3.php: only set to true if not NULL
|
2021-08-30 18:11:08 +02:00 |
|
|
cris-technikum
|
64eb9eacf4
|
Added: Automatic Scrolling when Approving/Rejecting multiple Anrechnungen
Also added Scrolling for Recommending/Not Recommending multiple Anrechnungen
Signed-off-by: cris-technikum <[email protected]>
|
2021-08-30 15:36:50 +02:00 |
|
|
ma0068
|
a36909763f
|
Delete comments
|
2021-08-30 14:28:30 +02:00 |
|
|
Andreas Österreicher
|
b05fbe5978
|
Fixed PHP Version incompatibility issue
|
2021-08-27 19:05:00 +02:00 |
|
|
Andreas Österreicher
|
0a97a028ee
|
Reihungstestübersicht zeigt nun die Reihungstests der letzten 12 Monate
an statt der letzten 5
|
2021-08-26 20:22:13 +02:00 |
|
|
Andreas Österreicher
|
484151bab2
|
Merge branch 'master' into feature/Anrechnungen_NEU
|
2021-08-26 11:32:47 +02:00 |
|
|
ma0068
|
437feb2fdd
|
dynamische Anzeige checkbox homeoffice auch bei Ändern
|
2021-08-24 18:01:15 +02:00 |
|
|
ma0068
|
00d7d5c834
|
neues Ajaxfile zeitaufzeichnung_bisverwendung.php
|
2021-08-24 11:22:02 +02:00 |
|
|
KarpAlex
|
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 |
|
|
Andreas Österreicher
|
98d485b2ba
|
Merge branch 'feature-13943/SAPByD_purchase_orders_job_queue_worker'
|
2021-08-23 17:04:09 +02:00 |
|
|
Andreas Österreicher
|
a6b37c452f
|
Merge branch 'feature-6189/SAP_basic_structure_for_data_synchronization'
|
2021-08-23 16:43:20 +02:00 |
|
|
Andreas Österreicher
|
a22227bc26
|
Merge branch 'feature-13090/Bis_Bewerbermeldung_einzeln_erstellen'
|
2021-08-23 16:26:37 +02:00 |
|
|
Andreas Österreicher
|
ccff26d834
|
Merge branch 'feature-12333/Change_legacy_jobs_database_log'
|
2021-08-23 16:19:49 +02:00 |
|
|
Andreas Österreicher
|
f552c6a702
|
Merge branch 'feature-12894/LDAP_changes_on_CI'
|
2021-08-23 15:43:55 +02:00 |
|
|
Paolo
|
68b5e49f91
|
Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization
|
2021-08-22 21:04:53 +02:00 |
|
|
Paolo
|
ff715a72c8
|
Merge branch 'master' into feature-13943/SAPByD_purchase_orders_job_queue_worker
|
2021-08-22 21:04:32 +02:00 |
|
|
Paolo
|
a2fc3fe09b
|
Merge branch 'master' into feature-12894/LDAP_changes_on_CI
|
2021-08-22 20:59:01 +02:00 |
|
|
Paolo
|
fb00baae00
|
Merge branch 'master' into feature-12333/Change_legacy_jobs_database_log
|
2021-08-22 20:58:09 +02:00 |
|
|
Andreas Österreicher
|
b00337973a
|
Merge branch 'feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung'
|
2021-08-20 10:35:32 +02:00 |
|
|
Andreas Österreicher
|
73ce635188
|
Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung
|
2021-08-20 10:34:55 +02:00 |
|
|
Harald Bamberger
|
d091374622
|
create merged branch with all features on topic Wiederholer - feature 13864
|
2021-08-19 15:26:20 +02:00 |
|
|
Harald Bamberger
|
a28f187473
|
create merged branch with all features on topic Wiederholer - feature 12998
|
2021-08-19 14:58:21 +02:00 |
|
|
Harald Bamberger
|
1d9ba9c232
|
create merged branch with all features on topic Wiederholer - feature 12997
|
2021-08-19 14:58:00 +02:00 |
|
|
Harald Bamberger
|
99c8423bf6
|
create merged branch with all features on topic Wiederholer - feature 12995
|
2021-08-19 14:57:10 +02:00 |
|
|
KarpAlex
|
24a979f9f1
|
Zeugnisnote_model.php, method getByPerson: note and note bezeichnung are also selected
|
2021-08-18 22:16:15 +02:00 |
|
|
manu
|
4d08dc58db
|
merge master into feature-12808
|
2021-08-18 15:38:17 +02:00 |
|
|
manu
|
97590dbb91
|
Merge branch 'feature-12646/LVVerwaltungOEundFilterAnpassen' into feature-12808/LVNeuesAttributLehrmodus
|
2021-08-18 14:45:28 +02:00 |
|
|
manu
|
9cb9e414fb
|
Änderungen Übersichtsliste entfernt
|
2021-08-18 14:44:56 +02:00 |
|
|
manu
|
ef23c4a89d
|
Anzeige homeoffice nur wenn in Bisverwendung eingetragen
|
2021-08-18 14:06:57 +02:00 |
|
|
Andreas Oesterreicher
|
0ba11652e1
|
Merge branch 'feature-13218/BewerbungstoolMasterDokumente'
|
2021-08-18 11:42:08 +02:00 |
|
|
Andreas Oesterreicher
|
d8804730ba
|
Merge branch 'master' into feature-13218/BewerbungstoolMasterDokumente
|
2021-08-18 11:18:33 +02:00 |
|
|
Andreas Oesterreicher
|
e9b4116bee
|
Merge branch 'feature-13277/anpassung_infocenter'
|
2021-08-18 10:45:40 +02:00 |
|
|
ma0048
|
6ff8df6ac3
|
merged master into anpassung_infocenter
|
2021-08-18 08:45:28 +02:00 |
|
|
cris-technikum
|
c38683edf5
|
Added "homeoffice" to FAS > BIS-Daten
Signed-off-by: cris-technikum <[email protected]>
|
2021-08-10 12:31:39 +02:00 |
|
|
cris-technikum
|
25ee1032e5
|
Added "homeoffice" to DB and bisverwendung Class
Signed-off-by: cris-technikum <[email protected]>
|
2021-08-10 12:30:10 +02:00 |
|
|
KarpAlex
|
367c266e2e
|
Zeugnisnote_model.php: added method getEctsSumsByPerson
|
2021-07-29 13:02:24 +02:00 |
|
|
Harald Bamberger
|
de1c532ca9
|
dead code and console.logs removed
|
2021-07-29 09:11:31 +02:00 |
|
|
Harald Bamberger
|
9180930e64
|
functions for student.rdf urls to add orgform parameter if needed
|
2021-07-29 09:09:29 +02:00 |
|
|
Andreas Österreicher
|
b6a373b9d4
|
Merge branch 'feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig'
|
2021-07-29 07:59:57 +02:00 |
|
|
Andreas Österreicher
|
cb855e7864
|
Zeitaufzeichnungspflichtig Prüfung auf Zeitraum erweitert
|
2021-07-28 19:05:48 +02:00 |
|
|
Andreas Österreicher
|
9eae959b15
|
Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig
|
2021-07-28 12:10:28 +02:00 |
|
|
cris-technikum
|
cfa7ce2c08
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2021-07-27 10:55:11 +02:00 |
|
|
Andreas Österreicher
|
f918d0e188
|
Merge branch 'feature-12317/UsabilityAnpassungenBenotungstool2'
|
2021-07-23 15:19:54 +02:00 |
|
|
Andreas Österreicher
|
c8919f2878
|
Benotungstool zeigt den Namen statt der UID bei der Anlage von Nachprüfungsterminen
|
2021-07-23 15:17:43 +02:00 |
|
|
Andreas Österreicher
|
524b954abc
|
Merge branch 'feature-12075/zeitwuensche_lesezugriff'
|
2021-07-23 14:35:28 +02:00 |
|