blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-23 23:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,334 Commits 228 Branches 6 Tags
ec00c93d04fd0389fe87a7fbceae36727f4584ce
Commit Graph

8334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
paolo cc905d9f77 Merge origin/ci into ci 2016-04-11 10:02:16 +02:00
paolo 8ee7df5eba Fixed ob_flush() notice error 2016-04-11 09:59:58 +02:00
root d952087979 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 09:54:32 +02:00
root 63a9e99a59 Message-Model conflict 2016-04-11 09:53:58 +02:00
Stefan Puraner 04e2b0dc8b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 09:11:37 +02:00
oesi 53b68ff7c7 Fehlende Attribute beim Laden der Lehrveranstaltung hinzugefügt 2016-04-11 09:02:07 +02:00
Stefan Puraner d4a33fc1f9 changed method to post 2016-04-11 08:43:29 +02:00
Paminger ae1dc93a14 API-Struktur und CodeSniffer Verbesserungen 2016-04-11 08:11:15 +02:00
Paminger 1f236b4b5a CodeCeption 2016-04-11 07:08:46 +02:00
Paminger 20ea242f35 Move Kontakt-Controller to person folder 2016-04-11 06:40:37 +02:00
Paminger 27af06cbb0 CodeSniffer 2016-04-10 21:43:45 +02:00
Paminger 705ee7c62c BugFix Migration 2016-04-10 19:46:35 +02:00
Paminger bf0a96f21a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/models/person/Person_model.php
	ci_hack.php
 2016-04-10 18:20:43 +02:00
Paminger 0d91cdd132 GitIgnore 2016-04-10 18:12:40 +02:00
Paminger 3b39752ab7 Acceptance Tests 2016-04-10 18:11:09 +02:00
paolo 1131bff3ec Changes: 
application/controllers/api/v1/Person.php
	Fixed conflicts

application/models/person/Person_model.php
	Fixed conflicts

ci_hack.php
	Load the language class otherwise some VileSci functionalities would crash
	Ex: Personen -> Zusammenlegen

tests/codesniffer/FHComplete/ruleset.xml
	Turned off ParamCommentFullStop option
 2016-04-08 16:53:52 +02:00
oesi ccf79afdd0 FAS Lehrveranstaltungen verwenden Studienplanmatrix statt Studienordnungsmatrix 2016-04-08 16:51:37 +02:00
Gerald Raab 6283e92339 Codesniffer FHC-Standard 2016-04-08 16:37:00 +02:00
Paminger 5b3d3c401d Merge 2016-04-08 06:45:35 +02:00
Paminger 5e59fc3c17 PHPCI 2016-04-07 15:52:37 +02:00
Paminger 34db90ba19 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/config/autoload.php
	application/controllers/api/v1/Person.php
	application/models/person/Person_model.php
 2016-04-07 15:20:08 +02:00
Paminger bcfae6b009 Shit 2016-04-07 15:17:26 +02:00
Stefan Puraner 9c9d862bc8 validation before printing studienblatt 2016-04-07 11:59:22 +02:00
Stefan Puraner 80c35f4b6b Anpassungen für KU Linz; Studienblatt, LV Zeugnis, Anzeige von Noten 
kompatibler LVs im Studienplan
 2016-04-07 10:57:03 +02:00
kindlm 874dd6652f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-06 15:59:22 +02:00
kindlm f6e7cbcdf3 Infotext für geliefert-Mail adaptiert 2016-04-06 15:58:50 +02:00
kindlm 19ef177d7b GUI-Verbesserungen in DMS 2016-04-06 15:58:13 +02:00
Stefan Puraner 97ddc838a8 added Kontakt Model; extended Person Model 2016-04-06 15:46:01 +02:00
Gerald Raab bd964771fb Bugfix 2016-04-05 15:22:09 +02:00
Gerald Raab 1ffee2dcda Course Registration icon if enrolled different, locale 2016-04-05 15:10:48 +02:00
Stefan Puraner 30a9e9882e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-05 11:41:52 +02:00
Stefan Puraner 0a2df0127f reverted changes 2016-04-05 11:40:19 +02:00
Stefan Puraner bc427f7d2b fixed config bugs in rest client 2016-04-05 11:35:06 +02:00
Paminger c124348484 Message 2016-04-05 09:36:24 +02:00
oesi 8a9ac4a8d6 Fehler behoben bei dem VertragsID bei der Lehreinheitenvorrückung mitkopiert wurde 2016-04-04 11:07:47 +02:00
Gerald Raab 82c85e3ca2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-01 14:00:53 +02:00
Gerald Raab dac5cd55ad Italian days and months 
show all projects in zeitaufzeichnung where user has ever been assigned  in a phase
 2016-04-01 13:59:22 +02:00
oesi 9a6cf6ee7b Fehler behoben wodurch das Kopieren von Studienordnungen zu Fehlermeldungen führte 2016-04-01 08:08:07 +02:00
Stefan Puraner 093c70eeb4 fixed bugs 2016-03-31 11:57:50 +02:00
Stefan Puraner e286e70b0b changed default values of column lvinfo and benotung 2016-03-31 10:05:20 +02:00
gerryraab df551cf4af Update CHANGELOG.md 2016-03-29 12:15:16 +02:00
gerryraab e0177db7e9 Update CHANGELOG.md 2016-03-29 12:14:42 +02:00
Gerald Raab 1b5bbf4aee Zeitsperren Menu 
wenn link zu 'resturlaub.php' benötigt --> über CMS anlegen
 2016-03-29 12:02:32 +02:00
Gerald Raab 04aec20a45 set italian course name 2016-03-24 11:59:22 +01:00
Stefan Puraner 0c2ecb44a8 added column genehmigung 2016-03-23 16:33:14 +01:00
Stefan Puraner ff39c6ea31 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-23 16:24:24 +01:00
Stefan Puraner 21272960c9 added column genehmigung 2016-03-23 16:22:07 +01:00
oesi 7ed057b262 Tablesorter von Submodules entfernt und auf Meta Includes geändert 2016-03-22 12:12:37 +01:00
oesi ab1e082de9 Submodule für Tablesorter entfernt 2016-03-22 12:12:11 +01:00
kindlm 9c67c9346b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-22 11:21:14 +01:00