blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-04 21:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,369 Commits 225 Branches 6 Tags
89744f36f5fdfeffce746ca82586c086a4e523ea
Commit Graph

2172 Commits

Author SHA1 Message Date
Paolo 40a2b53858 Merge master into HEAD 
Conflicts:
	include/dokument_export.class.php
	include/studiengang.class.php
	vilesci/stammdaten/reihungstestverwaltung.php
 2016-08-18 16:23:11 +02:00
bison cf999b6d82 - Added constant DOC_ROOT in system.config-default.inc.php 
- Using DOC_ROOT in dbupdate_3.2.php to be compatible with checksystem.php and DBTools.php
- Rolled back all classes in the include directory from CI to basis_db
 2016-08-17 11:14:52 +02:00
Andreas Moik 2188a120c2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-11 14:10:15 +02:00
Andreas Moik 70bd1b795d ignore empty documentlists 2016-08-11 14:09:48 +02:00
kindlm 35f8bab8b2 Aufnahmeverfahren fhstp 
- Funktion loadReihungstestPerson
- Anpassungen Excel-Export
 2016-08-11 09:56:23 +02:00
kindlm 66226f7e8d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-09 14:01:44 +02:00
kindlm 89d920427a Changes in studienplan.class 
- New function searchStudienplaene
- Changes in function getStudienplaeneFromSem
 2016-08-09 14:01:36 +02:00
kindlm c7f5e038f2 New functions in reihungstest.class 
- saveStudienplanReihungstest
- getStudienplaeneReihungstest
- deleteStudienplanReihungstest
- Added new attribute studienplan_id to all classes
 2016-08-09 14:00:34 +02:00
Stefan Puraner 6bee671674 fixed bug in mehtod to check rules 2016-08-09 11:45:04 +02:00
Andreas Moik 4916ba09d6 removed echo 2016-08-09 11:13:14 +02:00
Andreas Moik 7f6d632935 new features for dokumentenakt 
-now uses versions of templates
	-only takes active templates
	-covering page now uses the oe_kurzbz
 2016-08-09 11:10:01 +02:00
Andreas Moik 22118abc5a template resolution is now handeled recursively 2016-08-09 10:42:47 +02:00
Stefan Puraner b75a82a4fa fixed bug when saving anrechnung in FAS 2016-08-09 10:04:24 +02:00
Stefan Puraner 4a5f0554c7 fixed bug when saving a comment 2016-08-09 09:44:03 +02:00
Andreas Moik 4ad5de915a added page to link documents with templates 2016-08-08 11:14:22 +02:00
kindlm 98555f3dca Studiensemester GUI 2016-08-02 11:36:37 +02:00
Andreas Moik 85d397b451 added support for documents 
if pdf creation failed, show the failed documents and added a button to force creation of the pdf and skip broken files
 2016-08-01 16:31:00 +02:00
oesi 7b89d4dbbe Bugfix für das Löschen von Kursen mit Moodle 3.1 2016-08-01 14:25:06 +02:00
Andreas Moik b820f409aa bugfix 2016-07-28 16:55:09 +02:00
Andreas Moik bf70eedc27 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-28 13:30:24 +02:00
Andreas Moik 5743d05478 bugfixes 2016-07-28 13:30:09 +02:00
Werner Masik 2167b7a475 Lieferbedingungen zu Firma hinzugefügt 2016-07-28 12:10:34 +02:00
kindlm 98b8cd450d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-28 11:12:37 +02:00
kindlm b998a42b87 Reihungstestverwaltung 
- Studiensemester
- Stufen
- Aufteilung der BewerberInnen
- Raumzuordnung
- Aufsichtspersonen
 2016-07-28 11:12:32 +02:00
Werner Masik caae236c3b Lieferbedingungen hinzugefügt 2016-07-28 11:06:44 +02:00
oesi f4d1edf808 Bugfixes für Dokumentenakt 2016-07-27 17:28:19 +02:00
Andreas Moik 6d0f5d2bec Dokumentenakt 2016-07-27 17:18:38 +02:00
oesi fe643a0f68 Anpassungen für User Syncro mit Moodle 3.1 2016-07-27 10:30:54 +02:00
kindlm 1a1d2de72c Reihungstestverwaltung Aufnahmestufen 2016-07-21 11:38:39 +02:00
kindlm 0950eebca6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-07-08 17:53:25 +02:00
kindlm 6ba0787cb7 Neues Logo; user als Parameter für admins 2016-07-08 17:41:19 +02:00
oesi 9f49093b38 Aufnahmetermine Editieren und Gesamtpunkte berechnung hinzugefügt 2016-07-06 18:16:08 +02:00
oesi 8713b819ba Erstversion für AufnahmeTermine Karteireiter im FAS 
Template für Messages Karteireiter im FAS
 2016-07-05 17:39:17 +02:00
oesi 65765bceb1 - Removed CI Inheritance from Prestudent because it breaks the person inheritance 
- Added function to parse Language Arrays to db_extras
 2016-07-05 16:28:35 +02:00
oesi 6544a656f8 - Studienplan removed Getter to get CI-Language working 
- Prestudent added missing Person Class
 2016-07-05 10:00:49 +02:00
oesi 9707c523e0 Studienordnung_semester auf Studienplan_semester geändert 2016-07-04 18:31:25 +02:00
oesi c96b6de669 Fehler behoben wodurch der letzte Tag des Studiensemesters nicht korrekt dem Studiensemester zugeordnet wurde 2016-07-01 08:57:10 +02:00
kindlm 534a162809 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-27 11:33:25 +02:00
kindlm 4c21acc5f2 Firma DeleteOrganisationseinheit; Nur Eigene löschen 2016-06-27 11:33:17 +02:00
kindlm c773cd3ddc Korrektur Query DeleteFirmaOrganisationseinheit 2016-06-27 11:30:29 +02:00
oesi ad335ad240 RTPunkte1, RTPunkte2 und Private EMail hinzugefügt. 
Funktion aus Klasse entfernt
 2016-06-24 17:04:56 +02:00
Paminger 74186cc5c6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/core/DB_Model.php
 2016-06-24 13:09:44 +02:00
Paminger 925d210bff Permission Problem workaround 2016-06-24 13:08:18 +02:00
paolo 58a6da42ae The method loadWhole has been removed from model DB_Model. 
The same functionality has given by calling the load method without parameters
 2016-06-24 10:39:52 +02:00
Paminger 4f14e7fa92 Messages Inbox Outbox 2016-06-23 10:28:26 +02:00
Gerry Raab 642f700cae phrases textile prev 2016-06-22 10:42:32 +02:00
root 25e0ba9407 basic phrases editing 2016-06-22 01:24:59 +02:00
oesi fab06f9ddb Neue Funktionen für Zugriff auf Studienplaene hinzguefügt 2016-06-21 14:30:11 +02:00
Andreas Moik 7758fa3807 fixed timestamp bug in eventkalender 2016-06-20 14:46:55 +02:00
Paminger 9ed42794a7 Recover fhcdb_helper 2016-06-16 11:40:49 +02:00