blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-03 11:59:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,982 Commits 227 Branches 6 Tags
28751df23770ee2e92c38ddbd0b60761c2a14686
Commit Graph

6982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
paolo 28751df237 Merge origin/ci into ci 2016-06-15 11:23:03 +02:00
paolo 8d109cf170 DMS bugfix: if no version is submitted 2016-06-15 11:22:45 +02:00
Stefan Puraner 86a98e9a8c added parse data method 2016-06-15 10:38:19 +02:00
Stefan Puraner 8c555944e2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-15 08:12:23 +02:00
Stefan Puraner 2aa8cff74d added parse data method to model 2016-06-15 08:10:15 +02:00
paolo 3df35d0ed5 - Added method getOnlyKontakt to controller Kontakt 
- Added method getAkten to the controller Akte
 2016-06-14 15:26:51 +02:00
paolo dfa5b0386d - Added method getOnlyKontakt to controller Kontakt 2016-06-14 15:23:08 +02:00
paolo a8b7be6ad5 - Added controller CheckUserAuth to authenticate the end user 
- FHC_Auth now extends directly authentication
 2016-06-14 15:19:34 +02:00
paolo f5ebe0c42b Extended db_extra 2016-06-13 18:08:01 +02:00
paolo fadb2fb792 Merge origin/ci into ci 2016-06-10 18:11:17 +02:00
paolo ffa0bdc947 - Moved old libraries to CI 
- Bugfixes
 2016-06-10 18:09:54 +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
paolo d237915e80 - Added file read/write from/to file system functionality in Dms 2016-06-08 17:52:14 +02:00
paolo 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
paolo 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
paolo 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
paolo efe7355a4d Merge origin/ci into ci 2016-05-25 18:36:35 +02:00
paolo 00211ee647 - Added codeception test cases 
- Moved old libraries to CI
 2016-05-25 18:36:18 +02:00
Stefan Puraner dc991d7876 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-24 17:19:33 +02:00
paolo 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
Stefan Puraner 932243ccef Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-24 15:33:23 +02:00
paolo 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
Stefan Puraner 1026447281 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-24 13:28:19 +02:00
Stefan Puraner eb845241d1 fixed error in save method 2016-05-24 13:26:07 +02:00
paolo 4f8826dc3f Merge origin/ci into ci 
Conflicts:
	application/controllers/api/v1/crm/Prestudentstatus.php
 2016-05-24 12:32:32 +02:00
paolo 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
nscbrandb 58e9eb37a2 Merge pull request #3 from nscbrandb/ci 
Ci
 2016-05-24 11:48:09 +02:00
Stefan Puraner 71f3b91516 removed debugging code 2016-05-24 10:05:43 +02:00
Stefan Puraner facb7750d7 added method to get all data 2016-05-24 09:27:27 +02:00
paolo c6efbac308 - Added permission "basis/dms_version" for table campus.tbl_dms_version 
- Added dms functionalities to relative controller and model
 2016-05-23 15:34:59 +02:00
nscbrandb 42d0ef79fd undoing ci_hack.php 2016-05-23 11:44:03 +02:00
nscbrandb 419ca7ac46 Merge branch 'ci' of https://github.com/nscbrandb/FHC-Core into ci 
Conflicts:
	ci_hack.php
 2016-05-23 11:35:23 +02:00
paolo 489848c629 Merge origin/ci into ci 2016-05-23 10:32:50 +02:00
paolo a34f82fd3c - Added permission "basis/studienplan_semester" for table lehre.tbl_studienplan_semester 
- Added method getStudienplaeneFromSem in controller Studienplan
- Added method getNextStudiensemester in controller Studiensemester
 2016-05-23 10:32:21 +02:00
nscbrandb 3bf093fd2c Fix 2016-05-23 09:44:01 +02:00
Stefan Puraner cf272c0e40 added method to parse post data 2016-05-20 17:34:22 +02:00
Stefan Puraner dfea2bab26 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 16:11:56 +02:00
paolo 606bd3d342 Added method PrestudentByPersonID to Prestudent controller 2016-05-20 14:07:31 +02:00
paolo 3e6ac6987e Merge origin/ci into ci 2016-05-20 13:04:41 +02:00
paolo 6b1968ae5b Codesniffer compliant: if, for and while 2016-05-20 13:04:25 +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
paolo cd10d96c91 - Added permissions and linked them to user admin in dump.sql 
- Modified validate methods to public for classes benutzer, student and mitarbeiter
 2016-05-20 12:09:18 +02:00
Stefan Puraner da8f7251e0 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 11:22:23 +02:00
paolo e5554ad1ba Merge origin/ci into ci 2016-05-20 11:05:12 +02:00
paolo ffac4458ef Added permissions for user amdin in the DB 2016-05-20 11:04:51 +02:00
Paminger ffac73c447 GitIgnore 2016-05-20 11:03:45 +02:00
paolo 3c6638fac6 Added permissions for user amdin in the DB 2016-05-20 11:01:52 +02:00
Paminger d4994c95e9 New Build Folder 2016-05-20 10:38:28 +02:00