Molkobain
2e39a650eb
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-21 17:48:57 +02:00
Molkobain
c753b57265
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-09-21 16:23:42 +02:00
Molkobain
583ab98210
Fix typo
2022-09-21 16:11:24 +02:00
Pierre Goiffon
e4f6a02de6
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
2022-09-21 14:28:25 +02:00
Pierre Goiffon
a5b5518533
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/cmdbsource.class.inc.php
# test/core/CMDBSource/TransactionsTest.php
2022-09-21 14:21:28 +02:00
Pierre Goiffon
88d743b1cc
✅ N°5538 Make PHPUnit test fail if transaction opened but not closed
2022-09-21 14:05:27 +02:00
Pierre Goiffon
7ac4bc95bb
ItopDataTestCase : improve log message
2022-09-21 11:51:07 +02:00
Eric Espie
fac455da48
N°4756 - Global event listeners
2022-09-21 10:34:38 +02:00
odain
b01627f39d
Merge branch 'saas/3.0' into develop
2022-09-20 16:04:55 +02:00
odain-cbd
766c9f0e7e
N°5305 - CSV import ergonomy PR ( #332 )
...
Reworked UI feedbacks on following attributes:
- enum
- date
- external key
2022-09-20 16:00:33 +02:00
Eric Espie
d1414a3f34
N°4756 - revert events for datamodel/2.x objects for backward compatibility
2022-09-20 15:35:59 +02:00
Molkobain
6386a302b2
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.json
2022-09-20 13:44:11 +02:00
Molkobain
7071712a0a
N°5535 - Fix PHP max version to 8.1 in composer for iTop 3.0.2+
2022-09-20 13:42:45 +02:00
Molkobain
31454b2946
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/config.class.inc.php
# setup/setuputils.class.inc.php
2022-09-20 13:27:20 +02:00
Molkobain
e55ac6002a
Increase ITOP_VERSION to 3.0.3-dev
2022-09-20 13:22:18 +02:00
Molkobain
e9c6549847
N°5535 - Fix PHP not validated version to 8.1 in iTop 3.0.2+
2022-09-20 13:17:59 +02:00
Eric Espie
4aad555649
N°4756 - Fix unit tests,
2022-09-20 12:18:53 +02:00
Eric Espie
93ee565d29
N°4756 - Fix unit tests
2022-09-19 16:59:51 +02:00
Eric Espie
6c097a128b
N°4756 - Fix unit tests
2022-09-19 16:49:40 +02:00
Eric Espie
eea3f78cec
N°4756 - Fix unit tests
2022-09-19 16:28:13 +02:00
Eric Espie
6c4caf64c8
N°4756 - Fix unit tests
2022-09-19 16:26:02 +02:00
Eric Espie
88f0013330
N°4756 - Fix unit tests
2022-09-19 16:09:02 +02:00
Eric Espie
aa31da34e5
N°5389 - Email Notification templates with AttributeLinkedSetIndirect failed
2022-09-19 15:30:24 +02:00
Eric Espie
71464f6d0e
Merge branch 'develop' into feature/faf_event_service
...
# Conflicts:
# core/cmdbobject.class.inc.php
# core/dbobject.class.php
# core/designdocument.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-09-19 09:45:08 +02:00
Pierre Goiffon
e5a9648206
📝 CONTRIBUTING : keep stickers images history in directory
2022-09-14 18:02:16 +02:00
Molkobain
abf2120097
Add 3.0.2-1 to mermaid graph
2022-09-14 17:14:48 +02:00
Pierre Goiffon
2f5eaa2dfd
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# sources/Core/Email/EmailSwiftMailer.php
2022-09-14 15:36:14 +02:00
Pierre Goiffon
091aaac55e
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-09-14 15:34:36 +02:00
Pierre Goiffon
d431811725
N°4947 Fix Email always picking "production" env config file ( #331 )
...
Note that the code was duplicated in both Email* impl, this is refactored : LoadConfig and m_oConfig are pulled up in Email, and SetRecipientFrom() calls are also refactored in Email
2022-09-14 15:33:48 +02:00
Pierre Goiffon
b161a863df
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-14 12:17:57 +02:00
Pierre Goiffon
203cf17c67
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# setup/setuputils.class.inc.php
# setup/wizardsteps.class.inc.php
2022-09-14 12:16:35 +02:00
acognet
cea75e07f2
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-14 11:01:30 +02:00
Pierre Goiffon
7d1893a2b8
Add @RohacRichard to contributors list 🙌 ( #333 )
2022-09-14 10:52:20 +02:00
xtophe38
7512f721e9
Setup wizard : use the ITOP_APPLICATION constant instead of hardcoded "iTop" string ( #335 )
...
* Update wizardsteps.class.inc.php
* Done as requested
* Fix typo for better readability/genericity
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-09-13 20:11:38 +02:00
Molkobain
b32d82f11e
Add @eduardomozart to contributors list 🙌
2022-09-13 19:35:30 +02:00
Pierre Goiffon
bdfe3a3b35
N°5235 Tmp dir setup check is now non blocking (woops previous commit was incomplete) ( #301 )
2022-09-13 18:22:29 +02:00
Pierre Goiffon
5cf391c3bb
N°5235 - Add non blocking setup check : is tmp dir is writable ( #301 )
2022-09-13 18:20:35 +02:00
acognet
1ee5432b96
N°5508 - PHP 8 and PHP 8.1 : Add compatibility Alarm Console
2022-09-13 18:04:28 +02:00
Eduardo Mozart de Oliveira
9f963686b5
N°4765 - Update brazilian translations thanks to @eduardomozart ( #268 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-09-13 17:20:53 +02:00
Richard Roháč
56f8dd2942
🐛 N°5522 - Fix session storage (breadcrumbs) not cleared on logout ( #333 )
...
Co-authored-by: richard.rohac <richard.rohac@elso-systems.com >
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-09-13 17:15:54 +02:00
Eric Espie
e4e4365cce
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-13 12:18:09 +02:00
Eric Espie
425362f515
N°5510 - Add unit test
2022-09-13 12:14:04 +02:00
Anne-Catherine
b061c29a5b
N°2250 - DisplayObject with ormLinkSet ignore Removed ( #309 )
2022-09-13 10:33:12 +02:00
Eric Espie
5d9e58f194
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-12 11:48:44 +02:00
Eric Espie
d50fe1573c
Merge branch 'support/3.0.2' into support/3.0
...
# Conflicts:
# application/loginbasic.class.inc.php
# application/loginexternal.class.inc.php
# application/loginform.class.inc.php
# application/loginurl.class.inc.php
2022-09-12 11:00:07 +02:00
Eric Espie
2a064fd97d
N°5394 - use session for the FSM
2022-09-12 10:56:25 +02:00
Eric Espie
e9a3974b98
N°5394 - revert 2.7 merge
2022-09-12 10:54:55 +02:00
Eric Espie
f02bc529fe
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/loginbasic.class.inc.php
# application/loginexternal.class.inc.php
# application/loginform.class.inc.php
# application/loginurl.class.inc.php
2022-09-12 09:55:01 +02:00
Eric Espie
4c1df9927d
N°5394 - use session for the FSM
2022-09-12 09:45:30 +02:00
Eric Espie
ca3c0cb163
N°5510 - Exception "$amount: Expected 5% to be within 0% and 1%" when compiling a theme
2022-09-09 09:20:52 +02:00
