16f6bdbf70
Merge branch 'feature-5128/FHC-IDAM_account_activation'
2020-02-03 14:53:24 +01:00
13e24230bc
Fixed font awesome in composer and gitignore
2020-01-21 12:18:08 +01:00
4e43d37780
- Droped not used packages from composer.json
...
- Fixed packages version in composer.json
- Renewed file composer.lock
- Checked & Fixed imports paths
- Moved /vendor/FHC-Vendor to /FHC-Vendor
2020-01-15 18:08:29 +01:00
6bf7d46ace
- Added securimage via composer
...
- Added securimage in application/views/templates/FHC-Header.php
2019-11-18 15:04:52 +01:00
3e5e65bfc4
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
2019-11-04 16:58:19 +01:00
ed818c72d9
Merge branch 'master' into feature-4026/TabulatorWidget
2019-11-04 15:08:42 +01:00
49f7f61273
Merge branch 'feature-3801/Use_different_source_CI_REST'
2019-10-29 15:17:38 +01:00
d06c03f0db
- updated pivottable in composer to v 2.21.0
2019-08-30 15:52:47 +02:00
d2e8b01e30
- codeigniter-restserver is now provided and loaded via composer (libraries/REST_Controller.php, config/rest.php, language/english/rest_controller_lang.php, libraries/Format.php, etc)
...
- Added new core controller core/RESTFul_Controller.php that extends REST_Controller and partially overrides part of the latter
- Changed application/config/rest.php to keep the minimal useful set of configs
- Controllers core/APIv1_Controller, controllers/api/v1/CheckUserAuth.php and controllers/api/v1/Test.php now extend core/RESTFul_Controller
- Changed method _remap interface for core/APIv1_Controller
- Removed application/core/REST_Controller.php
- Removed application/libraries/Format.php
- Removed application/language/english/rest_controller_lang.php
2019-07-31 14:46:31 +02:00
2922aa26fe
Added tabulator to composer, FHC-Header and a CSS for it
2019-07-09 11:57:52 +02:00
1121eb8352
- Updated composer.json and composer.lock
...
- Changed phpci.yml to be used with the new CI machine
2019-05-16 12:58:59 +02:00
d6576dbd49
Updated composer files
2019-05-14 13:01:25 +02:00
6695bf027e
added nategood/httpful to composer in core
2018-09-13 09:51:28 +02:00
19a680148f
Fixed composer.lock
2018-08-07 14:25:31 +02:00
d47b844773
Added Missing Library for Screen-rebooting to Composer
2018-07-25 14:46:00 +02:00
02cde41939
- Renamed function backwardCompatibleJSMsIe to generateBackwardCompatibleJSMsIe in fhc_header_helper
...
- Now function fhc_header_helper accept the path and file name as parameter
- Added jquerytreetable to FHC-Header
- Fixed includes in FHC-Header
- Now composer uses as much as possible stable releases of the packages (no git directly, no master branch directly...)
- Updated composer.json and composer.lock
2018-07-11 15:44:13 +02:00
04e2e1c54b
- Moved functions from FHC-Header to fhc_header_helper
...
- Added function backwardCompatibleJSMsIe to fhc_header_helper for backward compatibility with older versions of MS IE
- FHC_Controller now loads helper fhc_header too
- Added afarkas/html5shiv and scottjehl/Respond to composer
- Rename function sendMail in fhc_sancho_helper.php to sendSanchoMail
2018-07-11 13:43:18 +02:00
9e743089c2
table footer line e.g. for sums
2018-04-30 17:58:48 +02:00
a768295db0
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-01-24 17:41:16 +01:00
fe8e5ed507
added mottie tablesorter, removed datatables and datepicker, restyled tablesorter for better bootstrap look, layout changes
2018-01-24 17:29:12 +01:00
6456ad7b06
- Now composer install version >3 of components/jquery
...
- Added new entry in composer to install the version 2 of jquery
- Updated all the paths for jquery2
- Changed name of parameter jquery3 to jquery in FHC-Header
- Updated pages that use FHC-Header
- Removed components/bootstrap from composer
- Added twbs/bootstrap to composer
- Updated pages that use bootstrap with the correct path
2018-01-24 17:10:08 +01:00
0e6e6ab8ea
added bootstrap datepicker, dokumente nachgereicht in separate table, zgv panels collapsible and Interessenten come first, made columns more responsive
2018-01-10 09:53:34 +01:00
00dbedc040
added jqueryui, bootstrap, fontawesome, datatables (new tablesorter)
2018-01-05 12:45:58 +01:00
f255403af2
Added jquery-archive/jquery-metadata in composer
2017-10-12 14:10:17 +02:00
f8c2f257b2
Added nicolaskruchten/pivottable to composer
2017-10-11 12:12:13 +02:00
7dd516756b
- Removed .gitmodules
...
- Removed directory submodules and content
- Removed wikimedia from composer
- Updated composer.json and composer.lock
2017-10-11 12:01:40 +02:00
88cb088016
- Updated CHANGELOG.md
...
- Updated composer.json
- Updated composer.lock
2017-09-14 18:13:05 +02:00
bcd84512f5
Second commit
2017-09-11 16:06:56 +02:00
b0806f263b
First commit
2017-09-08 19:15:21 +02:00
afd1667645
GUI für Studiensemester und Studienjahr hinzugefügt
2017-08-01 14:50:19 +02:00
1a7f726cc5
composer.lock
2016-12-06 15:04:08 +01:00
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
482e20d2a2
Composer Lock
2016-04-28 07:14:20 +02:00
c124348484
Message
2016-04-05 09:36:24 +02:00
9689fd5a01
PHPCI
2016-03-20 12:53:17 +01:00
2236ba7d26
DB-Migrate CI
2016-02-29 16:01:52 +01:00
f9e3c37922
Codeigniter via Composer
2016-02-29 14:22:28 +01:00
f0d0d607d0
git Beispiel in composer.json wurde in das Wiki verschoben
2016-01-27 11:39:12 +01:00
1cb82aa653
merge
2015-12-03 10:49:00 +01:00
bb3553a7c5
Integration von Composer
2015-11-11 15:44:14 +01:00
Andreas Österreicher