Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Glpi9.4 #3147

Open
wants to merge 77 commits into
base: glpi9.5
Choose a base branch
from
Open

Glpi9.4 #3147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
fe2ccd8
Update travis tu use the GLPI branch 9.4/bugfixes
ddurieux Jan 3, 2019
75dab6a
Fix deprecated functions
Jan 4, 2019
e2184c1
Remove xdebug in travis
Jan 8, 2019
01cc8d4
provide manufacturer name when importing computer's model in dictionnary
orthagh Jan 9, 2019
d392bbc
Fix query
trasher Feb 1, 2019
e093fb7
drives capacity can also be updated
orthagh Jan 25, 2019
1a4c2cb
Bump version
trasher Feb 12, 2019
cec774a
Update translations
trasher Feb 12, 2019
19cc357
Fix query
trasher Feb 13, 2019
8c11a4b
Method has been removed; fix #2763
trasher Feb 15, 2019
e5a1d0a
Tiny fix
OscarBeiro Feb 19, 2019
db945f3
Fix typo problem on a variable. thanks Akiz09
Feb 20, 2019
83d71fb
ecmascript 5 (ie11) doesn't support default parameters
orthagh Feb 26, 2019
e3c7b53
fix fontawesome 5 compatibility
orthagh Feb 26, 2019
9107173
fix
AdrienClairembault Feb 7, 2019
0f777f8
Fix a security problem. Thanks to Julien Szlamowicz && Damien Picard …
Mar 28, 2019
baa4158
Update to version 9.4+1.1
Mar 28, 2019
f1a437f
Fix test + coding standard
May 9, 2019
5eb2d7d
Fix (un)lock massive action; fixes #2743
cedric-anne May 27, 2019
db5048a
Add inventory number as import criterium (devices import rules)
May 9, 2019
12e8d13
Fix mariadb in travis
Jul 4, 2019
a7ada53
Fix prepare devices to netinventory
Jul 4, 2019
c356585
Fix self-deploy when have many computers
ddurieux Jul 12, 2019
b18b081
made teamviewer id clickable
Dayflare Feb 28, 2019
fd7eb6d
Add components
Oct 23, 2018
853188f
Fix rights in taskjobstate
ddurieux Jul 19, 2019
e9323ca
Fix code to display collect in search engine of deployment groups
Nov 21, 2018
58de4da
Add an option to enable monitor serialnumber partial matching (#2865)
g-bougard Sep 20, 2019
217a587
Fix problem with lock and subitem delete fileds. delete fields in inp…
ddurieux Oct 4, 2019
8038f76
Tagged vlan
PR-gh Aug 6, 2019
4116bef
FIx tests with vlan tagged
ddurieux Oct 9, 2019
4c46e7e
Manage the paperroll like a cartridge
Mar 15, 2019
de3eb4f
Fix Import Xml Virtual Machine creation uuid
PR-gh Oct 9, 2019
81d0615
Add new mapping for printer consummables. closes #2785
Stoatwblr Mar 14, 2019
28fda12
Manage inventory number auto-generation
Jun 13, 2019
2ac2da6
Bump lodash from 4.2.1 to 4.17.15 in /lib/lazy.js-0.5.1
dependabot[bot] Oct 18, 2019
4e624cc
Update import rules to pass connections detected on switches (mac, CD…
Oct 9, 2018
65aa297
Enhance rule mactched logs with display in item. We add / display the…
Sep 15, 2018
0c91590
Prepare version 9.4+2.0
ddurieux Nov 3, 2019
5d170e3
Clean an echo
ddurieux Nov 6, 2019
87bc460
Fix Travis
ddurieux Nov 7, 2019
99e35f8
Fix netdiscovery/netinventory default timeout usage
g-bougard Oct 17, 2019
50b8a13
Fix plugins website version ordering
trasher Nov 7, 2019
ba72068
Fix problem on auto generation of inventory number on networkequipments
ddurieux Nov 6, 2019
6f38daf
Fix script and update pci, usb and oui database
ddurieux Nov 7, 2019
d6efe7d
Set usb devices productname to the right place
g-bougard Oct 18, 2019
393418c
Merge branch 'g-bougard-glpi9.4+fix-usb-devices-lost-names' into glpi9.4
ddurieux Nov 7, 2019
d86f96b
Fix USB device name based on database recently updated
ddurieux Nov 12, 2019
9020484
Prepare version 9.4+2.1
ddurieux Nov 12, 2019
9a5599f
Fix wakeup agent. closes #2809
ddurieux Nov 14, 2019
e901bca
Fix code for entity search in import rules
ddurieux Nov 29, 2019
c22c0a3
Fix create / delete right. closes #2886
ddurieux Nov 29, 2019
78c8a58
Solve [GLPI 9.4.4] Search doesn't work
cyrilus Oct 9, 2019
403c453
Fix cs
ddurieux Nov 29, 2019
d23c637
Update version to 9.4+2.2
ddurieux Nov 29, 2019
021228d
fix: wakeupAgents automatic action fails with timeslots
g-bougard Dec 2, 2019
648f8a4
Reduce size of SQL insert to have less than 1M (default MySQL conf ha…
ddurieux Dec 3, 2019
2680698
Prepare version 9.4+2.3
ddurieux Dec 10, 2019
82a89b7
Fix tests
ddurieux Jan 18, 2020
1ba9c3d
Fix search in fusioninventory groupes fields from plugin fields
ddurieux Jan 18, 2020
9914554
Fix display the rand of dropdown in the group search form
ddurieux Jan 18, 2020
d78f577
Update release version
ddurieux Jan 20, 2020
1f230a7
Add 9.4+2.4 version in glpi plugins catalog
ddurieux Jan 24, 2020
38e83a8
Fix export icon of task logs
ddurieux Jan 24, 2020
e7b2a50
fix(migration): prevent error on os migration
stonebuzz Dec 5, 2019
eb354e5
Whitelist autocomplete fields
cedric-anne Nov 14, 2019
2068f0c
fix(core): correctly display lock icon
stonebuzz Feb 6, 2020
946a4c0
Load general lock on manually item update (#2947)
stonebuzz Feb 11, 2020
ab5a3d6
fix(export): fix call function
stonebuzz Apr 8, 2020
dc6dc97
Fix rules. condition fields used to be a string, so condition were al…
trasher Apr 16, 2020
2d6ab2d
This code is not used. DUnno were it should be added or if it must be…
trasher Apr 16, 2020
93d57af
Add test on PHP 7.4
trasher May 13, 2020
fc9607b
Try another version
trasher May 13, 2020
282a66a
Fix PHP 7.4 issues
cedric-anne Jan 27, 2020
f216dcd
Fix display type of group (search and in group form)
ddurieux Jan 24, 2020
98de178
Fix security problems, reported by Hugo VINCENT && Alexis DANIZAN fro…
ddurieux Mar 3, 2021
c7d2981
ADD: add icon on deploy packages
aperret-dcs Sep 3, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
language: php
sudo: required
dist: xenial

env:
global:
- GLPI=master
- GLPI=9.4/bugfixes
- DB=mysql

cache:
Expand All @@ -13,6 +15,7 @@ matrix:
include:
- php: 5.6
addons:
mariadb: 10.2
apt:
packages:
- ant
Expand All @@ -27,19 +30,39 @@ matrix:
- php: 7.1
env: CS=true
addons:
mariadb: 10.1
mariadb: 10.3
apt:
packages:
- ant
- xsltproc
- php: 7.2
addons:
mariadb: 10.3
apt:
packages:
- ant
- xsltproc
- php: 7.3
addons:
mariadb: 10.3
apt:
packages:
- ant
- xsltproc
- php: 7.4
addons:
mariadb: 10.3
apt:
packages:
- ant
- xsltproc
- php: nightly
addons:
mariadb: 10.4
apt:
packages:
- ant
- xsltproc
allow_failures:
- php: nightly

Expand All @@ -49,12 +72,10 @@ before_install:
- cd glpi
- composer install --no-dev -o
- cd ..
- mysql -u root -e "SET PASSWORD FOR 'travis'@'localhost' = PASSWORD('travis')"
- mysql -u root -e "GRANT ALL PRIVILEGES ON glpi.* TO 'travis'@'localhost';"
- mysql -u root -e "FLUSH PRIVILEGES;"
- mysql -u root -e "CREATE DATABASE glpi;"
- mv -f fusioninventory-for-glpi glpi/plugins/fusioninventory
- pushd glpi
- bin/console db:install --no-interaction --db-name=glpi --db-user=travis --db-password=travis
- bin/console db:install --no-interaction --db-name=glpi --db-user=root
- bin/console db:update |grep -q "No migration needed." || (echo "db:update FAILED" && exit 1)
- popd
- ant -Dclearsavepoint='true' -Dbasedir=. -f ./glpi/plugins/fusioninventory/phpunit/build.xml composer
Expand All @@ -65,6 +86,7 @@ before_install:
before_script:
- phpenv version-name | grep ^5.[34] && echo "extension=apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; true
- phpenv version-name | grep ^5.[34] && echo "apc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; true
- phpenv config-rm xdebug.ini
- php -S localhost:8088 -t glpi > /dev/null 2>&1 &

script:
Expand Down
115 changes: 0 additions & 115 deletions ajax/deploydropdown_operatingsystems.php

This file was deleted.

Loading