blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-20 21:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,012 Commits 227 Branches 6 Tags
e2744500a698a4b0efa82560b1e0bad53152a4ce
Commit Graph

13 Commits

Author SHA1 Message Date
root e2744500a6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/core/FHC_Controller.php
 2016-06-21 16:31:06 +02:00
root ca83b2f59d phrases system 2016-06-21 16:25:55 +02:00
paolo 5a5472257a - Modified MessageLib constructor to allow to give the parameter UID from a Controller 
- Controller Message now works with MessageLib
- Added getMessagesByPersonID method to controller Message
- Added permissions basis/message and fs/system to dump.sql
 2016-06-21 15:07:51 +02:00
Paminger dbe19fafb5 Messages 2016-06-21 11:27:36 +02:00
Paminger 4c58b95728 Libs and Vorlagen 2016-06-17 00:12:46 +02:00
Paminger 9ed42794a7 Recover fhcdb_helper 2016-06-16 11:40:49 +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 5d7d79b086 - Renamed every controller that has conflicts with class name 
- Added routes to renamed controllers
 - Fixed controllers parameters in get method
 2016-05-18 11:24:10 +02:00
Paminger 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
Paminger e624540c16 Message 2016-05-10 14:12:33 +02:00
paolo 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
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00