Commit Graph

60 Commits

Author SHA1 Message Date
Andreas Österreicher 491f025364 Merge branch 'feature-15970/kartenterminal' 2022-05-03 10:18:40 +02:00
Paolo 45124fac01 Merge branch 'master' into feature-17671/Automated_checks_project_quality 2022-04-12 17:15:09 +02:00
Harald Bamberger fce72b1f91 fix merge conflicts after merging master 2022-03-28 11:59:26 +02:00
Paolo 693832c1cd Changed chriskacerguis/codeigniter-restserver to be used only with version 3.0.3 2022-03-17 11:57:44 +01:00
Paolo 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
Paolo c8ebcdf5a1 Updated composer.json 2021-11-23 09:53:24 +01:00
ma0048 cf1b34769c api & anpassungen fuer das kartenterminal 2021-11-12 12:16:35 +01:00
Andreas Österreicher 16f6bdbf70 Merge branch 'feature-5128/FHC-IDAM_account_activation' 2020-02-03 14:53:24 +01:00
Paolo 13e24230bc Fixed font awesome in composer and gitignore 2020-01-21 12:18:08 +01:00
Paolo 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
Paolo 6bf7d46ace - Added securimage via composer
- Added securimage in application/views/templates/FHC-Header.php
2019-11-18 15:04:52 +01:00
Paolo ed818c72d9 Merge branch 'master' into feature-4026/TabulatorWidget 2019-11-04 15:08:42 +01:00
Andreas Österreicher 49f7f61273 Merge branch 'feature-3801/Use_different_source_CI_REST' 2019-10-29 15:17:38 +01:00
alex d06c03f0db - updated pivottable in composer to v 2.21.0 2019-08-30 15:52:47 +02:00
Paolo d2e8b01e30 - codeigniter-restserver is now provided and loaded via composer (libraries/REST_Controller.php, config/rest.php, language/english/rest_controller_lang.php, libraries/Format.php, etc)
- Added new core controller core/RESTFul_Controller.php that extends REST_Controller and partially overrides part of the latter
- Changed application/config/rest.php to keep the minimal useful set of configs
- Controllers core/APIv1_Controller, controllers/api/v1/CheckUserAuth.php and controllers/api/v1/Test.php now extend core/RESTFul_Controller
- Changed method _remap interface for core/APIv1_Controller
- Removed application/core/REST_Controller.php
- Removed application/libraries/Format.php
- Removed application/language/english/rest_controller_lang.php
2019-07-31 14:46:31 +02:00
Paolo 2922aa26fe Added tabulator to composer, FHC-Header and a CSS for it 2019-07-09 11:57:52 +02:00
Paolo 1121eb8352 - Updated composer.json and composer.lock
- Changed phpci.yml to be used with the new CI machine
2019-05-16 12:58:59 +02:00
Paolo d6576dbd49 Updated composer files 2019-05-14 13:01:25 +02:00
alex 6695bf027e added nategood/httpful to composer in core 2018-09-13 09:51:28 +02:00
Andreas Österreicher d47b844773 Added Missing Library for Screen-rebooting to Composer 2018-07-25 14:46:00 +02:00
Paolo 02cde41939 - Renamed function backwardCompatibleJSMsIe to generateBackwardCompatibleJSMsIe in fhc_header_helper
- Now function fhc_header_helper accept the path and file name as parameter
- Added jquerytreetable to FHC-Header
- Fixed includes in FHC-Header
- Now composer uses as much as possible stable releases of the packages (no git directly, no master branch directly...)
- Updated composer.json and composer.lock
2018-07-11 15:44:13 +02:00
Paolo 04e2e1c54b - Moved functions from FHC-Header to fhc_header_helper
- Added function backwardCompatibleJSMsIe to fhc_header_helper for backward compatibility with older versions of MS IE
- FHC_Controller now loads helper fhc_header too
- Added afarkas/html5shiv and scottjehl/Respond to composer
- Rename function sendMail in fhc_sancho_helper.php to sendSanchoMail
2018-07-11 13:43:18 +02:00
alex 9e743089c2 table footer line e.g. for sums 2018-04-30 17:58:48 +02:00
Cris 51f6d4545f Added sancho ampel-erinnerungsmail 2018-04-25 11:24:40 +02:00
Paolo a768295db0 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-01-24 17:41:16 +01:00
alex fe8e5ed507 added mottie tablesorter, removed datatables and datepicker, restyled tablesorter for better bootstrap look, layout changes 2018-01-24 17:29:12 +01:00
Paolo 6456ad7b06 - Now composer install version >3 of components/jquery
- Added new entry in composer to install the version 2 of jquery
- Updated all the paths for jquery2
- Changed name of parameter jquery3 to jquery in FHC-Header
- Updated pages that use FHC-Header
- Removed components/bootstrap from composer
- Added twbs/bootstrap to composer
- Updated pages that use bootstrap with the correct path
2018-01-24 17:10:08 +01:00
alex 0e6e6ab8ea added bootstrap datepicker, dokumente nachgereicht in separate table, zgv panels collapsible and Interessenten come first, made columns more responsive 2018-01-10 09:53:34 +01:00
alex 00dbedc040 added jqueryui, bootstrap, fontawesome, datatables (new tablesorter) 2018-01-05 12:45:58 +01:00
Paolo 0bc0a09bf4 - Removed file system execute permission for all files (no directories)
- application/extensions file system permission now is 775
- application/logs file system permission now is 775
- Added extensions directory in application/: config, controllers, helpers, hooks, libraries, models, views and widgets
- Added view views/extensions/manage.php
- Added controller controllers/system/extensions/Manager.php
- Added library ExtensionsLib to manage extensions
- Added model models/system/Extensions_model.php
- Moved code related to print out info from MigrationLib to EPrintfLib
2017-11-13 10:45:49 +01:00
Paolo f255403af2 Added jquery-archive/jquery-metadata in composer 2017-10-12 14:10:17 +02:00
Paolo f8c2f257b2 Added nicolaskruchten/pivottable to composer 2017-10-11 12:12:13 +02:00
Paolo 7dd516756b - Removed .gitmodules
- Removed directory submodules and content
- Removed wikimedia from composer
- Updated composer.json and composer.lock
2017-10-11 12:01:40 +02:00
Paolo 88cb088016 - Updated CHANGELOG.md
- Updated composer.json
- Updated composer.lock
2017-09-14 18:13:05 +02:00
Paolo bcd84512f5 Second commit 2017-09-11 16:06:56 +02:00
Paolo b0806f263b First commit 2017-09-08 19:15:21 +02:00
Paolo fbb4a492b5 Added jquery/jquery1.9 to composer requirements (composer.json) 2017-08-25 12:58:07 +02:00
Paolo f4cd573395 - added rmariuzzo/jquery-checkboxes to composer requirements
(composer.json)
- removed js include/js/jquery.checkboxes-1.0.7.min.js
- replaced jquery.checkboxes-1.0.7.min.js path with the new path
2017-08-25 12:24:04 +02:00
Paolo 921bdd1242 - beautified composer.json
- added borgar/textile-js to composer requirements (composer.json)
- removed textile.min.js from include directory
- replaced old textile js path with the new one in header.php
- changed the call of js textile in application/views/system/phraseinhaltEdit.php
2017-08-25 11:27:41 +02:00
alex afd1667645 GUI für Studiensemester und Studienjahr hinzugefügt 2017-08-01 14:50:19 +02:00
oesi b8177b58e8 Merge branch 'master' into ci
Conflicts:
	composer.json
	composer.lock
	phpci.yml
	system/checksystem.php
	system/dbupdate_3.2.php
	tests/codeception/_data/dump.sql
	tests/codeception/tests/acceptance/CISLoginPage.php
2017-01-20 11:05:08 +01:00
Andreas Moik 526e3013e0 cleanups 2016-12-05 14:05:05 +01:00
Andreas Moik 6a1d864a4f - jsoneditor included via composer
- meta-include for jsoneditor
- new composer.lock version
2016-12-05 11:24:11 +01:00
Andreas Moik 92544007eb added textile in composer 2016-09-07 11:29:56 +02:00
paolo 4b82843c76 - Added parameter blockTags to controller Phrase
If this parameter is set to "no", it will be removed the tags <p> and </p>
from the beginning and from the end of the returned phrases
2016-07-29 15:36:32 +02:00
paolo 91ad613884 - Try fixing phpC(dis)I 2016-07-08 15:37:02 +02:00
paolo ba1c637ca4 Method getPhrases of library PhrasesLib now returns the text of a phrase
converted from textile to html
2016-07-06 16:07:17 +02:00
Paminger 377b1ecdd0 JSON-Forms 2016-06-19 19:41:10 +02:00
Paminger 9ed42794a7 Recover fhcdb_helper 2016-06-16 11:40:49 +02:00
nscbrandb e34bda9649 Composer Merge-Plugin für AddOn-spezifische composer.json's 2016-05-17 15:47:33 +02:00