6dc145d618
Merge origin/ci into ci
2016-06-21 11:11:14 +02:00
5a5a22e0d5
- Removed body tag from footer.php and header.php
...
- Added permission fs/dms to dump.sql and fhcomplete.php
- Added FilesystemLib to read and write from/in filesystem
- Added FS_Model to manage filesystem with the same permission system of DB_Model
- Added more models to handle the Dms
- Modified Dms controller to use the new models
2016-06-21 11:10:55 +02:00
834b119f9c
BugFix
2016-06-20 13:03:59 +02:00
68963a962a
BugFix
2016-06-20 08:36:37 +02:00
377b1ecdd0
JSON-Forms
2016-06-19 19:41:10 +02:00
83540e068a
VorlageExtension
2016-06-18 11:32:29 +02:00
3d45527a5d
TemplateParser
2016-06-18 09:11:00 +02:00
b5d14fb59f
BugFix
2016-06-17 23:12:07 +02:00
7aea047537
Templates
2016-06-17 23:09:50 +02:00
a987eba1ac
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-06-17 00:13:35 +02:00
4c58b95728
Libs and Vorlagen
2016-06-17 00:12:46 +02:00
8b5fb84d0e
Merge origin/ci into ci
2016-06-16 15:11:36 +02:00
e5cd3c5a9e
Fixed header.php: removed body tag
2016-06-16 15:11:20 +02:00
ef025b674e
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-06-16 12:31:49 +02:00
8a64b70ea2
rights for phrase
2016-06-16 12:31:20 +02:00
c5ee56f23d
Moved _validate method from the model Person_model to the controller Person
2016-06-16 12:18:29 +02:00
13a07e2207
Merge origin/ci into ci
2016-06-16 12:16:10 +02:00
0c2c0468af
- Added helper message with the functions success and error
...
- Added methods _success and _error to classes FHC_model and APIv1_Controller
2016-06-16 12:15:52 +02:00
6574af6518
DB add tables for phrases
2016-06-16 12:10:11 +02:00
7766595c5d
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-06-16 11:41:23 +02:00
9ed42794a7
Recover fhcdb_helper
2016-06-16 11:40:49 +02:00
6536ff155c
- Moved the _validate method from the controller Person to the model Person_model
...
- Fixed method _validate
2016-06-15 14:09:01 +02:00
149b04654a
Added the method getOnlyKontaktByPersonID to controller Kontakt
2016-06-15 11:30:22 +02:00
28751df237
Merge origin/ci into ci
2016-06-15 11:23:03 +02:00
8d109cf170
DMS bugfix: if no version is submitted
2016-06-15 11:22:45 +02:00
86a98e9a8c
added parse data method
2016-06-15 10:38:19 +02:00
8c555944e2
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-06-15 08:12:23 +02:00
2aa8cff74d
added parse data method to model
2016-06-15 08:10:15 +02:00
3df35d0ed5
- Added method getOnlyKontakt to controller Kontakt
...
- Added method getAkten to the controller Akte
2016-06-14 15:26:51 +02:00
dfa5b0386d
- Added method getOnlyKontakt to controller Kontakt
2016-06-14 15:23:08 +02:00
a8b7be6ad5
- Added controller CheckUserAuth to authenticate the end user
...
- FHC_Auth now extends directly authentication
2016-06-14 15:19:34 +02:00
fadb2fb792
Merge origin/ci into ci
2016-06-10 18:11:17 +02:00
ffa0bdc947
- Moved old libraries to CI
...
- Bugfixes
2016-06-10 18:09:54 +02:00
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
850777476e
Message
2016-06-09 10:00:23 +02:00
d237915e80
- Added file read/write from/to file system functionality in Dms
2016-06-08 17:52:14 +02:00
3955d4b395
- Moved old libraries to CI
...
- Extended Controllers functionalities
- Added controls to ueberbuchung.php, zeitwuensche.php and funktion_det.php
pages to avoid warnings and notices, especially when no data are in DB
- Removed fhcdb_helper.php because it's no more needed
2016-06-07 17:55:31 +02:00
0dc605df3c
- Modified FHC_Model, now it is saving uid in CI session
...
- Added codeception tests
- Added statistik to dump.sql
- Moved old libraries to CI
2016-06-06 16:36:23 +02:00
dabcf8188b
- Modified FHC_Model contructor to get UID from vilesci authentication
...
- Copied functionalities from old libraries to controllers
- Ported old libraries to CI
- Modified codeception
2016-06-03 16:19:06 +02:00
efe7355a4d
Merge origin/ci into ci
2016-05-25 18:36:35 +02:00
00211ee647
- Added codeception test cases
...
- Moved old libraries to CI
2016-05-25 18:36:18 +02:00
dc991d7876
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-24 17:19:33 +02:00
70fba4d267
- Added property hasSequence to class DB_Model.
...
This property is used to indicate if the represented table has a primary
key that uses a sequence (true, otherwise false. Default is true).
- Method insert of DB_Model now checks the property hasSequence.
If it is true it uses the method insert_id() to return the primary key
of the row just inserted.
For any other values the method returns the primary key inserted coping
it directly from the parameters.
- Set the property hasSequence to false in the constructor of model Prestudentstatus
2016-05-24 16:56:14 +02:00
932243ccef
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-24 15:33:23 +02:00
e76e1af15c
- Remove parameters "new" after checked it in method postPrestudentstatus of controller Prestudentstatus
...
- Method insert of DB_Model doesn't use anymore insert_id() from CI because it forces to have a sequence
and doesn't return the primary key when it's composed by more columns
2016-05-24 15:04:35 +02:00
1026447281
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-24 13:28:19 +02:00
eb845241d1
fixed error in save method
2016-05-24 13:26:07 +02:00
4f8826dc3f
Merge origin/ci into ci
...
Conflicts:
application/controllers/api/v1/crm/Prestudentstatus.php
2016-05-24 12:32:32 +02:00
bb3f8ef617
- Added method getStudienplan to the controller Studienplan
...
- Introduced parameter new in method postPrestudentstatus of the controller Prestudentstatus
2016-05-24 12:28:49 +02:00
71f3b91516
removed debugging code
2016-05-24 10:05:43 +02:00
paolo