Skip to content

Commit a2f898b

Browse files
committed
Merge branch 'release/1.7.0'
2 parents 771aab4 + abbcc90 commit a2f898b

32 files changed

+1968
-354
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dist/
2+
vendor/
3+
.gh_token
4+
*.min.*

.travis.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
language: php
2+
php:
3+
- 5.6
4+
- 7.0
5+
- 7.1
6+
- 7.2
7+
- nightly
8+
9+
#env:
10+
# global:
11+
# - DB=mysql
12+
# matrix:
13+
# - GLPIVER=9.1/bugfixes
14+
# - GLPIVER=master
15+
16+
before_script:
17+
- composer self-update
18+
# - git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi
19+
# - composer install --no-dev
20+
# - mysql -u root -e 'create database glpitest;'
21+
# - php tools/cliinstall.php --db=glpi-test --user=travis --tests
22+
# - mv ../treeview plugins/{LNAME}
23+
# - cd plugins/treeview
24+
- composer install -o
25+
26+
27+
script:
28+
- vendor/bin/robo --no-interaction code:cs
29+
# - mysql -u root -e 'select version();'
30+
# - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/
31+
32+
33+
matrix:
34+
# exclude:
35+
# - php: 5.4
36+
# env: GLPIVER=master
37+
allow_failures:
38+
- php: nightly
39+
40+
cache:
41+
directories:
42+
- $HOME/.composer/cache
43+
44+
#notifications:
45+
# irc:
46+
# channels:
47+
# - "irc.freenode.org#channel"
48+
# on_success: change
49+
# on_failure: always
50+
# use_notice: true
51+
# skip_join: true

.tx/config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[main]
2+
host = https://www.transifex.com
3+
4+
[glpi-plugin-treeview.treeview-pot]
5+
file_filter = locales/<lang>.po
6+
source_file = locales/treeview.pot
7+
source_lang = en_GB
8+
type = PO

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
# Treeview GLPI plugin
22

3+
[![License](https://img.shields.io/github/license/pluginsGLPI/treeview.svg?&label=License)](https://github.com/pluginsGLPI/treeview/blob/master/LICENSE)
4+
[![Build Status](https://secure.travis-ci.org/pluginsGLPI/treeview.svg?branch=master)](https://secure.travis-ci.org/pluginsGLPI/treeview)
5+
[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
6+
7+
8+
9+
310
This plugin allows you to browse through your inventory via a tree view in a panel located on the left side of the screen.
411

512
You can browse the tree of your site to see the equipment.
613

14+
![3.-Screenshot](/screenshot.png "Screenshot")
15+
16+
717
## Contributing
818

919
* Open a ticket for each bug/feature so it can be discussed

RoboFile.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
/**
3+
* This is project's console commands configuration for Robo task runner.
4+
*
5+
* @see http://robo.li/
6+
*/
7+
8+
require_once 'vendor/autoload.php';
9+
10+
class RoboFile extends Glpi\Tools\RoboFile
11+
{
12+
protected $csignore = ['/vendor/', '/css/', '/js/', '/tools/'];
13+
//Own plugin's robo stuff
14+
}

composer.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"require-dev": {
3+
"glpi-project/tools": "^0.1"
4+
},
5+
"config": {
6+
"platform": {
7+
"php": "5.6"
8+
}
9+
}
10+
}

0 commit comments

Comments
 (0)