Skip to content

Commit

Permalink
Merge branch 'release/2.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Aug 21, 2018
2 parents 71d3e35 + 9debf6a commit 1cfd4bb
Show file tree
Hide file tree
Showing 36 changed files with 3,804 additions and 1,102 deletions.
384 changes: 384 additions & 0 deletions .github/CONTRIBUTING.md

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!-- File a GitHub issue only for bugs or feature requests related to the code **in this repository**. For other topics you can get more information in the README file. -->

### Observed Results

<!-- This could be a description, error output, steps to reproduce, a feature missed, etc. -->

### Expected behavior

<!-- What did you expect to happen? -->
16 changes: 16 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
### Changes description

<!-- Describe results, user mentions, screenshots, screencast (gif) -->

### Checklist

Please check if your PR fulfills the following specifications:

- [ ] Tests for the changes have been added
- [ ] Docs have been added/updated

### References

<!-- issues related (for reference or to be closed) and/or links of discuss -->

Closes #N/A
3 changes: 3 additions & 0 deletions .github/invite-contributors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
isOutside: true
# Team Name
contributors
46 changes: 46 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
repository:
name: sccm
description: Microsoft System Center Configuration Manager
homepage: https://pluginsglpi.github.io/sccm/
topics: sccm, microsoft, system, center, configuration, manager, glpi-plugin, glpi
private: false
has_issues: true
has_wiki: false
has_downloads: true
default_branch: develop
allow_squash_merge: true
allow_merge_commit: false
allow_rebase_merge: true
labels:
- name: bug
color: f44336
- name: build
color: 795548
- name: ci
color: fbca04
- name: documentation
color: 607d8b
- name: duplicate
color: 9e9e9e
- name: feature
color: 3f51b5
- name: hacktoberfest
color: ff625f
- name: invalid
color: cddc39
- name: performance
color: 009688
- name: question
color: ff5722
- name: refactor
color: 9c27b0
- name: style
color: 2196f3
- name: test
color: 8bc34a
- name: wontfix
color: ffffff
- name: help wanted
color: 33aa3f
- name: good first issue
color: 7057ff
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.settings/
.buildpath
.project
dist/
vendor/
.gh_token
*.min.*
39 changes: 39 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
language: php

env:
global:
# - GLPI_SOURCE="https://github.com/glpi-project/glpi -b 9.2/bugfixes"
- PHPUNIT_ARGS="--verbose --debug"
- CS=7.2
matrix:
# - GLPI_BRANCH=9.2.1
# - GLPI_BRANCH=9.2/bugfixes
# - GLPI_BRANCH=master

php:
- 7.0
- 7.1
- 7.2
- nightly

allow_failures:
- php: nightly

before_script:
# - mysql -u root -e 'create database glpitest;'
# - git clone --depth=1 $GLPI_SOURCE -b $GLPI_BRANCH ../glpi && cd ../glpi
# - mv ../sccm plugins/sccm
# - composer install --no-dev
# - if [ -e scripts/cliinstall.php ] ; then php scripts/cliinstall.php --db=glpitest --user=root --tests ; fi
# - if [ -e tools/cliinstall.php ] ; then php tools/cliinstall.php --db=glpitest --user=root --tests ; fi
# - cd plugins/sccm
- rm composer.lock
- composer install

script:
# - vendor/bin/phpunit $PHPUNIT_ARGS
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "$CS" ]] ; then vendor/bin/robo --no-interaction code:cs; fi

cache:
directories:
- $HOME/.composer/cache
11 changes: 11 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Code of Conduct

As contributors and maintainers of the pluginsGLPI projects, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.

Communication through any of our channels (GitHub, Telegram, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.

We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the pluginsGLPI projects to do the same.

If any member of the community violates this code of conduct, the maintainers of the pluginsGLPI projects may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.

If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at [email protected]
Loading

0 comments on commit 1cfd4bb

Please sign in to comment.