Commit Graph

8334 Commits

Author SHA1 Message Date
paolo 18df562208 Check permissions 2016-04-22 16:31:46 +02:00
paolo f6f533a23b API Calls codeception
Fixed translations
2016-04-22 14:44:40 +02:00
paolo 346b8c82e1 JSON output improved 2016-04-22 11:08:38 +02:00
oesi 521611d671 Wenn keine genehmigte Studienordnung vorhanden ist, werden die alle LVs angezeigt und nur die Module herausgefiltert 2016-04-22 10:20:34 +02:00
oesi e8e3ab76c9 Vorerst werden im CIS nur noch Lehrveranstaltungen angzeigt die in genehmigten Studienplänen vorkommen 2016-04-22 10:01:31 +02:00
paolo 4e02a1105b Fixed wrong path in require statement 2016-04-22 10:00:24 +02:00
oesi 7af312bb8f Neuer Parameter genehmigt um nur Lehrveranstaltungen abfragen zu können die in genehmigten Studienordnungen verwendet werden 2016-04-22 09:19:09 +02:00
paolo 75e3590a09 This is not the best code in the world, it's only a beta version 2016-04-21 17:17:30 +02:00
Gerald Raab fbe9c5e9ed ital 2016-04-21 13:06:44 +02:00
Gerald Raab 0d937232a2 ital 2016-04-21 10:19:52 +02:00
Gerald Raab 906a383c30 ital phrases 2016-04-21 10:17:44 +02:00
Gerald Raab 1ffa831887 include generated pruefung.js.php 2016-04-21 09:36:00 +02:00
Gerald Raab 1d879f484a ital phrase 2016-04-21 09:27:43 +02:00
Gerald Raab 4cb468ed2b ital locale 2016-04-21 09:24:37 +02:00
Gerald Raab 9a5ca672f2 ital locale 2016-04-20 18:17:55 +02:00
paolo 78e4c2900b Merge origin/ci into ci
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
2016-04-20 17:57:55 +02:00
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