hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 01:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-2967_Lightbox-de-of-send-email-report

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-03-10 11:58:14 +04:00
committed by GitHub
parent 5cc2de772d 510704d6aa
commit a9523f55f3
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -34,6 +34,12 @@ RUN apt-get update \
unoconv \
unzip \
xpdf \
libreoffice-base-core \
libreoffice-impress \
libreoffice-calc \
libreoffice-math \
libreoffice-writer \
libreoffice-pdfimport \
&& update-locale "LANG=fr_FR.UTF-8 UTF-8" \
&& dpkg-reconfigure --frontend noninteractive locales \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \

2
lib/Alchemy/Phrasea/Core/Version.php
View File

@@ -17,7 +17,7 @@ class Version
* @var string
*/
private $number = '4.1.0-alpha.23a';
private $number = '4.1.0-alpha.24a';
/**
* @var string

10
lib/conf.d/bases_structure.xml
View File

@@ -1328,7 +1328,7 @@
<field>
<name>host</name>
<type>char(64)</type>
<type>char(255)</type>
<null></null>
<extra></extra>
@@ -1403,7 +1403,7 @@
</field>
<field>
<name>label_en</name>
<type>char(50)</type>
<type>char(128)</type>
<null>YES</null>
<extra></extra>
<default></default>
@@ -1411,7 +1411,7 @@
</field>
<field>
<name>label_fr</name>
<type>char(50)</type>
<type>char(128)</type>
<null>YES</null>
<extra></extra>
<default></default>
@@ -1419,7 +1419,7 @@
</field>
<field>
<name>label_de</name>
<type>char(50)</type>
<type>char(128)</type>
<null>YES</null>
<extra></extra>
<default></default>
@@ -1427,7 +1427,7 @@
</field>
<field>
<name>label_nl</name>
<type>char(50)</type>
<type>char(128)</type>
<null>YES</null>
<extra></extra>
<default></default>