Commit Graph

15801 Commits

Author SHA1 Message Date
Nicolas Maillat
da6a5eb2e2 Merge pull request #3730 from alchemy-fr/PHRAS-3374-upload-overlay-loading
PHRAS-3374 Merge Prod - upload overlay - rendering issue on Upload Overlays loading
2021-02-22 10:59:43 +01:00
Nicolas Maillat
82af639834 Merge branch 'master' into PHRAS-3374-upload-overlay-loading 2021-02-22 09:53:29 +01:00
aynsix
6562d090a0 PHRAS-3374 add version on lazy js loading 2021-02-19 15:34:07 +03:00
Nicolas Maillat
ef1f425e67 Merge pull request #3729 from alchemy-fr/PHRAS-3080-change-cgu-pdfname
PHRAS-3080 merge change cgu pdf filename
2021-02-19 09:52:11 +01:00
Nicolas Maillat
c3cac892a5 Merge branch 'master' into PHRAS-3080-change-cgu-pdfname 2021-02-19 09:23:40 +01:00
Nicolas Maillat
87167d84a2 Merge pull request #3728 from alchemy-fr/PHRAS-3375-port-download-link-validity
PHRAS-3375 merge Port to 4.1 - download-link-validity: 24 , Email - download link TTL
2021-02-19 09:22:31 +01:00
aynsix
0099a0b415 PHRAS-3080 change cgu pdf filename 2021-02-19 11:09:38 +03:00
aynsix
7ece4a0a95 regenerate translation 2021-02-19 09:51:53 +03:00
aynsix
0acb987287 merge master in branch 2021-02-19 09:39:46 +03:00
aynsix
d568933f3e fix 2021-02-19 09:33:16 +03:00
Nicolas Maillat
a55d63e257 Merge pull request #3709 from alchemy-fr/PHRAS-3153_Api-doc-to-Swagger
PHRAS-3153 merge Doc-to-Swagger
2021-02-18 20:32:54 +01:00
Nicolas Maillat
aeed51f4f3 Merge branch 'master' into PHRAS-3153_Api-doc-to-Swagger 2021-02-18 19:36:26 +01:00
Nicolas Maillat
ee673c8030 Merge pull request #3718 from alchemy-fr/PHRAS-2283-port-access-windows
PHRAS-2283 merge Port to 4.1 - Prod - Account- Refacto - Request collection access Autorisation windows
2021-02-18 19:34:44 +01:00
Nicolas Maillat
6a5d73895f Merge branch 'master' into PHRAS-2283-port-access-windows 2021-02-18 19:14:53 +01:00
Nicolas Maillat
08cb76d054 Translated using Weblate (German)
Currently translated at 99.8% (2701 of 2704 strings)
2021-02-18 18:13:19 +00:00
Nicolas Maillat
6665265415 Translated using Weblate (French)
Currently translated at 99.8% (2699 of 2704 strings)
2021-02-18 18:13:19 +00:00
Nicolas Maillat
18e30e2a22 Translated using Weblate (English)
Currently translated at 99.7% (2696 of 2704 strings)
2021-02-18 18:12:00 +00:00
Nicolas Maillat
5377cb43e3 Merge pull request #3725 from alchemy-fr/PHRAS-3080-export-cgu
PHRAS-3080 Merge When a document is exported , add a PDF File with CGU
2021-02-18 18:36:10 +01:00
Nicolas Maillat
229c45f412 Merge branch 'master' into PHRAS-3080-export-cgu 2021-02-18 18:02:13 +01:00
Nicolas Maillat
4a2e3f14b3 Merge pull request #3727 from alchemy-fr/PHRAS-3372-refacto_phraseanet_entrypoint
PHRAS-3372 Merge Refacto Phraseanet entrypoint
2021-02-18 18:01:54 +01:00
nmaillat
b340205979 PHRAS-3372 update readme 2021-02-18 17:34:14 +01:00
aynsix
2f6bf46266 PHRAS-3375 port download validity link 2021-02-18 17:59:00 +03:00
nmaillat
a296065aae PHRAS-3372 update readme 2021-02-18 15:57:02 +01:00
nmaillat
6e9175d00c PHRAS-3372 update readme 2021-02-18 15:51:01 +01:00
nmaillat
3e1ac197c0 PHRAS-3372 update readme 2021-02-18 15:46:05 +01:00
nmaillat
57c02f4b3a PHRAS-3372 update readme 2021-02-18 13:43:12 +01:00
nmaillat
884b3ec0e5 PHRAS-3372 update readme add notes 2021-02-18 13:36:54 +01:00
nmaillat
b95bee3787 PHRAS-3372 update readme fix typo 2
update linux host requirement
2021-02-18 13:27:28 +01:00
nmaillat
7a4c363665 PHRAS-3372 update readme fix typo 2021-02-18 13:19:17 +01:00
aynsix
96f5c8273e Merge branch 'PHRAS-3080-export-cgu' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3080-export-cgu 2021-02-18 15:08:56 +03:00
aynsix
02973eff96 change pdf name 2021-02-18 15:08:13 +03:00
nmaillat
0aa4b720c0 PHRAS-3372 update readme 2021-02-18 13:06:23 +01:00
aynsix
3906cb0bfd change pdf name 2021-02-18 15:01:51 +03:00
nmaillat
92b9c1e88e PHRAS-3372 refacto Phraseanet entrypoint
Add more env variable for install, setup and upgrade (WIP)
 Setting language and default language
 Trusted proxies setting refacto
[SKIP CI]
2021-02-18 01:46:48 +01:00
aina esokia
97aacd0029 PHRAS-3080 add infodate 2021-02-17 15:08:58 +03:00
aina esokia
824e34d621 PHRAS-3080 add records thumbnail in cgu pdf 2021-02-17 13:54:33 +03:00
jygaulier
e384c9da2f Merge branch 'master' into PHRAS-2283-port-access-windows 2021-02-16 17:51:47 +01:00
aina esokia
2fb345b936 do not cgu if no exist 2021-02-16 18:19:17 +03:00
aina esokia
e5812aa1cf Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3080-export-cgu 2021-02-16 18:17:42 +03:00
Nicolas Maillat
aa7727b4db Merge pull request #3726 from alchemy-fr/PHRAS-3364-remove-duplicate-db-mailhog
PHRAS-3364 merge removing db service from depends_on for phraseanet and worker
2021-02-16 14:38:26 +01:00
nmaillat
3bf0397614 PHRAS-3364 removing db service form depends_on for phraseanet and worker 2021-02-16 13:45:10 +01:00
aina esokia
fc73ae6834 fix test 2021-02-16 15:34:51 +03:00
aina esokia
74c66a7fef PHRAS-3080 add pdf file cgu in zip 2021-02-16 15:09:52 +03:00
Nicolas Maillat
96c4ca57bd Merge pull request #3724 from alchemy-fr/PHRAS-3364-remove-duplicate-db-mailhog
PHRAS-3364 merge  remove duplicate entry for db and mailhog service
2021-02-16 11:39:06 +01:00
Nicolas Maillat
fc979cf2ab PHRAS-3364 remove duplicate entry for db mailhog 2021-02-16 11:22:37 +01:00
Nicolas Maillat
58b69d21ab Merge pull request #3723 from alchemy-fr/PHRAS-3364-remove-duplicate-COMPOSE_FILE
PHRAS-3364 merge remove duplicate COMPOSE_FILE
2021-02-16 10:13:59 +01:00
Nicolas Maillat
dfcd6d7324 PHRAS-3364 remove duplicate COMPOSE_FILE 2021-02-16 09:45:33 +01:00
Nicolas Maillat
865467dd3c Merge pull request #3722 from alchemy-fr/PHRAS-3346_Healthcheck_Gateway_check_Fpm
PHRAS-3346 merge Healtcheck in gateway, nginx reload configuration if fpm i…
2021-02-15 19:37:18 +01:00
nmaillat
6c9f936efb PHRAS-3346 Healtcheck in gateway, nginx reload configuration if fpm is not up 2021-02-15 19:13:10 +01:00
Nicolas Maillat
e3fe04e4b5 Merge pull request #3720 from alchemy-fr/PHRAS-3364_explode_compose_file
PHRAS-3364 merge explode compose file
2021-02-15 18:33:35 +01:00