100 Commits
Author SHA1 Message Date
Christian PamingerandGitHub 90931232d9 Merge pull request #49 from FortySeeds/master
Enable HTTP-Basic Auth for Demo and Testing
2024-09-25 05:57:13 +02:00
Christian PamingerandGitHub 427a301d1a Merge branch 'FH-Complete:master' into master 2024-09-25 05:51:11 +02:00
Christian PamingerandGitHub 04b896ac13 Update projektphasedetail.overlay.xul.php
Services Added
2022-03-16 09:38:38 +01:00
Paminger b46692913c Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-19 10:23:19 +02:00
Paminger 58bd4d003d Vorlage MailStatConfirmInteressent 2016-08-19 10:22:22 +02:00
Paminger ed6f9fa676 Sprache bei Templatetext 2016-07-13 07:56:19 +02:00
Paminger 364ca5ed72 Sprache bei Vorlagentext 2016-07-11 16:52:00 +02:00
Paminger 03d84be366 Vorlagentexte 2016-07-07 09:26:40 +02:00
Paminger c9e980c74a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-05 19:13:59 +02:00
Paminger d7801da391 Roles 2016-07-05 19:13:37 +02:00
Paminger 6a609283a4 Seeds and DBTools extension 2016-07-05 19:12:54 +02:00
Paminger cddfc142c7 Kosmetik 2016-07-05 07:11:46 +02:00
Paminger 39c0350af8 Generate Studienordnung 2016-07-04 22:43:11 +02:00
Paminger b95fc0f06a Roles 2016-07-04 22:42:41 +02:00
Paminger 41a0cc33f1 Kosmetik 2016-07-01 00:40:15 +02:00
Paminger ad8c5bfb32 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-01 00:28:18 +02:00
Paminger 93422b75b5 BugFix 2016-07-01 00:27:57 +02:00
Paminger 075312963e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-30 07:22:34 +02:00
Paminger 09787cca65 BugFix PhraseLib 2016-06-30 07:22:18 +02:00
Paminger 73c36d8520 BugFix 2016-06-29 09:34:51 +02:00
Paminger 48655039ba Move public.phrase to system.phrase and change phrase_inhalt to phrasentext 2016-06-29 09:32:51 +02:00
Paminger 9a44c818ea FHC Helper 2016-06-29 08:41:02 +02:00
Paminger 6af45f99f6 BugFix 2016-06-29 08:08:06 +02:00
Paminger 4e6c1bd9fd Dont set rights in Migration files 2016-06-29 08:05:57 +02:00
Paminger b4fdd11686 BugFix 2016-06-29 08:00:29 +02:00
Paminger 9108b9ecd4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-28 22:11:12 +02:00
Paminger 0d55276bd2 Checkroles 2016-06-28 22:10:56 +02:00
Paminger f3c2630a66 SeedBugFix 2016-06-28 12:53:53 +02:00
Paminger e21b2f6233 Seeds 2016-06-28 12:34:12 +02:00
Paminger 74186cc5c6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/core/DB_Model.php
2016-06-24 13:09:44 +02:00
Paminger 925d210bff Permission Problem workaround 2016-06-24 13:08:18 +02:00
Paminger 4f14e7fa92 Messages Inbox Outbox 2016-06-23 10:28:26 +02:00
Paminger f2fdc62b44 BugFix 2016-06-22 08:18:53 +02:00
Paminger 49ebc3945b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 08:11:59 +02:00
Paminger 70e83b6e18 Messages 2016-06-22 08:11:04 +02:00
Paminger 6e62fbdcd4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/views/templates/footer.php
	application/views/templates/header.php
2016-06-21 11:28:46 +02:00
Paminger dbe19fafb5 Messages 2016-06-21 11:27:36 +02:00
Paminger 834b119f9c BugFix 2016-06-20 13:03:59 +02:00
Paminger 68963a962a BugFix 2016-06-20 08:36:37 +02:00
Paminger 377b1ecdd0 JSON-Forms 2016-06-19 19:41:10 +02:00
Paminger 83540e068a VorlageExtension 2016-06-18 11:32:29 +02:00
Paminger 3d45527a5d TemplateParser 2016-06-18 09:11:00 +02:00
Paminger b5d14fb59f BugFix 2016-06-17 23:12:07 +02:00
Paminger 7aea047537 Templates 2016-06-17 23:09:50 +02:00
Paminger a987eba1ac Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-17 00:13:35 +02:00
Paminger 4c58b95728 Libs and Vorlagen 2016-06-17 00:12:46 +02:00
Paminger 7766595c5d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-16 11:41:23 +02:00
Paminger 9ed42794a7 Recover fhcdb_helper 2016-06-16 11:40:49 +02:00
Paminger eb712f4242 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/core/FHC_Model.php
2016-06-10 15:41:09 +02:00
Paminger 850777476e Message 2016-06-09 10:00:23 +02:00
Paminger e441886748 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 12:21:45 +02:00
Paminger f3a49e09e7 Demo 2016-05-20 12:21:04 +02:00
Paminger ffac73c447 GitIgnore 2016-05-20 11:03:45 +02:00
Paminger d4994c95e9 New Build Folder 2016-05-20 10:38:28 +02:00
Paminger bf1a16427c PHPCI 2016-05-20 10:33:19 +02:00
Paminger 815d34ebb6 PHPCI 2016-05-20 10:25:10 +02:00
Paminger 42e911b4fe CodeSniffer 2016-05-20 07:44:08 +02:00
Paminger 4b1691361b Merge 2016-05-10 14:37:13 +02:00
Paminger 4b9d5d273b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/config/fhcomplete.php
	application/core/FHC_Model.php
2016-05-10 14:36:01 +02:00
Paminger e624540c16 Message 2016-05-10 14:12:33 +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
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
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
Paminger 9d2c05bd3d PHPCI-Install 2016-04-27 10:34:49 +02:00
Paminger 70a3c43f7c PHPCI 2016-04-26 16:39:50 +02:00
Paminger 39f65875c6 PersonCept 2016-04-26 15:23:21 +02:00
Paminger fe227ebdcb Cepts 2016-04-26 15:03:09 +02:00
Paminger 5ab6a35372 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/config/config.php
2016-04-26 14:54:45 +02:00
Paminger 4799ec68de Autoload 2016-04-26 14:50:00 +02:00
Paminger ecff3747d0 Dontknow 2016-04-25 14:25:09 +02:00
Paminger ca65efe967 BugFix 2016-04-14 22:33: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