composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-12 12:34:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,164 Commits 142 Branches 134 Tags
0a4db9bd5062bb33e3e787faefb60d1473aaa4bf
Commit Graph

144 Commits

Author SHA1 Message Date
Eric
82e98ced85 N°2677 - Add style definition for enums (MetaModel::GetEnumStyle() API) 2021-01-05 13:45:23 +01:00
Eric
f1ad55c86c N°2677 - Add style definition for enums 2020-12-31 11:25:00 +01:00
Eric
1b115624a2 N°2737 - RenderBlockTemplate enhancement, uilinkswidget UIBlock refactor 2020-12-16 11:05:30 +01:00
Eric
866a93c0c8 ✅ Fix unit tests 2020-11-09 11:57:56 +01:00
Pierre Goiffon
7864461d85 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 
# Conflicts:
#	core/cmdbobject.class.inc.php
#	datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
#	datamodels/2.x/itop-structure/datamodel.itop-structure.xml
 2020-11-02 10:30:44 +01:00
Pierre Goiffon
235b4be790 Merge remote-tracking branch 'origin/support/2.7' into develop 2020-10-30 18:09:44 +01:00
Pierre Goiffon
512b415bd6 N°3065 add test case in comment 2020-10-30 11:30:22 +01:00
Pierre Goiffon
5d1de543cc Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 
# Conflicts:
#	core/metamodel.class.php
 2020-10-19 15:46:16 +02:00
Pierre Goiffon
be9a428529 Merge remote-tracking branch 'origin/support/2.7' into develop 2020-10-19 15:38:11 +02:00
acognet
96332b7885 N°3139 - import csv : hyperlink not clickable 2020-10-16 14:15:51 +02:00
Molkobain
986c08aa81 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 2020-10-14 10:09:14 +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
Pierre Goiffon
10a945eb92 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 2020-10-07 18:48:56 +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
Molkobain
e48d257b00 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
#	application/displayblock.class.inc.php
#	application/itopwebpage.class.inc.php
#	application/utils.inc.php
#	application/webpage.class.inc.php
#	application/xmlpage.class.inc.php
#	datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
#	datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
#	datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
#	datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
#	js/components/breadcrumbs.js
#	pages/navigator.php
#	test/core/DBSearchTest.php
 2020-10-07 11:36:15 +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
b2474d3368 N°3324 Portal fix ignore_silo when using nested query in scopes 
The AllowAllData attribute wasn't updated in the nested queries.
It is now set both when calling DBObjectSearch::AllowAllData and when creating a new nested query (\DBObjectSearch::AddConditionExpression)
 2020-10-01 12:15:34 +02:00
Eric
795b28263a N°2847 - Fixed unit tests 2020-09-28 11:23:31 +02:00
odain
9520d2794f 💚 fix ci Serialization of 'ReflectionClass' is not allowed 2020-09-25 10:29:48 +02:00
odain
4e0eed6e13 N°3270 Notify on expiration not sending notification (trigger exception) 
add boilerplate function and use it to intercept/enrich trigger exception loops
 2020-09-25 07:18:14 +02:00
Molkobain
8193ada159 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 
# Conflicts:
#	composer.json
#	css/light-grey.scss
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
 2020-09-08 17:30:32 +02:00
Eric
ff722b579b Fix Dependent attributes update on DBObject::Set() 2020-09-03 12:57:01 +02:00
Eric
ec72d1c767 N°3078 - Fix error on login while in maintenance mode 
Fix infinite loop on login failure
 2020-08-28 14:26:42 +02:00
Molkobain
7f3c10b69d Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 2020-08-26 16:09:23 +02:00
Eric
761c2a46a3 N°3234 - Cron rework 
* some timezone refactors occurred
 2020-08-25 11:20:17 +02:00
Molkobain
c5b8d3fa72 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 
# Conflicts:
#	application/datamodel.application.xml
#	application/itopwebpage.class.inc.php
#	css/light-grey.scss
 2020-08-19 10:20:37 +02:00
Pierre Goiffon
71848cb56b Merge branch 'support/2.7' into develop 
# Conflicts:
#	.jenkins/bin/tests/phpunit.sh
#	Jenkinsfile
#	core/config.class.inc.php
#	core/dbobjectsearch.class.php
#	core/ormlinkset.class.inc.php
#	datamodels/2.x/combodo-db-tools/dbtools.php
#	dictionaries/nl.dictionary.itop.ui.php
 2020-08-17 09:36:43 +02:00
rquetiez
d679deba02 refactor CSV Parser unit tests from the old home-made framework into PHP Unit, and add new test to check that <NULL> is parsed as a real null value 2020-08-13 21:12:50 +02:00
odain
e5487edbfb Merge remote-tracking branch 'remotes/origin/feature/perf-serialization' into develop 2020-08-10 11:10:44 +02:00
odain
8902d6e532 CI migration/automation + new test to ease iTop release management 
- new Jenkinsfile and .jenkins removal to launch phpunit/behat tests
triggered on both iTop build and push.
 - N°3053 - Check XML conversion methods
 - N°3057 - New build recipe
 - N°3059 - Automatically set the documentation URLs
 - N°3052 - Check community modules XML version against latest version
 - N°3054 - Check community modules version against major version
 - N°3062 - setup.css file integrity test
 - N°3060 - Check consistency between the list of modules and installation.xml
 - Add exclusion group for CI
 - N°3061 - Automatically check the installation.xml consistency
 2020-08-07 14:48:51 +02:00
Pierre Goiffon
c9dab08324 💚 Fix DBSearchTest::testSelectInWithVariableExpressions 2020-08-04 15:36:53 +02:00
Eric
ace676dc24 N°2585 - Fix alias problem in portal scopes 
The re-aliasing map structure now allows multiple mapping for the same alias (used for the translations of UNIONS)
 2020-07-23 16:41:57 +02:00
Eric
8122270476 N°3176 - OQL: Fix malformed UNION queries in portal scopes 
Fix regression in Unit tests
 2020-07-22 17:30:38 +02:00
Eric
1f66d53ab4 N°3176 - OQL: Fix malformed UNION queries in portal scopes 
Fixed AddCondition_ReferencedBy() for unions (regression introduced by N°2970)
 2020-07-22 16:09:08 +02:00
Romain Quetiez
acf0548c4c N°3171 - Friendly name and obsolescence flag not refreshed (#151) 
- Compute any type of expression on server side
- Recompute friendly name and obsolescence flag on server side (DBOBject)
- Bonus : compute dependency for external keys
 2020-07-10 17:26:37 +02:00
bruno DA SILVA
46d91322c1 n°2556 - fix errors in the merge of support/2.7 into develop 
The cherry picks resulted in an out of order apply of the commits, the result was that the wrong code was keeped
 2020-07-01 15:41:46 +02:00
Pierre Goiffon
888232e8c3 Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	test/core/HTMLDOMSanitizerTest.php
 2020-06-26 10:53:49 +02:00
Eric
94f9b16c03 N°2589 - Infinite loops when logging with a Contact having a non empty TagSet field 
Add ListParameters to DBSearch for nested queries
 2020-06-24 15:18:11 +02:00
bruno DA SILVA
be20705449 Add unit test. 
unit test the behaviour of the removal of the blacklisted html tags

this is in fact an adaptation of the test added for the rolled-back feature of the n°2556.
This feature has been postponed to the 2.8 due to performance scaling issues.
 2020-06-22 16:13:31 +02:00
bruno DA SILVA
d3525190d5 N°2556 - Html sanitization preserve content of removed tags (except for a forbidden list) 
forbidden list: see $aTagsContentRemovableList

(cherry picked from commit 746b47bb0e)
(cherry picked from commit 79909fadc0)
 2020-06-22 11:40:38 +02:00
Pierre Goiffon
8d73eb6dff Revert "N°2556 - Html sanitization preserve content of removed tags (except for a forbidden list)" 
This reverts commit 746b47bb0e.
Revert "N°2556 - Repair CI"

This reverts commit 79909fadc0.
 2020-06-22 11:36:46 +02:00
Pierre Goiffon
2705543efd N°2997 new test for AbstractWeeklyScheduledProcess 
Document the way GetNextOccurrence works O:)
 2020-06-12 18:20:07 +02:00
Eric
8064a20718 N°2970 - Reset conditions of joined filter because they can be used later by the Filter() method 2020-06-03 11:47:12 +02:00
Pierre Goiffon
e6a8f492d5 N°3049 Fix notice when having an ENUM field with values containing parenthesis 2020-05-28 15:38:21 +02:00
bruno DA SILVA
79909fadc0 N°2556 - Repair CI 2020-05-14 10:49:31 +02:00
bruno DA SILVA
746b47bb0e N°2556 - Html sanitization preserve content of removed tags (except for a forbidden list) 
forbidden list: see $aTagsContentRemovableList
 2020-05-14 10:33:30 +02:00
Thomas Casteleyn
23afee514d 🌐 Update nl.dictionary.itop.ui.php (#125) 2020-05-13 14:38:32 +02:00
Eric
bcd9679957 N°3006 - Fix filtering an UNION with parent class 2020-05-12 12:08:18 +02:00