Commit Graph

118 Commits

Author SHA1 Message Date
Harald Bamberger ad0fccab6a Merge branch 'master' into merge_FHC4_C4 2025-01-28 13:20:32 +01:00
Harald Bamberger 39c2e44719 sancho default sender konfigurierbar machen 2025-01-28 10:22:30 +01:00
SimonGschnell e53dae24e6 update(Calendar Locale): updates the locale used by the english language to en-GB instead of en-US 2025-01-27 13:24:47 +01:00
Alexei Karpenko e65322965f sancho mail: added config for haeder/footer image path, renamed custom mail config entries to sancho mail config entries, images are always attached inline (when using Code Igniter) 2025-01-20 16:24:56 +01:00
Harald Bamberger 71d1a808f8 Merge branch 'master' into feature-18073/No-Reply-for-Sanchomails 2025-01-20 13:36:17 +01:00
Alexei Karpenko ece4f4a8b5 sancho mails: enabled removing of header/footer and custom header/footer images in code igniter code, legacy code: global ids for images are created only if config is set 2025-01-15 16:52:11 +01:00
SimonGschnell 26348bed80 update(FHC_JS_DATA_STORAGE_OBJECT/Sprachen.js): adds server_languages and their locale to FHC_JS_DATA_STORAGE_OBJECT and updates Sprachen.js accordingly 2025-01-08 11:15:55 +01:00
SimonGschnell 6361d40356 update(WeekCalendarHeader):uses the last day of the week instead of the first day of the week for the calendar title 2025-01-07 15:26:08 +01:00
Harald Bamberger d4494836b1 fix file permissions erroneously commited as a21a292da6 2024-10-17 15:34:00 +02:00
Harald Bamberger ff51d3964f Merge branch 'feature-40842/DashboardAmpeln' into feature-25999/C4 2024-09-09 12:56:55 +02:00
Harald Bamberger a8141e5dac Merge branch 'master' into feature-25999/C4 2024-09-09 11:45:10 +02:00
SimonGschnell 3f86961bda adds parameter to ampeln deadline/overdue phrase 2024-08-07 15:21:22 +02:00
SimonGschnell d4e33eb1df refactor 2024-08-01 15:04:18 +02:00
SimonGschnell 2c45478877 fixes the fetched ampeln in the ampelWidget 2024-07-29 13:17:29 +02:00
Harald Bamberger 115151473a backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch 2024-07-11 11:57:45 +02:00
SimonGschnell 04f6ee6156 Merge branch 'master' into feature-25999/C4_ma0594dev 2024-02-15 15:16:07 +01:00
SimonGschnell a21a292da6 dokument upload 2024-01-29 16:48:41 +01:00
Harald Bamberger cf40f33fc6 prevent returning html entities in sanitizeProblemChars helper 2024-01-25 12:44:20 +01:00
Harald Bamberger 4cc8b555d2 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-10-09 11:38:37 +02:00
Harald Bamberger c1171bc716 add user_language to FHC_JS_DATA_STORAGE_OBJECT 2023-10-04 12:20:44 +02:00
cgfhtw 64ce3d1f6a Cleaned up commit from 'feature-27351/Digitalisierung_Formulare_Abmeldung_Unterbrechung_Wiederholung' 2023-07-04 10:34:14 +02:00
Paolo 06179ee714 Code quality check fixes 2023-03-23 14:38:42 +01:00
Paolo 537ce0940c Code quality check improvements 2022-08-31 15:48:35 +02:00
Paolo 137af3ef71 Fixed typo 2022-07-12 14:10:47 +02:00
Paolo ae70dbcb64 Fixed includes of filter type in FilterCmptLib when it is declared in an extension 2022-07-12 14:09:17 +02:00
Paolo 60b3be3d64 - Added new JS public/js/RESTClient.js as axios wrapper
- composer.json: added axios from github
- Added new directory application/components/extensions/
- Added new utility function findResource to application/helpers/hlp_common_helper.php
- Now the library libraries/FilterCmptLib loads the component definition php files from the extensions
- views/system/logs/logsViewer now includes axios and restclient, removed the includes for ajaxlib and jQueryUI
- Added includes for the RESTClient and axios to views/templates/FHC-Common and views/templates/FHC-Footer
- Improved component js/components/Fetch
- Components public/js/components/Filter.js and public/js/components/Navigation.js now they are making use of the Fetch component or/and the RESTClient
2022-07-04 19:25:16 +02:00
Paolo 24b78454d3 - Added new function generateJSModulesInclude to application/helpers/hlp_header_helper.php
- Added entry "customJSModules" to the application/views/templates/FHC-Footer.php to be passed to the generateJSModulesInclude function to generate JS modules tags
- The new VUE components are making use of the JS import and export functionalities
2022-06-24 15:07:50 +02:00
Cris efcef48f89 Changed Sanchomail 'From' to noreply 2022-05-09 11:14:01 +02:00
Cris 37f6a0caaa Merge branch 'master' into feature-15391/Positive_Zeitsperre
# Conflicts:
#	system/dbupdate_3.3.php
2022-03-23 16:29:10 +01:00
Paolo 2adfa8a09c Fixed check in hlp_header_helper->printRefreshMeta function 2022-03-08 14:52:44 +01:00
Paolo 78a5f65025 - Added new parameter refresh to the view /views/templates/FHC-Header.php
- /views/templates/FHC-Header.php calls the helper function printRefreshMeta
- Added new function printRefreshMeta to application/helpers/hlp_header_helper.php
2022-03-08 14:46:38 +01:00
Cris 642ba32e0b Merge branch 'master' into feature-15391/Positive_Zeitsperre 2022-02-10 10:51:08 +01:00
Cris c2d9afe3b1 Added return value to sendSanchoMail to be able to handle mail error 2021-12-20 09:51:18 +01:00
KarpAlex 4f0b34137b replacement of hatschek letters added in hlp_common_helper.php to be the same as in function.inc.php 2021-10-11 18:48:25 +02:00
alex 676b3b3039 - added sanitizeProblemChars to common helper for sanitizing chars
- improved alias handling in benutzermodel
- added kurzbz handling to employeemodel
2020-08-12 21:33:08 +02:00
Cris 8be6552235 Added check if language isset in COOKIE in hlp_language_helper 2020-05-07 14:48:05 +02:00
Cris 637dbefce0 Removed user_language property from FHC_JS_DATA_STORAGE_OBJECT
To persist on a consistent translation system, the translation should be
performed by phrases system on serversite.
Therefore the user_language property is removed from
FHC_JS_DATA_STORAGE_OBJECT.
2020-04-20 14:55:01 +02:00
Andreas Österreicher cee3d7bdd3 Merge branch 'feature-5883/DigitalerLehrauftrag_ColumnPicker' into review/DigitaleLehrauftraege 2020-04-17 09:33:32 +02:00
Andreas Österreicher 3855d6eb18 Vorlageermittlung korrigiert bei Sancho Mails damit immer die letzte aktive Vorlage genommen wird 2020-04-15 11:07:48 +02:00
Cris fe9e222182 Introduced user_language to FHC_JS_DATA_STORAGE_OBJECT
This is to retrieve easily user language via Javascript.
Retrieving using the storage will not cause any async issues as an
AJAX Call would do.
2020-04-02 15:46:07 +02:00
Paolo 15b3532359 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-02-04 17:16:17 +01:00
Andreas Österreicher 16f6bdbf70 Merge branch 'feature-5128/FHC-IDAM_account_activation' 2020-02-03 14:53:24 +01:00
Paolo 47682f37df Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-16 16:36:57 +01:00
Paolo 4e6fc7c607 - Create new function getError in helper hlp_return_object_helper that should just returns retval
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
2019-12-18 18:35:19 +01:00
Paolo 0319d0cc2a - Added new constants in config/constants.php:
- LANG_SESSION_ACTIVE_LANGUAGES
        - LANG_SESSION_CURRENT_LANGUAGE
- Added new functions in helper hlp_language_helper:
        - setUserLanguage
        - getDBActiveLanguages
        - getActiveLanguages
- Adapted code to make use of them
- Added new controller controllers/widgets/Language
2019-11-26 15:24:26 +01:00
Paolo ceb3f212c9 - Added support for language in session in function getUserLanguage from helper hlp_language_helper
- If the language is loaded from database then it is checked that the language is enabled
2019-11-22 12:05:07 +01:00
Andreas Österreicher 5be68be408 Added Anti-Cache Functionality 2019-10-29 14:49:35 +01:00
Paolo bc9a5b4b06 Added new functions getAuthFirstname and getAuthSurname to helper hlp_authentication_helper 2019-10-02 16:33:44 +02:00
Paolo 27ccd086ac - Added new functions getAuthFirstname and getAuthSurname to helper hlp_authentication_helper
- Added methods getReceivedMessages and getSentMessages to model system/Recipient_model.php
- Added jqueryui and dialoglib to view system/messages/ajaxRead
- Added method prepareAjaxRead to model CL/Messages_model
- Removed private method _getAuthUser from model CL/Messages_model
- Adapted code in model CL/Messages_model to use functions isLogged and getAuthPersonId
2019-06-24 17:32:31 +02:00
Paolo 5072088e0d Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2019-06-21 13:35:28 +02:00