composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

Browse Source 
# Conflicts:
#	composer.json
#	css/light-grey.scss
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
This commit is contained in:
Molkobain
2020-09-08 17:30:32 +02:00
parent 46fe1661db b5cfd1c61e
commit 8193ada159
144 changed files with 19950 additions and 1687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/csvimport.php
View File

@@ -50,7 +50,7 @@ try
$sHtml = "<select id=\"select_$sName\" name=\"$sName\">";
$sHtml .= "<option style=\"width: ".$iWidthPx."px;\" title=\"Select the class you want to load\" value=\"\">".Dict::S('UI:CSVImport:ClassesSelectOne')."</option>\n";
$aValidClasses = array();
$aClassCategories = array('bizmodel');
$aClassCategories = array('bizmodel', 'addon/authentication');
if (UserRights::IsAdministrator())
{
$aClassCategories = array('bizmodel', 'application', 'addon/authentication');