Nicolas Maillat
e627beb54d
Merge branch 'master' into PHRAS-3164_lightbox-download_link
2020-08-04 18:36:27 +02:00
Nicolas Maillat
7980c6203d
Merge pull request #3585 from alchemy-fr/PHRAS-3193-svg-file
...
PHRASE-3193 Merge SVG file is broken by exiftool, we stop to write meta in file, this fix have a side effect on lazaret checker , the checker based on document unique id doesn't work anymore for svg files
2020-08-04 18:36:03 +02:00
Nicolas Maillat
97454fcc8c
Merge branch 'master' into PHRAS-3193-svg-file
2020-08-04 18:02:36 +02:00
Nicolas Maillat
92f8e8d476
Merge branch 'master' into PHRAS-3196-change-download-file-in-uploader
2020-08-04 17:26:47 +02:00
aynsix
82710b8896
force svg mime type
2020-08-04 17:52:29 +03:00
Nicolas Maillat
9a61b388a7
Merge pull request #3588 from alchemy-fr/PHRAS-2145-Prod_refacto_Move_modal_2
...
PHRAS-2145 merge Prod - refacto "move" record form collection overlay.
2020-08-04 16:36:09 +02:00
aynsix
252f0d6744
change download url in uploader
2020-08-04 17:11:02 +03:00
Harrys Ravalomanana
daa6b040b9
Merge branch 'master' into PHRAS-2145-Prod_refacto_Move_modal_2
2020-08-04 17:52:24 +04:00
Nicolas Maillat
5fe95d0267
Merge pull request #3586 from alchemy-fr/PHRAS-3197_Prod_subtitle_clean_design
...
PHRAS-3197 merge Prod- subtitlings screen - clean design
2020-08-04 15:51:31 +02:00
Harrys
22f04f8a54
PHRAS-2145
2020-08-04 17:48:14 +04:00
Harrys Ravalomanana
57e39ffa53
PHRAS-3197
2020-08-04 14:50:51 +04:00
aynsix
0703bd63db
fix list email to display on admin
2020-08-04 10:57:33 +03:00
Harrys Ravalomanana
d25e72469f
PHRAS-3197 Prod subtitle
2020-08-04 11:56:02 +04:00
aynsix
cc8dd8842c
can't write meta on svg file
2020-08-03 19:56:12 +03:00
aynsix
6733f4e9b7
reconnect entity manager if needed
2020-08-03 17:14:55 +03:00
Harrys Ravalomanana
be1f4aac1c
PHRAS-3164 add destination mail list
2020-08-03 18:02:27 +04:00
Harrys Ravalomanana
241d1e5e7a
PHRAS-3188
2020-08-03 17:57:46 +04:00
Harrys Ravalomanana
8e6c458d2b
Merge branch 'master' into PHRAS-3188-Prod_Expose_front_in_Phraseanet
2020-08-03 15:56:04 +04:00
Harrys Ravalomanana
fdada32359
PHRAS-3164 Merge from master
2020-08-03 15:37:42 +04:00
Harrys Ravalomanana
e0ade214a0
PHRAS-3164 merge transaltion from master
2020-08-03 15:33:40 +04:00
Harrys Ravalomanana
3d3dc52aaf
PHRAS-3188 Prod expose Tab
2020-07-31 17:41:57 +04:00
Harrys Ravalomanana
a7855247b2
PHRAS-3189 template
2020-07-31 15:21:20 +04:00
Harrys Ravalomanana
86d6989c51
PHRAS-3188
2020-07-31 12:09:26 +04:00
Harrys Ravalomanana
5df99d26be
PHRAS-3188
2020-07-30 18:38:51 +04:00
Nicolas Maillat
ea7e3f2ae0
Translated using Weblate (French)
...
Currently translated at 99.0% (2577 of 2602 strings)
2020-07-30 13:00:23 +00:00
Nicolas Maillat
f0f1455366
Translated using Weblate (English)
...
Currently translated at 99.0% (2578 of 2602 strings)
2020-07-30 12:58:00 +00:00
Nicolas Maillat
db6470ccc7
Merge pull request #3582 from alchemy-fr/PHRAS-3117-bis-move-video-tools_from-action-bar
...
PHRAS-3116 merge Prod - video-tools - Front for ask and edit subtitle or transcript generation
2020-07-30 14:38:26 +02:00
Harrys Ravalomanana
79ae1a2d67
PHRAS-3117 Add string translations
2020-07-30 14:37:26 +04:00
Harrys Ravalomanana
58d374fc81
PHRAS-3189 Admin template
2020-07-30 12:46:30 +04:00
Nicolas Maillat
05ef6d9a01
Merge pull request #3575 from alchemy-fr/PHRAS-3117-bis-move-video-tools_from-action-bar
...
PHRAS-3117 merge Prod move video tools from action bar to local edit menu
2020-07-30 10:20:47 +02:00
Harrys Ravalomanana
1e533da21f
PHRAS-3117 code improvement
2020-07-29 18:02:48 +04:00
Harrys Ravalomanana
df66b7c720
PHRAS-3189 front admin expose
2020-07-29 17:00:10 +04:00
Harrys Ravalomanana
05a25b68db
PHRAS-3117 : upgrade phraseanet-production-client
2020-07-29 15:40:17 +04:00
Harrys Ravalomanana
29847ffad2
Merge branch 'master' into PHRAS-3117-bis-move-video-tools_from-action-bar
2020-07-29 15:35:19 +04:00
Harrys Ravalomanana
ebd5414add
PHRAS-3189: Admin expose : add template
2020-07-29 15:27:20 +04:00
Nicolas Maillat
8d7d195cf3
Merge pull request #3578 from alchemy-fr/PHRAS-3156_prod_request_map_memorise_zoom_level
...
PHRAS-3156 merge Prod - request map - memorise zoom level Between to search session
2020-07-29 12:44:17 +02:00
Nicolas Maillat
d3378ea3b3
Merge branch 'master' into PHRAS-3156_prod_request_map_memorise_zoom_level
2020-07-29 12:23:09 +02:00
Nicolas Maillat
03bc93ea5f
Merge branch 'master' into PHRAS-3117-bis-move-video-tools_from-action-bar
2020-07-29 12:14:06 +02:00
Nicolas Maillat
8b829d3016
Merge pull request #3490 from alchemy-fr/PHRAS-3078-Prod_redirect_end_session
...
PHRAS-3078 merge prod - redirect user on home when received 403 with "end session "
2020-07-29 12:13:44 +02:00
Harrys Ravalomanana
f79d1a3707
Merge branch 'master' into PHRAS-3189_Admin_expose_setting
2020-07-29 11:52:36 +04:00
Harrys Ravalomanana
c865bbeb4c
PHRAS-3164
2020-07-29 11:14:19 +04:00
Nicolas Maillat
d03b43f696
Merge branch 'master' into PHRAS-3078-Prod_redirect_end_session
2020-07-28 15:53:40 +02:00
Nicolas Maillat
e5bee9a625
Merge pull request #3576 from alchemy-fr/PHRAS-3181-add-error-status
...
PHRAS-3181 : Worker video build subdefinition ended with error and tmp file is not copied to destination
2020-07-28 15:53:25 +02:00
Nicolas Maillat
686946ca45
Merge branch 'master' into PHRAS-3181-add-error-status
2020-07-28 15:31:26 +02:00
Nicolas Maillat
7503fc8363
Merge branch 'master' into PHRAS-3156_prod_request_map_memorise_zoom_level
2020-07-28 14:56:26 +02:00
Nicolas Maillat
f4777feb5e
Merge pull request #3581 from alchemy-fr/PHRAS-3192-Add-inkscape-in-Dockerfile
...
PHRAS-3192 merge add inkscape apt package to Dokerfile for svg files
2020-07-28 13:34:02 +02:00
Moctar
16a1260f7a
PHRAS-3192 - add inkscape apt package to Dokerfile for svg files
2020-07-28 13:04:43 +02:00
Nicolas Maillat
1d747f6425
Merge branch 'master' into PHRAS-3164_lightbox-download_link
2020-07-28 12:55:32 +02:00
Nicolas Maillat
47d647e72f
Merge branch 'master' into PHRAS-3078-Prod_redirect_end_session
2020-07-28 12:53:27 +02:00
Nicolas Maillat
6dea47bc2b
Merge branch 'master' into PHRAS-3181-add-error-status
2020-07-28 12:41:48 +02:00
