composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 17:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,535 Commits 135 Branches 134 Tags
dfd9dd3352a9529c50c49929159bf69f8f9dd7f1
Commit Graph

7535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BenGrenoble
dfd9dd3352 Move cis_list from DocumentNote, DocumentWeb, DocumentFile to bridge cmdb ticket 2020-10-28 10:01:55 +01:00
BenGrenoble
6583c9495a Translation Fieldset person 2020-10-28 09:17:58 +01:00
BenGrenoble
93132dc3b4 Person_list in location 2020-10-28 08:49:05 +01:00
BenGrenoble
f257dcfb85 ConfigManagementCI and CI+ in structure dict 2020-10-28 08:48:46 +01:00
Pierre Goiffon
5f9cdc0431 Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	test/integration/iTopModulesPhpVersionChecklistTest.php
 2020-10-27 10:48:39 +01:00
acognet
ada7f30793 N°3139 - import csv : hyperlink not clickable - replace htmlentities with utils::HtmlEntities() to ensure that the same options are used application wide. 2020-10-27 09:59:05 +01:00
Pierre Goiffon
b065d13374 Integration tests : add itop-community group 2020-10-27 09:46:03 +01:00
Pierre Goiffon
1f092f8418 🎨 Integration test code formatting 2020-10-27 09:45:26 +01:00
Pierre Goiffon
2425ccb8f2 Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	css/css-variables.scss
#	datamodels/2.x/version.xml
 2020-10-26 14:30:33 +01:00
Pierre Goiffon
65d6947e52 🔖 Prepare 2.7.2 version 2020-10-22 15:06:48 +02:00
Pierre Goiffon
ba54b47f7d Merge remote-tracking branch 'origin/support/2.6' into support/2.7 2020-10-22 10:27:36 +02:00
Pierre Goiffon
65e43e8d04 🔧 remove .gitflow as we don't have any master branch anymore 2020-10-22 10:10:15 +02:00
Pierre Goiffon
8e31d77afb N°2591 fix deprecated info 2020-10-21 12:09:06 +02:00
Pierre Goiffon
c7dce73116 Remove dataprovider in iTopModulesPhpVersionIntegrationTest::testITopModulesPhpVersion (#175) 
Remove dataprovider in \Combodo\iTop\Test\UnitTest\Integration\iTopModulesPhpVersionIntegrationTest::testITopModulesPhpVersion
The dataprovider was slow, and was very fragile because it contained much PHP code : as seen in 2221e05 when an error appears here it is very difficult to trace :/
So now we have a traditional PHPUnit test method, and still we are testing everytime all modules (not stopping on the first error : we have only one assert at the end instead of an assert per module), and also we're getting the list of modules having errors at the end
 2020-10-20 17:10:36 +02:00
Pierre Goiffon
be9a428529 Merge remote-tracking branch 'origin/support/2.7' into develop 2020-10-19 15:38:11 +02:00
Pierre Goiffon
adb4e77c8d 🎨 MetaModel : function modifiers order + little formatting 2020-10-19 15:36:56 +02:00
Pierre Goiffon
d3cf7176da 📝 MetaModel : add comment on @deprecated added in 9c75cb4537 2020-10-19 15:34:15 +02:00
Pierre Goiffon
1cfb52d220 🐛 Fix CoreException constructor generating a warning on PHP >= 7.2 
In the CoreException constructor, we're using the $aContextData parameter to do a count(), a foreach(), and uses values as string.
Only a null check was done.
Now we are also checking that the value is_array().
As others checks (Countable, Iterable, __toString() impl) are quite difficult depending on the PHP version we're running, we didn't add any other checks.

The call in \MatchExpression::__construct (added in 05a0d612) was passing directly an Expression object. We could embed it in an array, but the object hierarchy isn't implementing __toString so we would have another bug.
In consequence we removed this parameter.
 2020-10-19 11:57:53 +02:00
Pierre Goiffon
18d5231900 N°3332 Security hardening 2020-10-19 09:25:30 +02:00
Pierre Goiffon
e6539ccb6e 🔧 Update .editorconfig : braces on next line for classes and functions 2020-10-19 09:09:31 +02:00
acognet
96332b7885 N°3139 - import csv : hyperlink not clickable 2020-10-16 14:15:51 +02:00
acognet
557b9be795 N°3377 - Allow to get data of current user - Fix Exception when using :current_user->... for non admin users 2020-10-15 17:31:25 +02:00
Pierre Goiffon
43a4d9fcd2 📝 PHPDoc for \cmdbAbstractObject::GetDisplaySet 2020-10-15 16:07:02 +02:00
Vincent Dumas
910358e04d #2639 Enrich tooltips for Action class 2020-10-15 13:12:59 +02:00
odain
d304284e36 💚 cleanup 2020-10-14 13:13:25 +02:00
odain
6e6557e909 💚 add beforeSetup phpunit group to run test before setup 2020-10-14 13:03:44 +02:00
Pierre Goiffon
2221e0541c 🐛 Fix version methods throwing exceptions with version 3.0.0 2020-10-14 11:31:02 +02:00
Molkobain
8e6351d346 Internal: Replace references to iTop 2.8.0 with iTop 3.0.0 2020-10-14 10:04:10 +02:00
Molkobain
9b19ae5944 Merge remote-tracking branch 'origin/support/2.7' into develop 2020-10-14 09:54:22 +02:00
Pierre Goiffon
75ebecddd5 Merge remote-tracking branch 'origin/support/2.6' into support/2.7 
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
 2020-10-14 09:19:07 +02:00
Pierre Goiffon
5fee2438ab Fix comments : iTop 2.8.0 renamed to 3.0.0 2020-10-14 09:06:07 +02:00
Pierre Goiffon
72fc22c49a Merge remote-tracking branch 'origin/support/2.7' into develop 2020-10-12 12:49:17 +02:00
Pierre Goiffon
2d130cbba8 Merge remote-tracking branch 'origin/support/2.6' into support/2.7 
# Conflicts:
#	test/core/UserRightsTest.php
#	test/setup_params/default-params.xml
 2020-10-12 12:47:58 +02:00
Pierre Goiffon
8b1c20cc11 N°3332 Security hardening 2020-10-12 12:40:51 +02:00
Thomas Casteleyn
eb3ad0999a Cleanup utils::GetSessionLog() (#172) 2020-10-09 15:59:24 +02:00
odain
df5aacca42 💚 use new ci validation 2020-10-09 10:08:31 +02:00
Pierre Goiffon
bb53aef09f Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	application/datamodel.application.xml
 2020-10-07 18:37:06 +02:00
Pierre Goiffon
06acac97ba ✅ Fix tests 
* update datamodel XML version
* Remove \Combodo\iTop\Test\UnitTest\Core\OQLTest::testTypeErrorQueryParser
 2020-10-07 16:21:36 +02:00
acognet
2d6d1132c7 N°3262 - Avoid PHP notices on DBObject core code 2020-10-07 13:26:38 +02:00
BenGrenoble
51669d0479 Fix datamodel Navigation rules and module parameters 2020-10-07 11:08:11 +02:00
BenGrenoble
f983655c68 Fix datamodel Branding 2020-10-07 11:07:34 +02: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
acognet
ed0e16494d N°3335 - Fix test 2020-10-05 16:23:56 +02:00
Pierre Goiffon
a765eb8725 Merge remote-tracking branch 'origin/support/2.6' into support/2.7 
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
 2020-10-05 16:12:49 +02:00
Eric
1f53757318 N°3248 - code hardening 
(cherry picked from commit 6a25933744)
(cherry picked from commit f74c78d61c)
 2020-10-05 14:54:17 +02:00
Pierre Goiffon
090119147c 🎨 PHP formatting 2020-10-05 14:42:03 +02:00
Pierre Goiffon
1551694198 N°3317 Security hardening 2020-10-05 14:42:03 +02:00
BenGrenoble
5d7ae38adf Merge remote-tracking branch 'origin/support/2.7' into support/2.7 2020-10-02 10:51:59 +02:00
BenGrenoble
2e08ae571a 3354 change sie by Sie 2020-10-02 10:51:25 +02:00
Pierre Goiffon
37522459a8 N°3351 restore LogKPI calls in portal index 2020-10-01 18:02:31 +02:00