Verified Commit 5c12d7e0 authored by OldFart's avatar OldFart Committed by Luc Didry
Browse files

pull to update

parent 3bfa3f6b
...@@ -13,4 +13,5 @@ ...@@ -13,4 +13,5 @@
* Pierre Rudloff * Pierre Rudloff
* Belvar (Gwenn M) (breton translation) * Belvar (Gwenn M) (breton translation)
* Ira W. Snyder * Ira W. Snyder
* Arnaud de Mouhy (docker port) * Arnaud de Mouhy (docker port)
\ No newline at end of file * Mathieu Aubin
\ No newline at end of file
# How to contribute? # How to contribute?
The official git repository is <https://framagit.org/luc/lstu>. The official git repository is <https://framagit.org/fiat-tux/hat-softwares/lstu>.
You can create an account on Framagit with your Github/Gitlab/Bitbucket account. You can create an account on Framagit with your Github/Gitlab/Bitbucket account.
## Issues ## Issues
Please, post any issue on <https://framagit.org/luc/lstu/issues>. Please, post any issue on <https://framagit.org/fiat-tux/hat-softwares/lstu/issues>.
## Merge requests ## Merge requests
Please, post any merge request on <https://framagit.org/luc/lstu/merge_requests>. Please, post any merge request on <https://framagit.org/fiat-tux/hat-softwares/lstu/merge_requests>.
For your merge request to be accepted, please: For your merge request to be accepted, please:
- use 4 spaces for indentation - use 4 spaces for indentation
......
...@@ -7,7 +7,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ ...@@ -7,7 +7,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="Let's Shorten That URL" \ org.label-schema.name="Let's Shorten That URL" \
org.label-schema.url="https://lstu.fr/" \ org.label-schema.url="https://lstu.fr/" \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url="https://git.framasoft.org/luc/lstu" \ org.label-schema.vcs-url="https://framagit.org/fiat-tux/hat-softwares/lstu" \
org.label-schema.vendor="Luc Didry" \ org.label-schema.vendor="Luc Didry" \
org.label-schema.version=$VERSION \ org.label-schema.version=$VERSION \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
......
...@@ -10,9 +10,9 @@ Lstu is licensed under the terms of the WTFPL. See the LICENSE file. ...@@ -10,9 +10,9 @@ Lstu is licensed under the terms of the WTFPL. See the LICENSE file.
## Installation ## Installation
Please, see the [wiki](https://framagit.org/luc/lstu/wikis/home). Please, see the [wiki](https://framagit.org/fiat-tux/hat-softwares/lstu/wikis/home).
Or you can see [usage with Docker](https://framagit.org/luc/lstu/wikis/usage-with-docker). Or you can see [usage with Docker](https://framagit.org/fiat-tux/hat-softwares/lstu/wikis/usage-with-docker).
## How many URLs can it handle ? ## How many URLs can it handle ?
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<p> <p>
<small>&copy; 2013 — <%= $year %> <%= link_to 'Luc Didry' => 'https://fiat-tux.fr' %> — <small>&copy; 2013 — <%= $year %> <%= link_to 'Luc Didry' => 'https://fiat-tux.fr' %> —
<%= l('License:') %> <%= link_to 'WTFPL' => 'http://www.wtfpl.net/' %> — <%= l('License:') %> <%= link_to 'WTFPL' => 'http://www.wtfpl.net/' %> —
<%= link_to l('About') => 'https://framagit.org/luc/lstu/blob/master/README.md' %> <%= link_to l('About') => 'https://framagit.org/fiat-tux/hat-softwares/lstu/blob/master/README.md' %>
<%= link_to 'API' => url_for('api') %> — <%= link_to 'API' => url_for('api') %> —
% if (defined(config('ldap')) || defined(config('htpasswd'))) { % if (defined(config('ldap')) || defined(config('htpasswd'))) {
% if (is_user_authenticated()) { % if (is_user_authenticated()) {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<p> <p>
<small>&copy; 2013 — <%= $year %> <%= link_to 'Luc Didry' => 'https://fiat-tux.fr' %> — <small>&copy; 2013 — <%= $year %> <%= link_to 'Luc Didry' => 'https://fiat-tux.fr' %> —
<%= l('License:') %> <%= link_to 'WTFPL' => 'http://www.wtfpl.net/' %> — <%= l('License:') %> <%= link_to 'WTFPL' => 'http://www.wtfpl.net/' %> —
<%= link_to l('About') => 'https://framagit.org/luc/lstu/blob/master/README.md' %> <%= link_to l('About') => 'https://framagit.org/fiat-tux/hat-softwares/lstu/blob/master/README.md' %>
<%= link_to 'API' => url_for('api') %> — <%= link_to 'API' => url_for('api') %> —
% if (defined(config('ldap')) || defined(config('htpasswd'))) { % if (defined(config('ldap')) || defined(config('htpasswd'))) {
% if (is_user_authenticated()) { % if (is_user_authenticated()) {
......
[Unit] [Unit]
Description=Shortened URLs service job queue Description=Shortened URLs service job queue
Documentation=https://framagit.org/luc/lstu Documentation=https://framagit.org/fiat-tux/hat-softwares/lstu
[Service] [Service]
Type=simple Type=simple
......
[Unit] [Unit]
Description=Shortened URLs service Description=Shortened URLs service
Documentation=https://framagit.org/luc/lstu Documentation=https://framagit.org/fiat-tux/hat-softwares/lstu
Requires=network.target Requires=network.target
After=network.target After=network.target
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment