composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,431 Commits 132 Branches 135 Tags
3.0.0-beta8
Commit Graph

2064 Commits

Author SHA1 Message Date
Pierre Goiffon
7281bd4a1a N°931 default datamodel : remove Ticket.tagfield and add AttributeTagSet FAQ.domains 2018-10-05 17:37:23 +02:00
Pierre Goiffon
33e8b6a64c Switch back files from CrLf to Lf 2018-10-04 17:43:03 +02:00
Stephen
c0d83e96d8 Retrofit 2.5.1 fixes into develop (11308dc7, 1e0d654, 7fddd6ac, 12e9e453, cbe749af, 10b7fa60, c5f3598f, 396fc2cd) 2018-10-04 11:12:16 +02:00
Pierre Goiffon
e9a77c798e Fix Contact data sample (reordering and remove duplicate id) 2018-10-02 15:01:30 +02:00
Guillaume Lajarige
e3e416b467 (Retrofit from deveop ab1715ed) N°1576 Portal: Security hardening. 2018-10-02 11:08:49 +02:00
Guillaume Lajarige
fcb6a4069a (Retrofit from develop 526d4c4d) N°1575 Portal: Security hardening. 2018-10-02 11:06:27 +02:00
Guillaume Lajarige
866dfe4531 (Retrofit from develop 07056613) N°1611 Fix "UTF-8 Characters Malformed" error due to wrong file encoding. 2018-10-02 10:38:27 +02:00
Steffunky
9972e253d5 enable jQuery migrate warning only in dev. environment 2018-10-01 16:17:41 +02:00
Molkobain
4595c565cc N°931 Portal: Start working on UI. 2018-10-01 09:27:07 +02:00
Pierre Goiffon
2e255b10a7 Finish b931 2018-09-28 16:42:49 +02:00
Molkobain
5fa4b4cb88 Taxons: Rework of CSS & markup in the console (portal still to come). 2018-09-27 16:45:04 +02:00
Eric
720d334053 N°917: AttributeClassAttCodeSet created 2018-09-27 09:11:02 +02:00
Molkobain
9397d1ac2e Taxons: Add support in the portal (UI still to be done). 2018-09-26 17:13:55 +02:00
Thomas Casteleyn
f09683949d Add Dutch dictionary for incident management (#3) 
Thanks to @Hipska!
 2018-09-25 17:29:05 +02:00
Eric
a94211d3d3 Merge remote-tracking branch 'origin/develop' into feature/b931 
# Conflicts:
#	.idea/inspectionProfiles/Combodo.xml
#	application/cmdbabstract.class.inc.php
#	core/attributedef.class.inc.php
#	css/light-grey.css
#	css/light-grey.scss
 2018-09-25 12:03:44 +02:00
Molkobain
3cf5d31f5d Start working on tags integration in the end-users portal. 2018-09-21 17:25:45 +02:00
Eric
5403219746 N°931: Tags admin menu 2018-09-18 10:28:39 +02:00
Molkobain
34d601f49c UI: Make caselog entries' header font a bit more tinier in enhanced portal. 2018-09-16 21:39:09 +02:00
Pierre Goiffon
d9315bec84 N°931 integrate TagSet widget 2018-09-13 15:57:32 +02:00
Pierre Goiffon
da71004898 N°931 update TagSet DataModel declaration parameters 2018-09-06 17:10:40 +02:00
Pierre Goiffon
f871581997 Merge branch 'develop' into feature/b931 
# Conflicts:
#	application/applicationextension.inc.php
#	core/attributedef.class.inc.php
#	core/cmdbchangeop.class.inc.php
#	core/cmdbobject.class.inc.php
#	core/dbobjectsearch.class.php
#	core/oql/expression.class.inc.php
#	core/oql/oql-lexer.plex
#	core/oql/oql-parser.y
#	core/oql/oqlquery.class.inc.php
#	css/light-grey.scss
#	datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
#	datamodels/2.x/itop-portal/datamodel.itop-portal.xml
#	datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
#	dictionaries/en.dictionary.itop.core.php
#	dictionaries/fr.dictionary.itop.core.php
#	setup/xmldataloader.class.inc.php
#	test/ItopDataTestCase.php
 2018-09-04 18:02:51 +02:00
Pierre Goiffon
40a4e6d7b0 Fix files using CrLf, convert them to Lf to have the whole repo using Lf 
Warn your git config (core.autocrlf = input or true)
 2018-09-04 17:59:51 +02:00
Eric Espié
cd2ea3793e N°962: TagSet Fix Attribute definition 
SVN:b931[6028]
 2018-08-30 11:08:47 +02:00
Pierre Goiffon
0ee4b52baa N°931 rights on TagSetFieldData on ConfigurationManager profile 
SVN:b931[6026]
 2018-08-30 11:08:46 +02:00
Eric Espié
9631021f84 N°962: TagSet Attribute definition and values (with unit tests on values) 
SVN:b931[6024]
 2018-08-30 11:08:46 +02:00
Pierre Goiffon
4df497a768 N°931 Increment iTop XML version (1.5 -> 1.6) 
SVN:b931[6020]
 2018-08-30 11:08:46 +02:00
Pierre Goiffon
bdb62de81c N°931 new AttributeTag, handle field creation & update 
SVN:trunk[6014]
 2018-08-23 15:05:36 +00:00
Guillaume Lajarige
07056613e5 N°1611 Fix "UTF-8 Characters Malformed" error due to wrong file encoding. 
SVN:trunk[6009]
 2018-08-21 10:29:46 +00:00
Stephen Abello
7092dc6f86 (Retrofit from trunk) German Translation: typos (UserRequest #18704) 
SVN:2.5[6002]
 2018-08-08 10:12:43 +00:00
Vincent Dumas
84dc3c2093 German Translation: typos (UserRequest #18704) 
SVN:trunk[6001]
 2018-08-08 09:18:25 +00:00
Guillaume Lajarige
b76de65886 Internal: Fix CSS typo. 
SVN:trunk[5985]
 2018-07-25 15:11:21 +00:00
Guillaume Lajarige
48b3bd8bf3 N°1579 Portal: Fix wrong pictogram placement on email & tel attributes in the ManageBrick. 
SVN:trunk[5984]
 2018-07-25 15:02:29 +00:00
Guillaume Lajarige
ab1715edec N°1576 Portal: Security hardening. 
SVN:trunk[5983]
 2018-07-25 14:48:11 +00:00
Guillaume Lajarige
e71ad536a9 Code cleanup 
SVN:trunk[5973]
 2018-07-25 07:23:52 +00:00
Guillaume Lajarige
a6af11e644 Code cleanup and PHPDoc. 
SVN:trunk[5971]
 2018-07-24 15:50:52 +00:00
Guillaume Lajarige
1809180d41 Internal: Portal: Fix router API that was never returning the right route. 
SVN:trunk[5970]
 2018-07-24 15:46:23 +00:00
Guillaume Lajarige
526d4c4d15 N°1575 Portal: Security hardening. 
SVN:trunk[5968]
 2018-07-24 14:26:51 +00:00
Stephen Abello
6630051ef3 Updated jQuery to v3.3.1 
SVN:trunk[5961]
 2018-07-23 06:58:30 +00:00
Vincent Dumas
a66d91c507 Fix duplicated label in French: Ticket.caller_id = Change.requestor_id by renaming the second 
SVN:trunk[5960]
 2018-07-20 13:08:30 +00:00
Vincent Dumas
2f34f0458b Fix XML bug: Duplicate id=team_id in state new. 
SVN:trunk[5959]
 2018-07-20 12:49:23 +00:00
Guillaume Lajarige
076abc8ae7 N°1568 Portal: Fix async error messages catching when submitting a form was redirecting to a modal that crashed (eg. Transition on object that failed to load) 
SVN:trunk[5958]
 2018-07-19 16:54:11 +00:00
Guillaume Lajarige
8135fdb9d2 Update spanish translations (Thanks to Miguel Turrubiates!) 
SVN:trunk[5947]
 2018-07-18 07:51:17 +00:00
Guillaume Lajarige
7ca95b9413 Code cleanup: Warning suppression & PHPDoc. 
SVN:trunk[5928]
 2018-06-29 17:14:13 +00:00
Guillaume Lajarige
00d0d383f8 Code cleanup: Warning suppression & PHPDoc. 
SVN:trunk[5927]
 2018-06-29 16:05:11 +00:00
Guillaume Lajarige
b2384855fd Code cleanup: Warning suppression. 
SVN:trunk[5925]
 2018-06-28 15:33:29 +00:00
Guillaume Lajarige
602c087c29 N°1528 Portal: Add support for SCSS files through the PortalUIExtension API (only CSS were supported) 
SVN:trunk[5924]
 2018-06-28 14:51:31 +00:00
Pierre Goiffon
97fa3ac3b3 Fix portal DE translation (thanks again Lars Hippler / Itomig !) 
SVN:trunk[5919]
 2018-06-28 07:15:39 +00:00
Vincent Dumas
2dbaf4dfa1 german translation for Graphique in Portal 
SVN:trunk[5917]
 2018-06-27 15:38:45 +00:00
Pierre Goiffon
5df9f38391 German translations update (many thanks Lars Hippler / Itomig !) 
SVN:trunk[5916]
 2018-06-27 15:14:19 +00:00
Vincent Dumas
9e17a611d2 Add 'name' and 'description' as default search criteria on QueryPhrase, Audit Category and Profile. Enable search bar on Profile and Audit Category menus. 
SVN:trunk[5907]
 2018-06-25 11:06:52 +00:00