Skip to content

Commit

Permalink
v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorentPoinsaut committed Nov 26, 2023
1 parent c8fb7de commit af5d17d
Show file tree
Hide file tree
Showing 14 changed files with 281 additions and 373 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Lint Markdown
uses: articulate/actions-markdownlint@v1
uses: DavidAnson/markdownlint-cli2-action@v13
with:
files: '**/*.md'
globs: '**/*.md'
- name: Run ShellCheck
uses: azohra/shell-linter@latest
with:
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Solution Libre website

Copyright (C) 2017-2021 Solution Libre SAS
Copyright (C) 2017-2023 Solution Libre SAS

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
1. [Overview](#overview)
2. [Setup](#setup)
3. [Copyright and License](#copyright-and-license)
4. [Contributors](#contributors)
1. [Start Bootstrap - Freelancer](#start-bootstrap---freelancer)
2. [Solution Libre's website](#solution-libres-website)
4. [Development](#development)
5. [Contributors](#contributors)

## Overview

The Solution Libre's website is based on [Start Bootstrap](http://startbootstrap.com/) -
[Freelancer](http://startbootstrap.com/template-overviews/freelancer/).
The Solution Libre's website is based on [Start Bootstrap](https://startbootstrap.com/) - [Freelancer](https://startbootstrap.com/theme/freelancer/).

## Setup

Expand All @@ -21,14 +23,14 @@ The Solution Libre's website is based on [Start Bootstrap](http://startbootstrap

## Copyright and License

### [Start Bootstrap](http://startbootstrap.com/) - [Freelancer](http://startbootstrap.com/template-overviews/freelancer/)
### [Start Bootstrap](https://startbootstrap.com/) - [Freelancer](https://startbootstrap.com/theme/freelancer/)

Copyright (C) 2013-2016 Blackrock Digital LLC. Code released under the
Copyright (C) 2013-2023 Blackrock Digital LLC. Code released under the
[MIT](https://github.com/BlackrockDigital/startbootstrap-freelancer/blob/gh-pages/LICENSE) license.

### Solution Libre's website

Copyright (C) 2017-2022 Solution Libre SAS. Code released under the
Copyright (C) 2017-2023 Solution Libre SAS. Code released under the
[AGPL-3.0](https://raw.githubusercontent.com/solution-libre/website/master/LICENSE) license.

## Development
Expand Down
2 changes: 1 addition & 1 deletion bin/composer
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

cd "$(dirname "$0")/.." || exit 1

docker-compose --profile dev run --rm composer "$@"
docker compose --profile dev run --rm composer "$@"
5 changes: 3 additions & 2 deletions bin/install
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

cd "$(dirname "$0")/.." || exit 1

if command -v docker-compose > /dev/null; then
if command -v docker compose > /dev/null; then
composer_cmd="./bin/composer"
npm_cmd="./bin/npm"
elif command -v composer > /dev/null && command -v npm > /dev/null; then
composer_cmd='composer'
npm_cmd='npm'
else
echo 'docker-compose is require'
echo >&2 'docker compose is require'
exit 2
fi

${composer_cmd} install
Expand Down
2 changes: 1 addition & 1 deletion bin/npm
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

cd "$(dirname "$0")/.." || exit 1

docker-compose --profile dev run --rm node npm "$@"
docker compose --profile dev run --rm node npm "$@"
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "solution-libre/website",
"version": "1.0.1",
"version": "1.1.0",
"description": "Solution Libre's website",
"type": "project",
"require": {
"symfony/mailer": "^5.3",
"symfony/dotenv": "^5.3"
"symfony/mailer": "^6.3",
"symfony/dotenv": "^6.3"
},
"license": "AGPL-3.0-or-later",
"autoload": {
Expand All @@ -15,7 +15,7 @@
},
"config": {
"platform": {
"php": "7.4"
"php": "8.1"
}
}
}
Loading

0 comments on commit af5d17d

Please sign in to comment.