0f3e299cf4
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-18 10:24:50 +02:00
de9e92e3b0
- Added permissions for every DB tables that has a model
...
- Added all controllers for every model
- All controller has a load and a insert/update method
2016-05-13 19:00:40 +02:00
f76b83ef64
- Fixed include of ci_db_extra.php in ci_hack.php
...
- Added delete for table public.tbl_preinteressent in dump.sql
2016-05-12 16:55:21 +02:00
d48f586af2
- Added new permission to access to tbl_preinteressent table using basis/preinteressent
...
- Added controller Preinteressent with method to read/write from/in the DB
2016-05-12 13:54:31 +02:00
b523a68fdc
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-12 10:21:07 +02:00
63db2326ed
- Added new permission to access to tbl_studiengang table using basis/studiengang
...
- Added method getStudiengang to class Studiengang2 to get a studiengang from pk
- Added method addDistinct to class DB_Model to add the distinct clause to a query
2016-05-12 10:05:29 +02:00
ae80f2f1e9
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-12 09:07:04 +02:00
0132356094
- Added new permission to access to tbl_addresse table using basis/adresse
...
- Added adresse controller and model
2016-05-11 15:12:35 +02:00
bf4da6f43b
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-11 11:58:09 +02:00
b0c1e50e47
added workaround for parsing data
2016-05-11 11:56:18 +02:00
4413a64860
- Added new permission to access to tbl_bundesland table using basis/nation
...
- Added bundesland controller and model
2016-05-11 10:40:08 +02:00
64a822881a
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-11 08:00:48 +02:00
9168479912
- Moved class Studiengang to Studiengang2 to prevent class name conflicts
...
- Added a route rule to let to call Studiengang2 controller with the urn /api/v1/organisation/studiengang/
- Moved Kontank controller to /api/v1/person
- Kontakt controller has two method getKontakt and postKontakt
2016-05-10 15:30:00 +02:00
4b1691361b
Merge
2016-05-10 14:37:13 +02:00
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
4d406ea389
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-10 14:12:54 +02:00
e624540c16
Message
2016-05-10 14:12:33 +02:00
440cac91d6
person model: added method that return list of db columns
2016-05-10 13:46:01 +02:00
44ebe15c9c
- Method getCheckBewerbung implemented with new standard
...
- Added new permission in fhcomplete.php config file
2016-05-10 13:05:02 +02:00
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
28e1707b4e
Change paths
2016-05-04 16:20:26 +02:00
85f3ea1dab
Moving
2016-05-04 15:43:40 +02:00
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
53eab958dd
New structure for CI controllers and models
2016-05-04 15:19:11 +02:00
1a36ce3dff
Models
2016-05-04 07:17:07 +02:00
6836c3608d
Models
2016-05-04 07:05:23 +02:00
a932cfd0ad
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-02 16:07:49 +02:00
fc6e2de1c9
ACL-System
2016-05-02 16:07:25 +02:00
d06a7acdc3
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-02 13:00:58 +02:00
5bd5ac4aad
sparch model
2016-05-02 00:37:42 +02:00
a6d708a763
PG-Array
2016-05-02 00:36:59 +02:00
b52ffa8974
OE
2016-05-01 23:34:49 +02:00
8cb8782586
ACL-Fix
2016-05-01 11:53:15 +02: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
30c96e3121
Update README.md
2016-04-28 15:23:55 +02:00
482e20d2a2
Composer Lock
2016-04-28 07:14:20 +02:00
091dede2dd
Composer Fakery
2016-04-28 07:07:57 +02:00
6c85973177
PreferDist
2016-04-28 07:00:46 +02:00
3b2ead0aaa
BugFix
2016-04-28 06:47:17 +02:00
5300ae6e21
BugFix
2016-04-28 05:51:10 +02:00
b0a46179ba
BugFix
2016-04-27 21:11:18 +02:00
eb141cec67
Move CodeceptionTests for PHPCI-Compatibility
2016-04-27 21:03:59 +02:00
4bea2abf70
BugFix
2016-04-27 19:08:56 +02:00
8261e397da
Placeholder
2016-04-27 18:39:17 +02:00
29546f6989
BugFi
2016-04-27 18:30:52 +02:00
35de93b216
ButFix
2016-04-27 18:22:57 +02:00
69e0a7c16f
BugFix
2016-04-27 18:00:16 +02:00
782c86d1a3
BugFix
2016-04-27 17:50:15 +02:00
86bfa74ede
BugFix
2016-04-27 17:33:48 +02:00
3ae93df91d
BugFix
2016-04-27 17:21:48 +02:00
Stefan Puraner