2dada5200c
Merge branch 'master' into ci
...
Conflicts:
.gitignore
composer.json
include/prestudent.class.php
include/securimage/securimage.php
include/studienplan.class.php
system/dbupdate_3.2.php
tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php
tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php
tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php
tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php
tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php
tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php
tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php
tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidVariableNameSniff.php
tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php
tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php
tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php
tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php
tests/codesniffer/FHComplete/ruleset.xml
tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php
tests/codesniffer/FHComplete/tests/TestHelper.php
tests/codesniffer/FHComplete/tests/bootstrap.php
tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
tests/codesniffer/FHComplete/tests/files/bad_trait_name.php
tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php
tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php
tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php
tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php
tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php
tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
tests/codesniffer/FHComplete/tests/files/control_structure_while.php
tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php
tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
tests/codesniffer/FHComplete/tests/files/double_space.php
tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php
tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php
tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php
tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php
tests/codesniffer/FHComplete/tests/files/function_spacing.php
tests/codesniffer/FHComplete/tests/files/mixing_indent.php
tests/codesniffer/FHComplete/tests/files/multiple_use.php
tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php
tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php
tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php
tests/codesniffer/FHComplete/tests/files/space_tab.php
tests/codesniffer/FHComplete/tests/files/tab_space.php
tests/codesniffer/FHComplete/tests/files/traits_no_order.php
tests/codesniffer/FHComplete/tests/files/traits_pass.php
tests/codesniffer/FHComplete/tests/files/type_casting_fail.php
tests/codesniffer/FHComplete/tests/files/type_casting_pass.php
tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php
tests/codesniffer/FHComplete/tests/files/use_closure_pass.php
tests/codesniffer/FHComplete/tests/files/use_no_order.php
tests/codesniffer/FHComplete/tests/files/use_ok_pass.php
tests/codesniffer/FHComplete/tests/files/use_with_commas.php
tests/codesniffer/FHComplete/tests/files/variable_name_pass.php
tests/codesniffer/FHComplete/tests/files/whitespace_comma.php
tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php
tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php
tests/codesniffer/FHComplete/tests/ruleset.xml
2016-04-28 18:14:40 +02:00
7939d1db9e
Lehrveranstaltungsverwaltung im Vilesci enthaelt nun auch die neuen Attribute Lehrauftrag/LVInfo und Benotung
2016-04-27 15:19:54 +02:00
ccbff2b349
Status, Standort, ECTS, PflichSWS und PflichtLVS können jetzt auch über Vilesci GUI editiert werden
2016-04-27 14:49:05 +02:00
d93dd1fb94
FIXed AddonAuthentication file inclusion
2016-04-26 11:14:38 +02:00
4cc83999ed
- Moved class APIv1_Controller from FHC_Controller.php to APIv1_Controller.php
...
- Moved class DB_Model from FHC_Model.php to DB_Model.php
- load method of class person (person.class.php) now is calling getPerson
method of the class Person_model
- getAllForBewerbung method of class studiengang (studiengang.class.php) now is calling getAllForBewerbung
method of the class Studiengang_model
- getStudienplaene method of class studienplan (studienplan.class.php) now is calling getStudienplaene
method of the class Studienplan_model
2016-04-25 18:25:03 +02:00
a3a9c42e99
- Renamed classes, methods and properties names in german
...
- All the controllers exends APIv1_Controller rather than REST_Controller
- Codeceptions modified to be compliant to changes
2016-04-25 15:57:52 +02:00
197064d44d
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-04-25 12:23:14 +02:00
f58ee305dc
Added span for Addon lehrmittel/software
2016-04-25 11:38:39 +02:00
f6f533a23b
API Calls codeception
...
Fixed translations
2016-04-22 14:44:40 +02:00
4e02a1105b
Fixed wrong path in require statement
2016-04-22 10:00:24 +02:00
75e3590a09
This is not the best code in the world, it's only a beta version
2016-04-21 17:17:30 +02:00
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
ae2f6c21d8
statusbezeichnung mehrsprachig, prüfungsverwaltung mehrsprachig
2016-04-20 17:19:14 +02:00
07ebcebcf3
Neue Funktion hinzugefügt um zu Prüfen ob eine Lehrveranstaltung zur Bearbeitung gesperrt ist
2016-04-18 15:24:43 +02:00
0292f69d2b
Mehrsprachigkeit der Statuswerte
2016-04-18 12:12:04 +02:00
825a03adaa
Codingstyle
2016-04-18 11:29:15 +02:00
87c021b693
Fehler behoben in der Anzeige der Lehrveranstaltungen im FAS wenn mehrere verschiedene Studienordnungen aktiv sind
2016-04-15 09:35:30 +02:00
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
1585f92c64
formatting
2016-04-14 15:15:53 +02:00
c6b6b45a0b
corrected formatting
2016-04-14 15:08:10 +02:00
64de1ed4f4
HTTP digest authentication
2016-04-13 16:59:51 +02:00
325243f165
pruefungstyp is now calculated by countinig past attempts
2016-04-11 13:27:37 +02:00
53b68ff7c7
Fehlende Attribute beim Laden der Lehrveranstaltung hinzugefügt
2016-04-11 09:02:07 +02:00
ccf79afdd0
FAS Lehrveranstaltungen verwenden Studienplanmatrix statt Studienordnungsmatrix
2016-04-08 16:51:37 +02:00
5b3d3c401d
Merge
2016-04-08 06:45:35 +02:00
80c35f4b6b
Anpassungen für KU Linz; Studienblatt, LV Zeugnis, Anzeige von Noten
...
kompatibler LVs im Studienplan
2016-04-07 10:57:03 +02:00
97ddc838a8
added Kontakt Model; extended Person Model
2016-04-06 15:46:01 +02:00
0a2df0127f
reverted changes
2016-04-05 11:40:19 +02:00
bc427f7d2b
fixed config bugs in rest client
2016-04-05 11:35:06 +02:00
82c85e3ca2
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-04-01 14:00:53 +02:00
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
9a6cf6ee7b
Fehler behoben wodurch das Kopieren von Studienordnungen zu Fehlermeldungen führte
2016-04-01 08:08:07 +02:00
093c70eeb4
fixed bugs
2016-03-31 11:57:50 +02:00
04aec20a45
set italian course name
2016-03-24 11:59:22 +01:00
0c2ecb44a8
added column genehmigung
2016-03-23 16:33:14 +01:00
21272960c9
added column genehmigung
2016-03-23 16:22:07 +01:00
d1f03ec889
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-03-22 11:13:47 +01:00
d690fd8cb8
added method
2016-03-22 11:06:55 +01:00
50feec07ae
cleanups
2016-03-21 15:26:51 +01:00
9689fd5a01
PHPCI
2016-03-20 12:53:17 +01:00
1a9d80274c
LV-Bezeichnung für Italian
2016-03-19 15:46:25 +01:00
df52c64021
Fehler behoben bei dem Studienordnungen nicht geändert werden konnten
2016-03-17 15:48:57 +01:00
b9a08a12ae
Fehler behoben bei dem die Projekt im Planner beim Starten nicht korrekt geladen wurden
2016-03-16 19:17:54 +01:00
834e63ca21
Fehler beim Speichern der Studienplan Lehrveranstaltung Zuordnung behoben
2016-03-16 16:45:36 +01:00
5917419cb7
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
...
# Conflicts:
# locale/de-AT/incoming.php
# locale/en-US/incoming.php
2016-03-15 20:46:14 +01:00
2ba6c42ac0
Parameter aktiv bei function getFirmen
2016-03-15 20:43:56 +01:00
bacd07d8d3
Funktion getAktenDms
...
Liefert die Akten anhand der dms_id
2016-03-15 20:34:36 +01:00
0c3c47f848
BaseControllerConcept into config.php
2016-03-15 08:14:05 +01:00
c710b64eb3
Kleines L aus Securimage entfernt
2016-03-14 17:33:28 +01:00
8f038d53f5
NEW: edit ressource funktion
2016-03-14 15:13:22 +01:00
Paminger