Commit 5630c219 authored by Matthieu FAURE's avatar Matthieu FAURE
Browse files

Comptoir-srv v2.3.2

parents c350fbf5 48e6b896
Pipeline #1030 passed with stage
in 6 minutes and 3 seconds
# Create a release for Comptoir-srv
## 1. Change tag in code
## 1. Change version in source code
Project Comptoir-WEB: `config/bootstrap.php`
* Create an issue "prepare vX.Y.Z" and the associated branch + merge request.
* On this branch, change the version in: `config/bootstrap.php`
* Eventually make other adjustments
## 2. Merging into Master
## 2. Merge and tag Develop
* Merge the branch into develop
* Place an RC tag on develop: `vX.Y.Z-rc.1`
## 3. Test on pre-prod server
* Deploy on http://comptoir1404-srv.dev.adullact.lan (following the UPGRADE instructions)
* If something's missing: repeat from step 1 ; else go next step
## 4. Merge into Master
```sh
git checkout master
git merge develop --no-ff -m "Comptoir-srv v1.0.4"
git merge develop --no-ff -m "Comptoir-srv vX.Y.Z"
```
## 3. Tagging
## 5. Tag Master
Create the tag:
```sh
git checkout master
MYTAG="v1.0.4"
MYTAG="vX.Y.Z"
git tag -a $MYTAG -m "$MYTAG"
```
Push the tag and the merge:
```sh
git push origin master
git push origin $MYTAG
```
\ No newline at end of file
# How to upgrade from v2.0.2 to v2.3.0
# How to upgrade from v2.0.2 to v2.3.1
## Save `config/comptoir.php`
......@@ -14,13 +14,15 @@ As user `comptoir`, do:
```shell
cd /home/comptoir/Comptoir-srv && \
git fetch -p && \
git checkout "v2.3.1"
git checkout "v2.3.1" --force
```
**NOTE**: `--force` is mandatory in this upgrade because of issues related to switching to Git-LFS
## Update `config/comptoir.php`
1. Create a new one from the template: `cp comptoir.default.php comptoir.php`
1. Re-add customized values from the old comptoir.php into the new one (like the Piwik stanza)
1. `cd /home/comptoir/Comptoir-srv/config && cp comptoir.default.php comptoir.php`
1. Re-add customized values from the old `comptoir.php` into the new one (like the Piwik stanza)
## Update DB content
......
# How to upgrade from v2.3.1 to v2.3.2
## Save `config/comptoir.php`
```shell
cd /home/comptoir/Comptoir-srv && \
cp config/comptoir.php config/comptoir.php-$(date +%Y-%m-%d_%kh%M)
```
## Grab source code
As user `comptoir`, do:
```shell
cd /home/comptoir/Comptoir-srv && \
git fetch -p && \
git checkout "v2.3.2"
```
## Update `config/comptoir.php`
1. `cd /home/comptoir/Comptoir-srv/config && cp comptoir.default.php comptoir.php`
1. Re-add customized values from the old `comptoir.php` into the new one (like the Piwik stanza)
## Remove temporary i18n files
```shell
sudo rm -f /home/comptoir/Comptoir-srv/tmp/cache/persistent/*
```
\ No newline at end of file
......@@ -326,7 +326,7 @@ Configure::write(
*/
Configure::write('VERSION',
[
"footer" => "v2.3.1"
"footer" => "v2.3.2"
]
);
......
......@@ -100,9 +100,6 @@ class AppController extends Controller
$this->loadComponent('ValidationRules');
$this->request->url = str_replace(["en/", "fr/"], "", $this->request->url);
}
......
......@@ -17,7 +17,7 @@ msgstr ""
#: Template/Element/Pages/footer.ctp:9
msgid "Comptoir du Libre version "
msgstr "Release of Comptoir du Libre "
msgstr "Release of <span lang=\"fr\">Comptoir du Libre</span> "
#: Template/Pages/search.ctp:5;12
msgid "search.results"
......@@ -44,8 +44,7 @@ msgid "menu.switch"
msgstr "Passer en français."
msgid "Paternity.message"
msgstr "The Le COMPTOIR DU LIBRE is a service of "
msgstr "The <span lang=\"fr\">COMPTOIR DU LIBRE</span> is a service of "
msgid "{0} search.title {1}"
msgstr "{0} results for {1}"
......
......@@ -9,36 +9,43 @@ $this->layout = 'base';
$this->assign('title', __d("Home", "Legal"));
?>
<h1><?= __d("Home", "Legal") ?></h1>
<h2> <?= __d("Home", "Postal Adress") ?> </h2>
<h1>
<?= __d("Home", "Legal") ?>
</h1>
<h2>
<?= __d("Home", "Postal Adress") ?>
</h2>
<p>
5 rue du plan du palais 34000 Montpellier, FRANCE
</p>
<p>
836, rue du mas de Verchant - Bât. Le Tucano - 34000 MONTPELLIER
</p>
<h3>
<?= __d("Home","Editor") ?>
<?= __d("Home", "Editor") ?>
</h3>
<p>
ADULLACT
</p>
<p>
ADULLACT
</p>
<h3>
<?= __d("Home","Publication director") ?>
<?= __d("Home", "Publication director") ?>
</h3>
<p>
<?= __d("Home","Pascal Kuczynski, General Director of ADULLACT") ?>
</p>
<h3><?= __d("Home","Hosting") ?></h3>
<p>OVH : 2 rue Kellermann - 59100 Roubaix - France.</p>
<p>
<?= __d("Home", "Pascal Kuczynski, General Director of ADULLACT") ?>
</p>
<h3><?= __d("Home", "Contact") ?></h3>
<p>
<?= __d("Home", "Email address :") ?>
<h3>
<?= __d("Home", "Hosting") ?>
</h3>
<p>
OVH : 2 rue Kellermann 59100 Roubaix, FRANCE
</p>
<a href="mailto:comptoir@adullact.org">comptoir@adullact.org</a>
</p>
<h3>
<?= __d("Home", "Contact") ?>
</h3>
<p>
<?= __d("Home", "Email address :") ?>
<a href="mailto:comptoir@adullact.org">comptoir@adullact.org</a>
</p>
......@@ -26,6 +26,7 @@ body {
#parentship {
text-align: center;
background-color: #BCCDEB;
color: #615454;
font-size: 14px;
padding-top: 12px;
}
......
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