composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-26 13:44:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,369 Commits 150 Branches 134 Tags
12ef74ec42b89aa2800a2998bd4fb9f78cecd2fd
Commit Graph

56 Commits

Author SHA1 Message Date
Benjamin Dalsass
0819b9baba Merge remote-tracking branch 'origin/support/2.7' into support/3.0 
# Conflicts:
#	composer.json
#	composer.lock
#	core/config.class.inc.php
#	core/dbobject.class.php
#	core/email.class.inc.php
#	datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
#	datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
#	datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
#	dictionaries/cs.dictionary.itop.core.php
#	dictionaries/cs.dictionary.itop.ui.php
#	dictionaries/da.dictionary.itop.core.php
#	dictionaries/da.dictionary.itop.ui.php
#	dictionaries/de.dictionary.itop.core.php
#	dictionaries/de.dictionary.itop.ui.php
#	dictionaries/en.dictionary.itop.ui.php
#	dictionaries/es_cr.dictionary.itop.core.php
#	dictionaries/es_cr.dictionary.itop.ui.php
#	dictionaries/fr.dictionary.itop.core.php
#	dictionaries/fr.dictionary.itop.ui.php
#	dictionaries/hu.dictionary.itop.core.php
#	dictionaries/hu.dictionary.itop.ui.php
#	dictionaries/it.dictionary.itop.core.php
#	dictionaries/it.dictionary.itop.ui.php
#	dictionaries/ja.dictionary.itop.core.php
#	dictionaries/ja.dictionary.itop.ui.php
#	dictionaries/nl.dictionary.itop.core.php
#	dictionaries/nl.dictionary.itop.ui.php
#	dictionaries/pt_br.dictionary.itop.core.php
#	dictionaries/pt_br.dictionary.itop.ui.php
#	dictionaries/ru.dictionary.itop.core.php
#	dictionaries/ru.dictionary.itop.ui.php
#	dictionaries/sk.dictionary.itop.core.php
#	dictionaries/sk.dictionary.itop.ui.php
#	dictionaries/tr.dictionary.itop.core.php
#	dictionaries/tr.dictionary.itop.ui.php
#	dictionaries/zh_cn.dictionary.itop.core.php
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	sources/application/TwigBase/Controller/Controller.php
#	sources/application/TwigBase/Twig/TwigHelper.php
 2022-06-02 16:30:48 +02:00
Eric Espie
eb1d56f439 N°3169 - Add feature to connect Gsuite mail box with OAuth 
N°2504 - Add feature to connect Office mail box with OAuth2 for Microsoft Graph
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
 * 2.7 migration
 2022-05-16 14:51:12 +02:00
Pierre Goiffon
6a5840ed82 Merge remote-tracking branch 'origin/support/2.7' into support/3.0 
# Conflicts:
#	lib/composer/installed.php
#	setup/licenses/community-licenses.xml
#	setup/setuputils.class.inc.php
#	sources/application/TwigBase/Controller/Controller.php
 2022-02-14 08:41:33 +01:00
Molkobain
c9d02826a0 Code cleanup (indentation and PHPDoc) 2022-02-09 19:28:21 +01:00
Pierre Goiffon
47db04bcb7 💡 N°4760 Add complement in phpdoc 2022-02-09 11:48:17 +01:00
Pierre Goiffon
a49c451ae4 💡 N°4760 Fix wrong phpdoc 2022-02-09 11:43:42 +01:00
Pierre Goiffon
3000659e86 🎨 Change disable breadcrumb method name to clarify usage 
Thanks @eespie for the review !
 2022-02-08 17:04:11 +01:00
Pierre Goiffon
ce36c00b83 Remove now useless default values 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
 2022-02-08 17:04:11 +01:00
Pierre Goiffon
2a3e6384d9 ♻️ After dev team code review 2022-02-08 17:04:11 +01:00
Pierre Goiffon
dd7e73e413 🎨 Simpler code 
Thanks Hipska !
 2022-02-08 17:04:11 +01:00
Pierre Goiffon
1709082e39 Controller::CreatePage : default values for sUrl and sIcon 2022-02-08 17:04:11 +01:00
Pierre Goiffon
41f6e85673 Controller::CreatePage : use @list() intead of 3 lines with count() tests 
Thanks Hipska !

Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
 2022-02-08 17:04:11 +01:00
Pierre Goiffon
3ef3166bd5 Add new methods to override in order to control breadcrumb in Controller children classes 2022-02-08 17:04:11 +01:00
Eric Espie
0f6e0e5085 Allow file name to be set with parameters 2022-02-07 15:02:47 +01:00
acognet
17e8c53236 demove deprecated functions : replace ajax_page by AjaxPage 2022-01-21 11:52:02 +01:00
Eric Espie
b630492d7a N°4337 - Fix "Missing TWIG template" error 2021-09-29 15:16:13 +02:00
Eric Espie
eef3e9b7ae Merge branch 'develop' into SessionManagement 2021-09-07 16:33:10 +02:00
Eric
3ee9757a85 🔊 Log when no Twig template is found in controller 2021-08-26 12:06:21 +02:00
Eric
2c2155a8e0 N°3985 - Performance checks on the back end 2021-08-23 13:57:03 +02:00
Eric
ee544b646d N°4076 - PHPDoc 2021-07-26 17:48:36 +02:00
Eric
344cce9fdd N°4076 - Allow block parameters to change the behaviour of blocks on the page 2021-07-26 17:20:45 +02:00
Eric
1a7755365c 🎨 Allow tab stickiness for twig based extensions 2021-07-01 16:08:03 +02:00
Eric
e6a38a8055 N°3573 - Allow retrieving operation 2021-07-01 10:40:04 +02:00
Eric
d594f28ed9 N°3573 - Migrate backoffice pages to new UIBlock system : System Information 2021-04-09 09:55:58 +02:00
Molkobain
c3140c2db3 Copyright year bump 2021-03-12 18:48:46 +01:00
Eric
3c60e4f765 Add Toolbar factory, Use new factory entry for cancel buttons, better check of twig errors, fix fatal error page 2021-02-09 14:43:46 +01:00
odain
ed3df37176 Merge branch 'feature/3606-twigbase-controller-basichtml' into develop 2021-02-02 11:27:06 +01:00
odain
c736615de1 N°3606: clean symfony useless import 2021-02-02 11:24:06 +01:00
odain
5121ed7c39 N°3606: move whitelist feature from itop core to cbd-mon extension 2021-02-02 10:49:55 +01:00
odain
2bb1583995 N°3606: renaming 2021-01-29 10:39:41 +01:00
odain
b98ffc4b8b N°3606: add IP inside iTop error message 2021-01-29 10:01:46 +01:00
odain
818b3632ac N°3606: renaming 2021-01-29 09:24:17 +01:00
odain
7677bd7cfe N°3606: authorized_network configured as a list of ip address or networks (no more regexp, IpUtils::checkIp syntax) 2021-01-27 14:36:33 +01:00
Molkobain
1bb6d62c17 PHPDoc and code conventions 2021-01-22 11:39:49 +01:00
Eric
1fb15a421a Move class in its own file 2021-01-21 09:56:03 +01:00
Eric
392cdf6058 N°3567 - Migrate backoffice pages to new UIBlock system : App. upgrade (display twig errors) 2021-01-19 18:09:58 +01:00
Eric
21740123f4 Add UIBlocks to twig (generic parser and node) 
# Conflicts:
#	pages/run_query.php
#	test/VisualTest/Backoffice/RenderAllUiBlocks.php
 2021-01-18 12:09:07 +01:00
Eric
77808ecd41 Add UIBlocks to twig (WIP) 2021-01-18 12:03:31 +01:00
odain
07347663d6 N°3606: php doc + handle empty token/whiteliste param usecase 2021-01-18 09:37:19 +01:00
odain
9ab1a0d437 N°3606: provide a token access instead of login + network white list restriction 2021-01-18 09:37:19 +01:00
odain
b51d7409c1 N°3606: renaming 2021-01-15 11:02:37 +01:00
odain
acea2110ac N°3606 - Add a basic html page type to TwigBase Controller 2021-01-07 10:35:39 +01:00
Pierre Goiffon
96e7f57a34 Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
#	application/itopwebpage.class.inc.php
#	application/webpage.class.inc.php
#	application/xmlpage.class.inc.php
#	core/config.class.inc.php
#	css/css-variables.scss
#	datamodels/2.x/version.xml
#	pages/ajax.document.php
#	pages/ajax.render.php
#	pages/ajax.searchform.php
#	sources/application/TwigBase/Controller/Controller.php
 2020-12-10 18:08:11 +01:00
Pierre Goiffon
ecebe4ecd5 N°3416 XFrame and cache headers optimizations 
* Remove XFrame header set in \WebPage::no_cache : not this method responsability, was confusing :/
* Remove no_cache() calls when already set in page constructor (ajax_page mainly)
* Also calls everywhere the \WebPage::no_cache method instead of setting headers manually
 2020-12-02 17:19:05 +01:00
Pierre Goiffon
8bfcb14d0c N°3416 XFrame-Options header is now set using a config parameter, defaults to SAMEORIGIN 
Also adds an indirection (\WebPage::add_xframe_options) to set header
 2020-12-02 17:17:11 +01:00
Pierre Goiffon
7d26b6092e Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	.idea/codeStyles/codeStyleConfig.xml
#	.idea/inspectionProfiles/Combodo.xml
 2020-10-06 10:42:55 +02:00
Eric
d86e904e18 N°3317 - Add http headers 2020-09-29 14:11:11 +02:00
Thomas Casteleyn
6542cf9d30 Add missing " 
Co-authored-by: Eric Espié <eric.espie@combodo.com>
 2020-09-06 20:30:36 +02:00
Thomas Casteleyn
610e74e642 Fix filename headers when downloading 2020-09-06 20:30:36 +02:00
Eric
d4b93f3bf0 N°2641 - Create a dedicated ErrorPage for fatal errors 2020-06-11 17:16:47 +02:00