Eric
a6737afb2f
N°2240 - Supportability - Maintenance mode
2019-07-11 10:22:39 +02:00
Eric
7f82faefe1
N°679 - DB inconsistency protection
2019-07-10 11:49:44 +02:00
Purple Grape
dab48146bf
Update zh_cn.dict.itop-config-mgmt.php
...
translation correction
2019-07-03 08:42:10 +02:00
Pierre Goiffon
6c81163d20
Merge remote-tracking branch 'origin/master' into develop
2019-07-01 17:30:21 +02:00
Pierre Goiffon
33903f570b
N°2174 ExternalField to friendlyname : restore behavior without dict key
...
* displaying "class -> field" was breaking exports (columns labels for ext fields to friendlynames in default datamodel, for example UserRequest.agent_id_friendlyname)
* dict key is always searched first, so a custom label can always be set
2019-06-28 15:13:15 +02:00
Stephen Abello
f7af705bb5
Fix scss and css errors
2019-06-28 14:25:25 +02:00
Stephen Abello
a827cb7546
N°2226: Upgrade ScssPHP to v1.0.0
2019-06-28 14:24:56 +02:00
Stephen Abello
c7fe6f388a
N°2270: Upgrade bootstrap to v3.4.1
2019-06-28 14:22:35 +02:00
bruno DA SILVA
127809a836
Merge remote-tracking branch 'origin/support/2.5'
2019-06-26 15:41:13 +02:00
bruno DA SILVA
6c948873ff
N°2323.6 Fix regression introduced in previous commit
2019-06-26 15:38:42 +02:00
Stephen Abello
a93be39aeb
N°2166: Fix regression introduced in b157fad
2019-06-26 14:15:04 +02:00
Stephen Abello
6de6c38834
N°2268: Upgrade jQuery to v3.4.1 and jQuery migrate to v3.1.0. Remove version number from both libraries filename
2019-06-26 10:36:40 +02:00
Pierre Goiffon
a5745ba72d
N°2345 privUITransactionFile : avoid create dir race condition
2019-06-26 10:17:47 +02:00
Eric
7c93d116ec
2.6.2 fix module version
2019-06-25 16:56:15 +02:00
Stephen Abello
71f5d29cba
N°2271: Upgrade CKEditor to v4.11.4
2019-06-24 15:52:26 +02:00
Stephen Abello
f948d6e026
N°2336: Set right parameter for --ssl-mode
2019-06-21 14:37:48 +02:00
Stephen Abello
a222ead43c
N°2336: Use --ssl-mode instead of --ssl with MySQL >= 5.7.0
2019-06-21 13:59:36 +02:00
Stephen Abello
d6bfbbcd30
N°1529: Allow parameter OpenSSLMcryptCompatibility to be used
2019-06-21 11:08:23 +02:00
Molkobain
17df9d0f9d
Merge remote-tracking branch 'origin/support/2.5'
2019-06-21 10:03:17 +02:00
Molkobain
93099ea3c7
N°2323.5 Fix regression introduced in previous commit
...
Could not upload images in HTML field anymore
2019-06-21 10:01:31 +02:00
Molkobain
2f9e050e2b
N°2323.4 Fix regression introduced in previous commit
...
Current user picture was no longer displayed in the portal
(cherry picked from commit 56b9eb6cf3
2019-06-20 17:52:26 +02:00
Eric
e68340273b
Merge branch 'master' into develop
...
# Conflicts:
# core/config.class.inc.php
# core/htmlsanitizer.class.inc.php
# css/css-variables.scss
# css/light-grey.css
# datamodels/2.x/version.xml
# dictionaries/zh_cn.dictionary.itop.ui.php
# synchro/synchrodatasource.class.inc.php
2019-06-20 16:11:38 +02:00
Eric
5c341138e1
N°2129 - Fix lost dict. entries by toolkit updating script
2019-06-20 15:48:41 +02:00
Molkobain
56b9eb6cf3
N°2323.4 Fix regression introduced in previous commit
...
Current user picture was no longer displayed in the portal
2019-06-20 10:34:10 +02:00
Pierre Goiffon
db20244212
N°2174 External field label retrieval : fix default value
...
\AttributeDefinition::GetLabel with default null was returning att code !! Added PHPDoc and changed default value
2019-06-19 16:13:29 +02:00
Pierre Goiffon
6f9f74e72f
N°2230 BR translations
...
Many thanks to our client Pimkie !
2019-06-19 15:55:05 +02:00
Eric
8070d5b9b7
2.6.2-beta
2019-06-19 15:08:40 +02:00
Molkobain
6197ecbaf4
Update version number for 2.6.2 beta
2019-06-19 14:43:21 +02:00
Eric
ca585d3f42
N°2044 - Search Form Prefill not effective when searching objects to add to an AttributeLinkedSet (n:1)
2019-06-18 15:53:48 +02:00
Eric
02c78d4044
N°2278 - Object-copier: Fix n:n link attributes set to default on copy
...
(cherry picked from commit 6564d84a2f
2019-06-18 14:57:45 +02:00
Pierre Goiffon
9e5d668c02
N°2328 TagSet : allow to create codes with 3 characters
...
(was wrongly 4 min before)
2019-06-18 14:36:47 +02:00
Pierre Goiffon
051656f295
N°2174 External field : change label retrieval
...
* Now the dict entry will be used even for friendly names
* If no dict keys exists, then the class path plus field name will be returned
2019-06-18 11:27:02 +02:00
Eric
9a51a44549
Merge remote-tracking branch 'origin/support/2.5'
2019-06-18 10:50:04 +02:00
Eric
5102b113ed
N°2323 - Fix calls to ajax endpoints
...
(cherry picked from commit c723d19e01
2019-06-18 10:45:50 +02:00
Eric
f1e4d94499
N°2323 - Fix calls to ajax endpoints for portal
2019-06-18 10:43:45 +02:00
Pierre Goiffon
d04102bab3
N°2243 IT translations : final versions
2019-06-18 08:56:06 +02:00
Eric
c723d19e01
N°2323 - Fix calls to ajax endpoints
2019-06-17 15:59:43 +02:00
Eric
dac77e0606
Revert id in select
2019-06-13 10:24:01 +02:00
Eric
02b98543d9
Fix Bad db_key_field definition
2019-06-13 10:06:52 +02:00
Eric
519aaadd9a
N°2157 - Fix backup manual warning
2019-06-13 09:44:40 +02:00
bruno DA SILVA
fe27fef530
Merge remote-tracking branch 'origin/master'
2019-06-12 18:27:11 +02:00
bruno DA SILVA
72dbb6f937
N°1373 - supportability: log stack trace on DBObject::Reload error
2019-06-12 18:26:35 +02:00
Pierre Goiffon
ccb29d10ae
N°2243 IT translations : keys in parent classes
2019-06-12 18:09:41 +02:00
Pierre Goiffon
e479775833
N°2243 IT translations
...
Thanks to our client Pimkie !
2019-06-12 18:09:41 +02:00
Stephen Abello
86a7192f5a
N°2160: Correctly initialize fields depending on a select field with only 1 value
2019-06-12 14:39:29 +02:00
Pierre Goiffon
4a1be13904
N°2208 new IT translations
2019-06-12 11:02:49 +02:00
Pierre Goiffon
0f3347f64d
📝 Fix some PhpDoc
2019-06-12 10:39:30 +02:00
Eric
6564d84a2f
N°2278 - Object-copier: Fix n:n link attributes set to default on copy
2019-06-12 10:17:19 +02:00
Eric
f4747c5cef
PHPStorm
2019-06-12 09:46:21 +02:00
Eric
1e92c2f28a
Sanitize error message
2019-06-11 17:18:36 +02:00
