Skip to content

Commit

Permalink
Merge branch 'master' into autocomplete-password
Browse files Browse the repository at this point in the history
  • Loading branch information
coudot authored Jul 11, 2024
2 parents 3545d58 + c4a7efc commit 700e0c6
Show file tree
Hide file tree
Showing 102 changed files with 19,905 additions and 26,127 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: CI

on: [push]

jobs:
build-test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: php-actions/composer@v6
with:
php_version: "7.4"
php_extensions: ldap
- name: PHPUnit Tests for php7.4
uses: php-actions/phpunit@v3
with:
configuration: tests/phpunit.xml
version: 5.7.25
php_version: 7.4
args: --coverage-text
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
templates_c/*
cache/*
docs/_build
/vendor/
/vendor/
/htdocs/vendor/bootstrap/
22 changes: 22 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.11"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: docs/conf.py

# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
install:
- requirements: docs/requirements.txt
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Service Desk

[![Build Status](https://github.com/ltb-project/service-desk/actions/workflows/ci.yml/badge.svg)](https://github.com/ltb-project/service-desk/actions/workflows/ci.yml)
[![Documentation Status](https://readthedocs.org/projects/service-desk/badge/?version=latest)](https://service-desk.readthedocs.io/en/latest/?badge=latest)
[![Build Status](https://travis-ci.org/ltb-project/service-desk.svg?branch=master)](https://travis-ci.org/ltb-project/service-desk)

Application for support team who need to check, lock, unlock and reset user passwords.

Expand Down
26 changes: 23 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
{
"require": {
"ltb-project/ldap": "v0.1.0-alpha"
"components/jquery": "v3.7.1",
"datatables.net/datatables.net-bs5": "2.0.8",
"datatables.net/datatables.net-buttons-bs5": "3.0.2",
"fortawesome/font-awesome": "v6.5.2",
"ltb-project/ldap": "v0.1.0",
"twbs/bootstrap": "v5.3.2"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
"scripts": {
"post-update-cmd": [
"rm -rf htdocs/vendor/bootstrap",
"cp -R vendor/twbs/bootstrap/dist htdocs/vendor/bootstrap",
"rm -f htdocs/vendor/jquery/js/*",
"cp vendor/components/jquery/jquery.min.* htdocs/vendor/jquery/js/",
"rm -f htdocs/vendor/datatables/*.js htdocs/vendor/datatables/*.css",
"cp vendor/datatables.net/datatables.net/js/dataTables.min.js htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-bs5/css/dataTables.bootstrap5.min.css htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-bs5/js/dataTables.bootstrap5.min.js htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-buttons/js/dataTables.buttons.min.js htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-buttons-bs5/css/buttons.bootstrap5.min.css htdocs/vendor/datatables/",
"cp vendor/datatables.net/datatables.net-buttons-bs5/js/buttons.bootstrap5.min.js htdocs/vendor/datatables/",
"rm -rf htdocs/vendor/font-awesome/*",
"cp -R vendor/fortawesome/font-awesome/css htdocs/vendor/font-awesome",
"cp -R vendor/fortawesome/font-awesome/webfonts htdocs/vendor/font-awesome"
]
}
}
Loading

0 comments on commit 700e0c6

Please sign in to comment.