Skip to content

Commit

Permalink
Merge branch 'release/1.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Sep 10, 2018
2 parents 771aab4 + abbcc90 commit a2f898b
Show file tree
Hide file tree
Showing 32 changed files with 1,968 additions and 354 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
dist/
vendor/
.gh_token
*.min.*
51 changes: 51 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
language: php
php:
- 5.6
- 7.0
- 7.1
- 7.2
- nightly

#env:
# global:
# - DB=mysql
# matrix:
# - GLPIVER=9.1/bugfixes
# - GLPIVER=master

before_script:
- composer self-update
# - git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi
# - composer install --no-dev
# - mysql -u root -e 'create database glpitest;'
# - php tools/cliinstall.php --db=glpi-test --user=travis --tests
# - mv ../treeview plugins/{LNAME}
# - cd plugins/treeview
- composer install -o


script:
- vendor/bin/robo --no-interaction code:cs
# - mysql -u root -e 'select version();'
# - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/


matrix:
# exclude:
# - php: 5.4
# env: GLPIVER=master
allow_failures:
- php: nightly

cache:
directories:
- $HOME/.composer/cache

#notifications:
# irc:
# channels:
# - "irc.freenode.org#channel"
# on_success: change
# on_failure: always
# use_notice: true
# skip_join: true
8 changes: 8 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[main]
host = https://www.transifex.com

[glpi-plugin-treeview.treeview-pot]
file_filter = locales/<lang>.po
source_file = locales/treeview.pot
source_lang = en_GB
type = PO
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# Treeview GLPI plugin

[![License](https://img.shields.io/github/license/pluginsGLPI/treeview.svg?&label=License)](https://github.com/pluginsGLPI/treeview/blob/master/LICENSE)
[![Build Status](https://secure.travis-ci.org/pluginsGLPI/treeview.svg?branch=master)](https://secure.travis-ci.org/pluginsGLPI/treeview)
[![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)




This plugin allows you to browse through your inventory via a tree view in a panel located on the left side of the screen.

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

![3.-Screenshot](/screenshot.png "Screenshot")


## Contributing

* Open a ticket for each bug/feature so it can be discussed
Expand Down
14 changes: 14 additions & 0 deletions RoboFile.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
/**
* This is project's console commands configuration for Robo task runner.
*
* @see http://robo.li/
*/

require_once 'vendor/autoload.php';

class RoboFile extends Glpi\Tools\RoboFile
{
protected $csignore = ['/vendor/', '/css/', '/js/', '/tools/'];
//Own plugin's robo stuff
}
10 changes: 10 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"require-dev": {
"glpi-project/tools": "^0.1"
},
"config": {
"platform": {
"php": "5.6"
}
}
}
Loading

0 comments on commit a2f898b

Please sign in to comment.