1b9693e316
Bugfix: Infocenter write page person id and prestudent id are swapped
2020-02-11 16:10:39 +01:00
c7b33fe160
Bugfix: FAS write page person id and prestudent id are swapped
2020-02-11 16:04:08 +01:00
15b3532359
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-02-04 17:16:17 +01:00
749e9be64d
Messaging system: student writes new message: separate logic for master and bachelor
2020-02-04 17:02:25 +01:00
a66d319581
Fixed some XSS Bugs
2020-02-04 14:58:33 +01:00
53ac4d11ba
Do not retrieve the degree program name from studiengang table but directly from the organization unit table
...
in student sent messages page and student write to organisation unit page
2020-02-04 14:42:53 +01:00
e19533c0ba
Removed legacy Link from Vilesci Menu
2020-02-04 14:30:12 +01:00
d496bf5993
When the recipient is infocenter then place a * close to the drop down description and a note under the tinymce box.
2020-02-03 16:44:29 +01:00
16f6bdbf70
Merge branch 'feature-5128/FHC-IDAM_account_activation'
2020-02-03 14:53:24 +01:00
7c087011d7
Merge branch 'feature-5156/Lehrauftragslisten_Stundensatz'
2020-02-03 13:05:43 +01:00
40771ba669
Removed Deprecated Kreuzerltool
2020-01-30 16:19:14 +01:00
9a9d08da39
Merge branch 'bugfix-5822/Digitaler_Lehrauftrag_Sonstiges'
2020-01-30 14:16:25 +01:00
3f0336ffc6
Removed deprecated File
2020-01-30 14:05:29 +01:00
bb6ebc1521
Fixed possible XSS Attack when passing "javascript:" or different protocol handler als parameter
2020-01-30 09:27:16 +01:00
98bb9987da
Now inkludierte Lehre also checking former (past) BIS Verwendungen
...
This allows display of column 'Betrag' in Lehraufträge annehmen.
(Important for external lectors, who want to see Betrag of their new
Lehrauftraege. They usually don't have active BIS Verwendung at the
beginning of each term, therefor last (past) BIS Verwendung needs to be
checked)
2020-01-29 09:55:59 +01:00
9bdee6d0f8
Corrected SQL query: now retrieving employees UID via tbl_mitarbeiter
...
Some Lectors, who were assigned as Projektbetreuer, received an email on
their (past) student-email-account. Now this is corrected.
2020-01-28 17:33:04 +01:00
0df02e8df2
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-01-28 14:36:41 +01:00
8f908887be
- Method parseMessageText of controller system/messages/Messages could accept also the prestudent_id parameter
...
- If prestudent_id parameter then CLMessagesModel->parseMessageTextPrestudent is called
- Fixed show_error(getData error in model CLMessagesModel
- Added new method parseMessageTextPrestudent to model CLMessagesModel
- Method _prepareHtmlWriteTemplate of model CLMessagesModel now checks if data are from a prestudent and then uses MessageLib->getMessageVarsPrestudent
- Added new method getMessageVarsPrestudent to MessageLib
- Function parseMessageText in js/messaging/messageWrite.js could call system/messages/Messages/parseMessageText with prestudent_id parameter
2020-01-24 18:13:03 +01:00
3bee0210a8
Fixed XSS Vulnerability in CIS Schedule
2020-01-24 11:30:24 +01:00
350f252ba7
Semester für Lehreinheitenvorrückung auf 10 erhöht
2020-01-24 08:59:43 +01:00
3875f404d6
Merge branch 'bug-6052/Kollisionscheck_fehlerhaft'
2020-01-23 14:41:42 +01:00
15fa4a6c90
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-23 09:55:00 +01:00
a396f4a4ba
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-23 09:41:57 +01:00
09323d167b
controllers/system/infocenter/InfoCenter.php: bugfix - links are not built incorrectly anymore when switch from freigegeben to uebersicht with filter_id
2020-01-23 09:39:00 +01:00
8a809fd1f3
Fehler behoben im Kollisionscheck beim Setzen von neuen Stunden mit direkten Gruppen.
...
Hier wurde fälschlicherweise eine Kollisionsmeldung angezeigt obwohl laut Raumvorschlag eine Zuordnung möglich ist
2020-01-23 08:30:51 +01:00
3e72f399be
Infocenter is now hardcoded in recipient messages to avoid to display an empty "message to"
2020-01-22 15:04:07 +01:00
b5772feeb2
Merge branch 'bug-5936/Fix_composer_packages'
2020-01-22 09:10:13 +01:00
13e24230bc
Fixed font awesome in composer and gitignore
2020-01-21 12:18:08 +01:00
d29e4ebf22
Merge branch 'feature-5665/Incoming_Zeugnisse'
2020-01-21 11:38:01 +01:00
1dee4a3649
rdf/zeugnis.rdf.php: for Incomings, all grades are printed on zeugnis (even if flag zeugnis = false)
2020-01-20 11:36:29 +01:00
0244caaa70
- Moved core from Redirect controller to ViewMessage controller
...
- Dropped Redirect controller
- Adapted configs and paths because of these changes
2020-01-17 15:39:34 +01:00
50f633ce3e
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-17 15:04:47 +01:00
63f475cd27
- Moved controllers Redirect and ViewMessage to system/messages/
...
- Changed config entries in message.php
- Changed Redirect controller to improve code and logic
2020-01-17 15:02:42 +01:00
d753c7e517
Merge branch 'feature-4262/Bewerberstatistik_Korrektur'
2020-01-17 11:32:29 +01:00
00dbce34c6
Merge branch 'master' into feature-4262/Bewerberstatistik_Korrektur
2020-01-17 11:32:10 +01:00
e60a5d9d72
Merge remote-tracking branch 'origin/master'
2020-01-17 11:31:42 +01:00
e7f2c4597e
Testtool Admin GUI optimiert
...
Anzeige von Leveln in Übersicht
"Round" in check_gebiet bei Zufallsfrage
2020-01-17 11:31:36 +01:00
47682f37df
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-16 16:36:57 +01:00
6eeb6abde0
Problem behoben wodurch der Excel Studierendenexport im FAS nicht funktioniert wenn ein leeres UserDefinedField Objekt vorhanden ist
2020-01-16 15:07:48 +01:00
4e43d37780
- Droped not used packages from composer.json
...
- Fixed packages version in composer.json
- Renewed file composer.lock
- Checked & Fixed imports paths
- Moved /vendor/FHC-Vendor to /FHC-Vendor
2020-01-15 18:08:29 +01:00
908d63f07e
Merge branch 'feature-5698/Clean_ViewMessage_MessageToken_model'
2020-01-15 13:17:41 +01:00
b29871be59
Merge branch 'hotfix-5697/DigitalerLehrauftrag_ErrorMessages'
2020-01-15 10:04:17 +01:00
886cc24aae
Merge branch 'feature-5364/EBCL_Zertifikat'
2020-01-15 09:52:33 +01:00
3600f18cd0
Merge branch 'feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default'
2020-01-15 08:05:54 +01:00
e537c0e00a
Fixed Errorhandling for Phrases
2020-01-15 08:04:18 +01:00
7c2df5eefb
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-01-13 14:21:25 +01:00
2859dfb17d
Dropdown für Studiensemester enthält nur mehr die vergangenen 4 Semester
2020-01-13 14:15:57 +01:00
7ba864bb5b
bei Anlage von Prüfungsterminen werden nur die letzten 4 Semester als Option angezeigt
2020-01-13 08:59:03 +01:00
f589a3dd15
Merge remote-tracking branch 'origin/master'
2020-01-09 14:53:26 +01:00
cb47937e54
Bugfix Komma bei Punkten
2020-01-09 14:53:18 +01:00
Paolo