Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
92439fc
Add 1.8.0-rc1 version definition
cedric-anne Jan 13, 2022
674ace2
Drop useless files
cedric-anne Jan 31, 2022
633d1e4
Update build dependencies
cedric-anne Jan 31, 2022
fdc8b0a
Fix files mode
cedric-anne Dec 10, 2021
2757b11
Fix licence headers
cedric-anne Jan 31, 2022
d1492c1
Add 1.8.0-rc2 version definition
cedric-anne Feb 3, 2022
e5510c5
Update locales
cedric-anne Mar 1, 2022
68c132a
Add Spanish (Venezuela) locale
bolivarf Mar 1, 2022
d62ead1
Add 1.7.4 version definition
cedric-anne Mar 1, 2022
f22e854
Add 1.8.0-rc3 version definition
cedric-anne Mar 1, 2022
a1b455f
Add 1.8.0-rc4 version definition
cedric-anne Mar 31, 2022
b043933
Add dependabot configuration
cedric-anne Apr 19, 2022
cbe441d
Bump actions/checkout from 2 to 3
dependabot[bot] Apr 19, 2022
a11150f
Bump glpi-project/tools from 0.1.15 to 0.4.4
dependabot[bot] Apr 19, 2022
c422b6f
Bump glpi-project/tools from 0.4.4 to 0.4.5
dependabot[bot] Apr 20, 2022
ee9297d
GLPI 10.0 compatibility
cedric-anne Nov 10, 2021
eb00a54
Update locales
cedric-anne Apr 20, 2022
4869bc8
1.8.0
cedric-anne Apr 20, 2022
82434cf
Bump glpi-project/tools from 0.4.5 to 0.5.1
dependabot[bot] Jul 1, 2022
1ffe4db
Prevent useless DB queries on plugin state checks
cedric-anne Jul 25, 2022
750bb8a
fix(menu): missing title
Rom1-B Aug 10, 2022
3a2e137
Upgrade build dependencies
cedric-anne Aug 10, 2022
51399c0
Update locales
cedric-anne Aug 10, 2022
9176834
1.8.1
cedric-anne Aug 10, 2022
bb6e55a
Windows Distribution for all versions
TheRoby Sep 29, 2022
ec6e388
1.8.2
cedric-anne Sep 29, 2022
8f89c37
Bump glpi-project/tools from 0.5.1 to 0.6.1
dependabot[bot] Dec 1, 2022
6047857
Replace deprecated methods usage
trasher Jan 13, 2023
f87ea88
Bump glpi-project/tools from 0.6.1 to 0.6.2
dependabot[bot] Feb 1, 2023
5b23289
Add security policy
cedric-anne Mar 9, 2023
7262e4b
Replace issues section by links to PS/Partners/Community
cedric-anne Mar 9, 2023
b20f320
Do not use REPLACE INTO
cconard96 Dec 26, 2022
a8339d8
Bump glpi-project/tools from 0.6.2 to 0.6.4
dependabot[bot] Aug 1, 2023
cf5a823
Add Polish locale
WebGregGit Jul 27, 2023
4dffbe7
Bump twig/twig from 3.4.1 to 3.4.3
dependabot[bot] Sep 30, 2022
92df94c
Added a isset() to prevent php error log file to be flooded with "und…
tomolimo Oct 30, 2019
369bd6a
Added another isset() to be sure that f_name exists in $_REQUEST
tomolimo Oct 30, 2019
1a6a36f
No longer resctrict results on children of current entity
AdrienClairembault Oct 18, 2019
1bc01d0
Update copyright year
cedric-anne Sep 14, 2023
fd71a3a
Update dependencies
cedric-anne Sep 14, 2023
7cc5572
Update locales
cedric-anne Sep 14, 2023
8acad19
Add Spanish (Ecuador) locale
cedric-anne Sep 14, 2023
85a28e6
Add Japanese (Japan) locale
cedric-anne Sep 14, 2023
d16bf44
1.8.3
cedric-anne Sep 14, 2023
a568089
Bump actions/checkout from 3 to 4
dependabot[bot] Oct 1, 2023
53ffea2
Fix migration
cedric-anne Oct 11, 2023
e347da9
1.8.4
cedric-anne Oct 11, 2023
4c4e89a
fix: no data when period = week
Rom1-B Oct 17, 2023
9a18d52
Upgrade build dependencies
cedric-anne Oct 19, 2023
6da9c14
1.8.5
cedric-anne Oct 19, 2023
3a4b9eb
Bump glpi-project/tools from 0.6.4 to 0.7.1
dependabot[bot] Nov 1, 2023
412f473
Feature/ci (#226)
trasher Nov 14, 2023
a68b352
Add php-parallel-lint
trasher Nov 14, 2023
af2ffb4
Bump actions/github-script from 6 to 7
dependabot[bot] Dec 1, 2023
ddaecda
Bump glpi-project/tools from 0.7.1 to 0.7.2
dependabot[bot] Feb 1, 2024
b67b56b
Rename `master` branch to `main`
cedric-anne Feb 8, 2024
d427cd8
Update dependabot config
cedric-anne Feb 8, 2024
3613535
Use new release workflow
cedric-anne Feb 8, 2024
9e58d3a
Use default CI matrix
cedric-anne Feb 8, 2024
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
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: "GLPI professional support"
url: "https://services.glpi-network.com"
about: "Get professional support from the editor and a network of local partners."
- name: "Find an official partner"
url: "https://glpi-project.org/partners/"
about: "Get support to deploy GLPI in a professional manner."
- name: "GLPI Community Forum"
url: "https://forum.glpi-project.org"
about: "Ask questions and get help from the community."
20 changes: 20 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 2
updates:
# Ensure GitHub Actions are used in their latest version
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"

# Strategy for composer dependencies
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: "monthly"
allow:
- dependency-type: "direct"
open-pull-requests-limit: 100
versioning-strategy: "increase"
groups:
dev-dependencies:
dependency-type: "development"
34 changes: 34 additions & 0 deletions .github/workflows/autoclose-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: "Close issues"

on:
issues:
types: ["opened"]

jobs:
close-issue:
permissions:
issues: "write"
name: "Close issue"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/github-script@v7"
with:
script: |
const issues_url = context.serverUrl + '/' + context.repo.owner + '/' + context.repo.repo + '/issues/new/choose';
await github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `Issues opened on this repository are not processed. Please follow links proposed in ${issues_url}.`
});
await github.rest.issues.lock({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
});
await github.rest.issues.update({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
state: "closed",
});
35 changes: 35 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: "Continuous integration"

on:
push:
branches:
- "main"
tags:
- "*"
pull_request:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

concurrency:
group: "${{ github.workflow }}-${{ github.ref }}"
cancel-in-progress: true

jobs:
generate-ci-matrix:
name: "Generate CI matrix"
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
with:
glpi-version: "10.0.x"
ci:
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
needs: "generate-ci-matrix"
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.generate-ci-matrix.outputs.matrix) }}
uses: "glpi-project/plugin-ci-workflows/.github/workflows/continuous-integration.yml@v1"
with:
plugin-key: "mreporting"
glpi-version: "${{ matrix.glpi-version }}"
php-version: "${{ matrix.php-version }}"
db-image: "${{ matrix.db-image }}"
37 changes: 4 additions & 33 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,11 @@
name: "Plugin release"
name: "Publish release"

on:
push:
tags:
- '*'

jobs:
create-release:
name: "Create release"
runs-on: "ubuntu-latest"
steps:
- name: "Extract tag name"
run: |
echo "tag_name=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
- name: "Checkout"
uses: "actions/checkout@v2"
- name: "Build package"
id: "build-package"
uses: "glpi-project/tools/github-actions/build-package@0.1.15"
with:
plugin-version: ${{ env.tag_name }}
- name: "Create release"
id: "create-release"
uses: "actions/create-release@v1"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.tag_name }}
release_name: ${{ env.tag_name }}
draft: true
- name: "Attach package to release"
uses: "actions/upload-release-asset@v1"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create-release.outputs.upload_url }}
asset_path: ${{ steps.build-package.outputs.package-path }}
asset_name: ${{ steps.build-package.outputs.package-basename }}
asset_content_type: " application/x-bzip2"
publish-release:
name: "Publish release"
uses: "glpi-project/plugin-release-workflows/.github/workflows/publish-release.yml@v1"
19 changes: 19 additions & 0 deletions .phpcs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0"?>
<ruleset>
<file>.</file>
<exclude-pattern>/.git/</exclude-pattern>
<exclude-pattern type="relative">^vendor/</exclude-pattern>
<exclude-pattern type="relative">^lib/</exclude-pattern>
<exclude-pattern type="relative">^locales/</exclude-pattern>

<arg name="colors" />
<arg name="extensions" value="php" />
<arg value="p" />
<arg name="warning-severity" value="0" />

<rule ref="PSR12">
<exclude name="Generic.Files.LineLength" />
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
</rule>
<rule ref="Generic.Arrays.ArrayIndent"></rule>
</ruleset>
15 changes: 0 additions & 15 deletions .travis.yml

This file was deleted.

12 changes: 7 additions & 5 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
[main]
host = https://www.transifex.com

[glpi-project-plugin-mreporting.mreporting-pot]
file_filter = locales/<lang>.po
source_file = locales/mreporting.pot
source_lang = en_GB
type = PO
[o:teclib:p:glpi-project-plugin-mreporting:r:mreporting-pot]
file_filter = locales/<lang>.po
source_file = locales/mreporting.pot
source_lang = en_GB
type = PO
replace_edited_strings = false
keep_translations = false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Join the chat at https://gitter.im/TECLIB/mreporting](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/TECLIB/mreporting?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

![Dashboard](https://raw.githubusercontent.com/PluginsGLPI/mreporting/master/screenshots/dashboard.png)
![Dashboard](https://raw.githubusercontent.com/PluginsGLPI/mreporting/main/screenshots/dashboard.png)

* Download : https://github.com/PluginsGLPI/mreporting/releases
* WIKI (Develop new reports) : https://github.com/PluginsGLPI/mreporting/wiki
Expand Down
14 changes: 0 additions & 14 deletions RoboFile.php

This file was deleted.

24 changes: 24 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Security Policy

**⚠️ Please never use standard issues to report security problems; vulnerabilities are published once a fix release is available. ⚠️**

## Reporting a Vulnerability

If you found a security issue, please contact us by:

- [our huntr page](https://huntr.dev/repos/pluginsGLPI/mreporting/)
- a mail to \[glpi-security AT ow2.org\]

You should provide us all details about the issue and the way to reproduce it.
You may also provide a script that can be used to check the issue exists.

Once the report will be handled, and if the issue is not yet fixed (or in progress)
we'll add it to the GitHub security tab, and add you as observer. Meanwhile,
you will reserve a CVE for the issue.

Thank you for improving the security of GLPI and its plugins.

## Supported Versions

We follow the same version support policy as GLPI.
This means that we provide security patches to versions of the plugin that target a version of GLPI itself maintained from a security point of view.
53 changes: 27 additions & 26 deletions ajax/common.tabs.php
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
<?php
/*
* @version $Id: HEADER 15930 2011-10-30 15:47:55Z tsmr $
-------------------------------------------------------------------------
Mreporting plugin for GLPI
Copyright (C) 2003-2011 by the mreporting Development Team.

https://forge.indepnet.net/projects/mreporting
-------------------------------------------------------------------------

LICENSE

This file is part of mreporting.

mreporting is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

mreporting is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with mreporting. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------
/**
* -------------------------------------------------------------------------
* Mreporting plugin for GLPI
* -------------------------------------------------------------------------
*
* LICENSE
*
* This file is part of Mreporting.
*
* Mreporting is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* Mreporting is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Mreporting. If not, see <http://www.gnu.org/licenses/>.
* -------------------------------------------------------------------------
* @copyright Copyright (C) 2003-2023 by Mreporting plugin team.
* @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
* @link https://github.com/pluginsGLPI/mreporting
* -------------------------------------------------------------------------
*/

include ("../../../inc/includes.php");
include("../../../inc/includes.php");
header("Content-Type: text/html; charset=UTF-8");
Html::header_nocache();

Expand Down
Loading