 oesi
|
b8177b58e8
|
Merge branch 'master' into ci
Conflicts:
composer.json
composer.lock
phpci.yml
system/checksystem.php
system/dbupdate_3.2.php
tests/codeception/_data/dump.sql
tests/codeception/tests/acceptance/CISLoginPage.php
|
2017-01-20 11:05:08 +01:00 |
|
|
Andreas Moik
|
526e3013e0
|
cleanups
|
2016-12-05 14:05:05 +01:00 |
|
|
Andreas Moik
|
6a1d864a4f
|
- jsoneditor included via composer
- meta-include for jsoneditor
- new composer.lock version
|
2016-12-05 11:24:11 +01:00 |
|
|
Andreas Moik
|
92544007eb
|
added textile in composer
|
2016-09-07 11:29:56 +02:00 |
|
|
paolo
|
4b82843c76
|
- Added parameter blockTags to controller Phrase
If this parameter is set to "no", it will be removed the tags <p> and </p>
from the beginning and from the end of the returned phrases
|
2016-07-29 15:36:32 +02:00 |
|
|
paolo
|
91ad613884
|
- Try fixing phpC(dis)I
|
2016-07-08 15:37:02 +02:00 |
|
|
paolo
|
ba1c637ca4
|
Method getPhrases of library PhrasesLib now returns the text of a phrase
converted from textile to html
|
2016-07-06 16:07:17 +02:00 |
|
|
Paminger
|
377b1ecdd0
|
JSON-Forms
|
2016-06-19 19:41:10 +02:00 |
|
|
Paminger
|
9ed42794a7
|
Recover fhcdb_helper
|
2016-06-16 11:40:49 +02:00 |
|
|
nscbrandb
|
e34bda9649
|
Composer Merge-Plugin für AddOn-spezifische composer.json's
|
2016-05-17 15:47:33 +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 |
|
|
Paminger
|
091dede2dd
|
Composer Fakery
|
2016-04-28 07:07:57 +02:00 |
|
|
Gerald Raab
|
6283e92339
|
Codesniffer FHC-Standard
|
2016-04-08 16:37:00 +02:00 |
|
|
Paminger
|
c124348484
|
Message
|
2016-04-05 09:36:24 +02:00 |
|
|
Paminger
|
9689fd5a01
|
PHPCI
|
2016-03-20 12:53:17 +01:00 |
|
|
Paminger
|
2236ba7d26
|
DB-Migrate CI
|
2016-02-29 16:01:52 +01:00 |
|
|
Paminger
|
f9e3c37922
|
Codeigniter via Composer
|
2016-02-29 14:22:28 +01:00 |
|
|
Andreas Moik
|
f0d0d607d0
|
git Beispiel in composer.json wurde in das Wiki verschoben
|
2016-01-27 11:39:12 +01:00 |
|
|
Stefan Puraner
|
1cb82aa653
|
merge
|
2015-12-03 10:49:00 +01:00 |
|
|
Andreas Moik
|
bb3553a7c5
|
Integration von Composer
|
2015-11-11 15:44:14 +01:00 |
|