blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-14 13:32:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,768 Commits 210 Branches 6 Tags
7ef88fcc022db8501a5d94de9a26a11af04c7ad7
Commit Graph

13768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gerald Raab ae2f6c21d8 statusbezeichnung mehrsprachig, prüfungsverwaltung mehrsprachig 2016-04-20 17:19:14 +02:00
oesi 07ebcebcf3 Neue Funktion hinzugefügt um zu Prüfen ob eine Lehrveranstaltung zur Bearbeitung gesperrt ist 2016-04-18 15:24:43 +02:00
Nikolaus Krondraf 0292f69d2b Mehrsprachigkeit der Statuswerte 2016-04-18 12:12:04 +02:00
Gerald Raab 825a03adaa Codingstyle 2016-04-18 11:29:15 +02:00
paolo 0ffe7fbcc6 Merge origin/ci into ci 
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
 2016-04-18 09:03:15 +02:00
paolo f12ce76194 Merging 2016-04-15 15:47:56 +02:00
paolo 9aef5dcc30 HTTP basic authentication 
Set this as default authentication, providing codeception test case
 2016-04-15 15:41:38 +02:00
oesi 87c021b693 Fehler behoben in der Anzeige der Lehrveranstaltungen im FAS wenn mehrere verschiedene Studienordnungen aktiv sind 2016-04-15 09:35:30 +02:00
oesi 3760195a58 Fehler behoben wodurch nicht alle Outgoing im Filter angezeigt wurden wenn diese länger als ein Semester im Ausland sind 2016-04-15 08:38:04 +02:00
Paminger ca65efe967 BugFix 2016-04-14 22:33:57 +02:00
paolo aec2e7b5ac HTTP digest authentication 
The digest http authentication does not allow to use a password storing
systems, that do not successively allow to retrieve it, even if hashed
 2016-04-14 15:24:53 +02:00
Gerald Raab 1585f92c64 formatting 2016-04-14 15:15:53 +02:00
Gerald Raab c6b6b45a0b corrected formatting 2016-04-14 15:08:10 +02:00
paolo 64de1ed4f4 HTTP digest authentication 2016-04-13 16:59:51 +02:00
Stefan Puraner 094a045310 fixed auth bug 2016-04-13 13:45:34 +02:00
Stefan Puraner cc88d3b5d5 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-13 13:09:57 +02:00
Paminger 5bfe253942 CS 2016-04-13 10:59:51 +02:00
Paminger 39c1d2771c PHPCI 2016-04-13 10:44:09 +02:00
root a13b51e02c Tests 2016-04-13 08:41:09 +02:00
Paminger ae6740cc32 Rolle Admin und Acceptance Test 2016-04-13 08:14:33 +02:00
Paminger 4b5211a9c6 FHC_Auth 2016-04-13 07:49:01 +02:00
Stefan Puraner b0c7619c61 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-12 15:33:41 +02:00
Stefan Puraner b579c14a5d save bewertung bugfix 2016-04-12 15:31:38 +02:00
Stefan Puraner 0597a5d9aa excluded api methods from auth 2016-04-12 15:16:33 +02:00
kindlm 3110921f75 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-11 18:04:10 +02:00
kindlm 9a24759fb3 Saving a content via ajax request 
Necessary for addon Lehrmittel
 2016-04-11 18:04:04 +02:00
paolo d689953b83 Merge origin/ci into ci 
Conflicts:
	application/config/rest.php
	application/controllers/api/v1/APIAuth.php
 2016-04-11 17:35:14 +02:00
paolo 7032d8be7f Authentication working with LDAP 2016-04-11 17:23:51 +02:00
Paminger 4e2e943ae2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 14:20:44 +02:00
Paminger df889c235b BugFix 2016-04-11 14:20:33 +02:00
Stefan Puraner 325243f165 pruefungstyp is now calculated by countinig past attempts 2016-04-11 13:27:37 +02:00
Stefan Puraner a2bc0c6f80 registration for exam 2016-04-11 10:53:15 +02:00
Stefan Puraner 55187700c2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 10:06:44 +02:00
Stefan Puraner a6031bbe2e merging message model 2016-04-11 10:05:19 +02:00
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