664796c69f
using phpunit to test controllers which are running in codeigniter3 requires further request/response mocking; setup of swagger-ui and swagger openapi doc generation for bookmark.php; WIP integration tests with ci3 & phpunit, maybe annotation generation solution for swagger annotations
2025-05-05 18:37:00 +02:00
28f11d7550
Merge branch 'bhdev_tabulator6' into merge_FHC4_C4
2025-02-28 14:35:17 +01:00
80b67ad416
add tabulator6
2025-02-27 11:35:21 +01:00
9876976c70
Merge branch 'master' into merge_FHC4_C4
2025-02-24 08:46:48 +01:00
0426e3498f
Hotfix: replaced the dead github repository from https://github.com/tomazdragar/SimpleCropper.git to https://github.com/deveshsinghal22/SimpleCropper.git
2025-01-28 15:45:40 +01:00
e2af00e41d
highcharts consolidation -> add plugin, import switch to footer and repository requirement in composer.json
2024-12-19 11:24:31 +01:00
d0266e7ef0
add vuejs3_dev to composer.json and ci javascript config file to switch between vuejs dev and prod version, alter FHC-Footer to use new config
2024-12-12 14:49:15 +01:00
2fc0827d49
revert erroneously merged pull request
2024-09-25 11:22:59 +02:00
f66c3466ed
Extend HTTP-Basic-Auth for Demo-Mode and easier testing
2024-09-25 05:40:04 +02:00
49d24d74b0
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-10 13:54:06 +01:00
20f9f52eef
Doppelten Composer Eintrag entfernt
2023-12-20 14:11:49 +01:00
72217d9793
Merge branch 'master' into feature-29144/Prestudent_status_nach_Bismeldung_sperren_2
2023-12-20 14:06:18 +01:00
ab5d0693eb
Merge branch 'feature-16354/TinyMCE_move_to_new_version' into infocenter_2023_12_04
...
# Conflicts:
# composer.lock
2023-12-04 12:44:10 +01:00
7640d4024f
alter handling of benutzerfunktion and vertragsbestandteilfunktion
2023-11-14 10:36:01 +01:00
f2208aa684
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-10 17:01:37 +01:00
18f36c9d23
update tabulator5 to version 5.5.2 to get better behaviour of frozen right column
2023-11-10 15:16:40 +01:00
441a95de7e
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-09 12:12:26 +01:00
e4a99b4c84
upgrade datepicker to version 7.2.0, change Dienstverhaeltnis class to honor checkoverlap flag
2023-11-07 11:04:39 +01:00
c12169557b
rename vuepic/vue-datepicker to vuejs/vuedatepicker
2023-11-02 16:49:38 +01:00
4cc8b555d2
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-10-09 11:38:37 +02:00
285af0a7f4
composer: updated datepicker
2023-09-27 13:52:31 +02:00
ac5d6071cd
extend VerttragsbestandteilLib to keep track on modified columns and only update dv, vbs and gbs when they differ from the status in the db
2023-07-26 16:27:34 +02:00
c2962f51e1
Bismeldestichtag gui: added vue date picker
2023-07-17 21:03:51 +02:00
1e0e93dfa3
Autocomplete Add-Button Finish
2023-07-05 13:20:46 +02:00
64ce3d1f6a
Cleaned up commit from 'feature-27351/Digitalisierung_Formulare_Abmeldung_Unterbrechung_Wiederholung'
2023-07-04 10:34:14 +02:00
ed2aa6620e
vuedatepicker added
2023-04-11 12:53:56 +02:00
c52cd05436
Merge branch 'feature-25562/PV21_Vertraege_Encryption_Merge'
2023-03-28 20:12:40 +02:00
9c0d70fe89
Removed version 4 of tinymce
2022-11-08 12:01:05 +01:00
5ea46ece47
added VueRouter to composer; integrate router.php from extensions
2022-08-15 20:25:42 +02:00
aac21c9fda
Updated composer.lock
2022-07-08 12:33:11 +02:00
19273003ee
* changed composer.json
...
* primvue is now included with help of https://asset-packagist.org/
* https://asset-packagist.org/ makes including npm packages with composer easy
2022-07-06 17:52:13 +02:00
6c618c9a20
* changed some { to [ for PHP 7.4 compatibility
...
* added some PrimeVUE 3 components to composer (currently used in organization chart of PV21 extension)
2022-07-06 17:52:13 +02:00
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
091307680b
- Sorted composer packages in composer.json
...
- New composer.lock generated
- Added new package axios
2022-06-29 10:57:08 +02:00
47f7c03075
virtualsplit and searchbar vue component, TestSearch Controller and View for Demonstration, minor change to SearchBar Controller to work with posted json
2022-06-24 19:26:37 +02:00
618a62425b
Adapted composer.json and includes to be compatible to composer version 2
2022-06-07 14:56:33 +02:00
a603081544
- Changed composer.json and updated composer.lock
...
- Added new PostgreSQL types in application/core/DB_Model.php
- Updated the includes in application/views/*
- Added new view template application/views/templates/FHC-Common.php
- Moved JS includes in application/views/templates/FHC-Footer.php
- Updated JS and CSS includes in application/views/templates/FHC-Footer.php and application/views/templates/FHC-Header.php
- Updated public/js/bootstrapper.js
- Changed global variable names in application/views/templates/FHC-Common.php to include the version of the included source
2022-05-23 18:45:29 +02:00
3d0bdcf95a
Changed composer.json and updated composer.lock
2022-05-17 16:05:02 +02:00
491f025364
Merge branch 'feature-15970/kartenterminal'
2022-05-03 10:18:40 +02:00
45124fac01
Merge branch 'master' into feature-17671/Automated_checks_project_quality
2022-04-12 17:15:09 +02:00
fce72b1f91
fix merge conflicts after merging master
2022-03-28 11:59:26 +02:00
693832c1cd
Changed chriskacerguis/codeigniter-restserver to be used only with version 3.0.3
2022-03-17 11:57:44 +01:00
c84dcd900b
- Added new composer dev packages: squizlabs/php_codesniffer phpmd/phpmd phpmetrics/phpmetrics sebastian/phpcpd
...
- Updated composer.json and composer.lock
2022-02-10 11:54:18 +01:00
c8ebcdf5a1
Updated composer.json
2021-11-23 09:53:24 +01:00
cf1b34769c
api & anpassungen fuer das kartenterminal
2021-11-12 12:16:35 +01:00
16f6bdbf70
Merge branch 'feature-5128/FHC-IDAM_account_activation'
2020-02-03 14:53:24 +01:00
13e24230bc
Fixed font awesome in composer and gitignore
2020-01-21 12:18:08 +01:00
4e43d37780
- Droped not used packages from composer.json
...
- Fixed packages version in composer.json
- Renewed file composer.lock
- Checked & Fixed imports paths
- Moved /vendor/FHC-Vendor to /FHC-Vendor
2020-01-15 18:08:29 +01:00
6bf7d46ace
- Added securimage via composer
...
- Added securimage in application/views/templates/FHC-Header.php
2019-11-18 15:04:52 +01:00
ed818c72d9
Merge branch 'master' into feature-4026/TabulatorWidget
2019-11-04 15:08:42 +01:00
Szabo Mónika