Commit Graph

1586 Commits

Author SHA1 Message Date
paolo 58a6da42ae The method loadWhole has been removed from model DB_Model.
The same functionality has given by calling the load method without parameters
2016-06-24 10:39:52 +02:00
paolo 3fdf54c1d1 - Added method sendMessageVorlage to MessageLib
- Fixed method loadVorlagetext in VorlageLib
- Changed query in method getMessagesByPerson of Message_model
2016-06-23 15:42:43 +02:00
paolo 38c98531ed Fix: DBTools $seed_path property is now set in the constructor, APPPATH is not always replaced
Fix: Set the right value of seq_vorlagestudiengang_vorlagestudiengang_id before the insert
2016-06-23 12:29:58 +02:00
paolo 8df43d4b6f Merge origin/ci into ci 2016-06-23 10:34:54 +02:00
paolo 226d1652ef Merge 2016-06-23 10:34:42 +02:00
Paminger 4f14e7fa92 Messages Inbox Outbox 2016-06-23 10:28:26 +02:00
Gerry Raab ab4c8ac373 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 17:20:18 +02:00
Gerry Raab c8e4b463b5 new phrase inhalt 2016-06-22 17:19:43 +02:00
paolo d757c413e5 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 15:00:23 +02:00
paolo f35ede3974 - Added Phrase controller
- Phrase controller has the method getPhrases() to get sentences translated into several languages
- Added method getPhrases to PhrasesLib
- Modified the PhrasesLib constructor to pass the uid to the models
- Added method getPhrases to Phrase_model
2016-06-22 14:59:49 +02:00
Gerry Raab 437959221e sprache widget added 2016-06-22 13:09:16 +02:00
Gerry Raab 642f700cae phrases textile prev 2016-06-22 10:42:32 +02:00
paolo 95801a2e70 - Fix: Message_model queries does not get body from tbl_msg_message
- Added method getMessagesByUID to Message controller
2016-06-22 10:34:28 +02:00
paolo d425653d86 Modified _validate method of Message controller, now it returns a standard
error or success message
2016-06-22 09:35:36 +02:00
Paminger f2fdc62b44 BugFix 2016-06-22 08:18:53 +02:00
Paminger 49ebc3945b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 08:11:59 +02:00
Paminger 70e83b6e18 Messages 2016-06-22 08:11:04 +02:00
root 25e0ba9407 basic phrases editing 2016-06-22 01:24:59 +02:00
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
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 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
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
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 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
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