blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 09:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,902 Commits 214 Branches 6 Tags
44ebe15c9cab8fbbf8396d255648b8afda0f5d14
Commit Graph

6902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
paolo 44ebe15c9c - Method getCheckBewerbung implemented with new standard 
- Added new permission in fhcomplete.php config file
 2016-05-10 13:05:02 +02:00
paolo 6d093dc4ed - DB_Model added new functionalities 
- Codeception changed
 - Studiengang_model fixed message error
 - Removed File and File_model, they will be replaced by Dms and Dms_model
 - Added new permissions in fhcomplete config file
 2016-05-09 18:19:58 +02:00
paolo 28e1707b4e Change paths 2016-05-04 16:20:26 +02:00
paolo 85f3ea1dab Moving 2016-05-04 15:43:40 +02:00
paolo 030fe2ba74 Merge origin/ci into ci 
Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php
 2016-05-04 15:34:00 +02:00
paolo 53eab958dd New structure for CI controllers and models 2016-05-04 15:19:11 +02:00
Paminger 1a36ce3dff Models 2016-05-04 07:17:07 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00
Paminger a932cfd0ad Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-02 16:07:49 +02:00
Paminger fc6e2de1c9 ACL-System 2016-05-02 16:07:25 +02:00
Stefan Puraner d06a7acdc3 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-02 13:00:58 +02:00
Paminger 5bd5ac4aad sparch model 2016-05-02 00:37:42 +02:00
Paminger a6d708a763 PG-Array 2016-05-02 00:36:59 +02:00
Paminger b52ffa8974 OE 2016-05-01 23:34:49 +02:00
Paminger 8cb8782586 ACL-Fix 2016-05-01 11:53:15 +02:00
Paminger 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
Christian Paminger 30c96e3121 Update README.md 2016-04-28 15:23:55 +02:00
Paminger 482e20d2a2 Composer Lock 2016-04-28 07:14:20 +02:00
Paminger 091dede2dd Composer Fakery 2016-04-28 07:07:57 +02:00
Paminger 6c85973177 PreferDist 2016-04-28 07:00:46 +02:00
Paminger 3b2ead0aaa BugFix 2016-04-28 06:47:17 +02:00
Paminger 5300ae6e21 BugFix 2016-04-28 05:51:10 +02:00
Paminger b0a46179ba BugFix 2016-04-27 21:11:18 +02:00
Paminger eb141cec67 Move CodeceptionTests for PHPCI-Compatibility 2016-04-27 21:03:59 +02:00
Paminger 4bea2abf70 BugFix 2016-04-27 19:08:56 +02:00
Paminger 8261e397da Placeholder 2016-04-27 18:39:17 +02:00
Paminger 29546f6989 BugFi 2016-04-27 18:30:52 +02:00
Paminger 35de93b216 ButFix 2016-04-27 18:22:57 +02:00
Paminger 69e0a7c16f BugFix 2016-04-27 18:00:16 +02:00
Paminger 782c86d1a3 BugFix 2016-04-27 17:50:15 +02:00
Paminger 86bfa74ede BugFix 2016-04-27 17:33:48 +02:00
Paminger 3ae93df91d BugFix 2016-04-27 17:21:48 +02:00
Paminger bd097e9920 Neuer Versuch 2016-04-27 17:10:09 +02:00
Paminger 49122d1ba4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-27 16:53:15 +02:00
Paminger 728a78a6b6 BugFix 2016-04-27 16:52:53 +02:00
paolo 2a516b68cb Merge origin/ci into ci 2016-04-27 16:32:40 +02:00
paolo 0be0280c28 Codeception v1 working 2016-04-27 16:32:28 +02:00
kindlm cd71e69942 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-27 16:21:05 +02:00
kindlm bfe3e3e900 Removed NOT NULL constraint on verfasser_uid from public.tbl_notiz 2016-04-27 16:08:22 +02:00
oesi 7939d1db9e Lehrveranstaltungsverwaltung im Vilesci enthaelt nun auch die neuen Attribute Lehrauftrag/LVInfo und Benotung 2016-04-27 15:19:54 +02:00
oesi ccbff2b349 Status, Standort, ECTS, PflichSWS und PflichtLVS können jetzt auch über Vilesci GUI editiert werden 2016-04-27 14:49:05 +02:00
Paminger 5e812300d2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-27 14:46:31 +02:00
Paminger 8063964cec Install 2016-04-27 14:46:11 +02:00
kindlm 9dc5ef6f5b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-27 13:54:58 +02:00
kindlm 9826af257f Courses of ECI-Degree-Program shown in Incoming-Tool 2016-04-27 13:54:47 +02:00
kindlm 5ae5dd115c Titel_intern shown in FAS on documenttype "Sonst" 2016-04-27 13:53:50 +02:00
paolo 4146257917 Wrong .gitignore 2016-04-27 13:42:54 +02:00
paolo a0c06aa2c3 Merge origin/ci into ci 
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
 2016-04-27 12:06:59 +02:00
paolo 546483bed7 Merging time 2016-04-27 12:04:42 +02:00
paolo 549b0133c2 Merge origin/ci into ci 
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
 2016-04-27 11:54:20 +02:00