blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-23 23:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,334 Commits 228 Branches 6 Tags
ec00c93d04fd0389fe87a7fbceae36727f4584ce
Commit Graph

8334 Commits

This Branch
This Branch
All Branches
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 971e4ed6de Fixed controller message parameters validation 2016-06-21 15:21:51 +02:00
Gerald Raab b14a1f30ba Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-21 15:10:15 +02:00
Gerald Raab 3c93439955 ital phrases 2016-06-21 15:09:49 +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
oesi fab06f9ddb Neue Funktionen für Zugriff auf Studienplaene hinzguefügt 2016-06-21 14:30:11 +02:00
Paminger 6e62fbdcd4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/views/templates/footer.php
	application/views/templates/header.php
 2016-06-21 11:28:46 +02:00
Paminger dbe19fafb5 Messages 2016-06-21 11:27:36 +02:00
paolo 6dc145d618 Merge origin/ci into ci 2016-06-21 11:11:14 +02:00
paolo 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
Andreas Moik 7758fa3807 fixed timestamp bug in eventkalender 2016-06-20 14:46:55 +02:00
Paminger 834b119f9c BugFix 2016-06-20 13:03:59 +02:00
Paminger 68963a962a BugFix 2016-06-20 08:36:37 +02:00
Paminger 377b1ecdd0 JSON-Forms 2016-06-19 19:41:10 +02:00
Gerald Raab f2b45b7f2a ital phrases 2016-06-19 19:03:11 +02:00
Paminger 83540e068a VorlageExtension 2016-06-18 11:32:29 +02:00
Paminger 3d45527a5d TemplateParser 2016-06-18 09:11:00 +02:00
Paminger b5d14fb59f BugFix 2016-06-17 23:12:07 +02:00
Paminger 7aea047537 Templates 2016-06-17 23:09:50 +02:00
Paminger a987eba1ac Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-17 00:13:35 +02:00
Paminger 4c58b95728 Libs and Vorlagen 2016-06-17 00:12:46 +02:00
paolo 3397192298 Fix: check if data are present 2016-06-16 18:02:18 +02:00
paolo 8b5fb84d0e Merge origin/ci into ci 2016-06-16 15:11:36 +02:00
paolo e5cd3c5a9e Fixed header.php: removed body tag 2016-06-16 15:11:20 +02:00
Gerald Raab ef025b674e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-16 12:31:49 +02:00
Gerald Raab 8a64b70ea2 rights for phrase 2016-06-16 12:31:20 +02:00
paolo c5ee56f23d Moved _validate method from the model Person_model to the controller Person 2016-06-16 12:18:29 +02:00
paolo 13a07e2207 Merge origin/ci into ci 2016-06-16 12:16:10 +02:00
paolo 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
Gerald Raab 6574af6518 DB add tables for phrases 2016-06-16 12:10:11 +02:00
Paminger 7766595c5d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-16 11:41:23 +02:00
Paminger 9ed42794a7 Recover fhcdb_helper 2016-06-16 11:40:49 +02:00
kindlm c4ebb5a395 Mlists_generate 
Mailverteiler tw_stgl um StellvertreterInnen erweitert
 2016-06-15 16:24:48 +02:00
kindlm 0b4bc2b70b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-15 15:40:08 +02:00
kindlm 41f9f5def4 PDF-Export 
Werden PreStudent-IDs übergeben, wird die Vorlage des betreffenden
Studiengangs ermittelt.
Beim archivieren von Dokumenten wird nun das Style der DB berücksichtigt
 2016-06-15 15:36:42 +02:00
paolo 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
paolo 149b04654a Added the method getOnlyKontaktByPersonID to controller Kontakt 2016-06-15 11:30:22 +02:00
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
Gerald Raab a4fbebbf30 layout pruefungsanmeldeliste, ital phrases 2016-06-15 00:38:19 +02:00
oesi a09a892b0b Automatische Gruppe für alle Leitungen hinzugefügt 2016-06-14 17:12:41 +02:00
oesi 7ba5026436 Personen ohne RTGesamtpunkte werden nicht berücksichtigt 
Wenn zu weniger Bewerber als APZ vorhanden sind wird die Anzahl der Personen aufgrund der Gesamtzahl der Bewerber berechnet anstatt anhand der APZ
 2016-06-14 17:09:49 +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
Andreas Moik c57b84d10c implemented the aliquote reduction 2016-06-14 10:11:16 +02:00