Commit Graph

14336 Commits

Author SHA1 Message Date
Nicolas Maillat
2da426b52b Translated using Weblate (French)
Currently translated at 99.7% (2474 of 2479 strings)
2020-05-04 19:04:12 +00:00
Nicolas Maillat
f4da73fc94 Translated using Weblate (English)
Currently translated at 99.8% (2475 of 2479 strings)
2020-05-04 19:04:12 +00:00
Nicolas Maillat
06699addb7 Translated using Weblate (English)
Currently translated at 99.7% (2472 of 2479 strings)
2020-05-04 18:49:51 +00:00
Harrys Ravalomanana
6b8455a73d PHRAS-3047 fix on design 2020-05-04 19:51:56 +04:00
Harrys Ravalomanana
3dbc40d731 PHRAS-3047 fix on design 2020-05-04 19:50:10 +04:00
Harrys Ravalomanana
eb15932d8f Merge branch 'master' into PHRAS-3047_front_of_tools_metadatas_tab 2020-05-04 17:43:14 +04:00
Nicolas Maillat
06963f0615 Merge pull request #3466 from alchemy-fr/PHRAS-3044_Prod_vide_editor
PHRAS-3044: #comment merge Prod - Video editor - Design language fix and default title of chapter
2020-05-04 15:07:12 +02:00
Harrys Ravalomanana
fa256b6b32 PHRAS-3044 Fix on video tools 2020-05-04 15:18:26 +04:00
Harrys Ravalomanana
b4eebb4e4f PHRAS-3047 2020-04-30 23:18:53 +04:00
Nicolas Maillat
55e1a1a0d5 Merge branch 'master' into PHRAS-3047_front_of_tools_metadatas_tab 2020-04-30 14:55:12 +02:00
Nicolas Maillat
104c9c0254 Merge branch 'master' into PHRAS-2524-worker-log 2020-04-30 14:49:31 +02:00
Nicolas Maillat
952af74c93 Merge pull request #3463 from alchemy-fr/PHRAS-3048_Re_adding_cache_directory_in_41
PHRAS-3048 #comment merge re-adding cache directory on 4.1
2020-04-30 14:48:20 +02:00
Harrys Ravalomanana
b5122a1d03 PHRAS-3048 re-adding cache directory on 4.1 2020-04-30 16:04:21 +04:00
Harrys Ravalomanana
dbe85dd498 PHRAS-3047 Tools metadatas tab 2020-04-30 15:15:31 +04:00
Nicolas Maillat
ce67e042f0 Merge branch 'master' into PHRAS-2524-worker-log 2020-04-30 12:52:27 +02:00
Nicolas Maillat
f0dca65f69 Merge pull request #3462 from alchemy-fr/PHRAS-3043-fix-upload-file-error
PHRAS-3043 #comment merge Prod - After launch upload overlay in Prod - In editing, panels model, thesaurus, geonames, geoloc is NOK
2020-04-30 12:52:11 +02:00
Harrys Ravalomanana
46544407af PHRAS-3043 upgrade phraseanet-production-client 2020-04-29 18:30:29 +04:00
Harrys Ravalomanana
16b705e8f2 PHRAS-3043 Fix on upload file 2020-04-29 14:51:31 +04:00
Nicolas Maillat
b36f652cd1 Merge pull request #3458 from alchemy-fr/PHRAS-2851_lightbox-Feedback_Fix_on_summary_window
PHRAS-2851 #comment merge Lightbox - Feedback desktop: not possible to see the reviews summary
2020-04-29 09:38:03 +02:00
Nicolas Maillat
92a98d280b Merge branch 'master' into PHRAS-2851_lightbox-Feedback_Fix_on_summary_window 2020-04-28 19:09:57 +02:00
Jennifer
0fef22ee09 Translated using Weblate (German)
Currently translated at 99.7% (2474 of 2479 strings)
2020-04-28 15:07:11 +00:00
Jennifer
1add0f7fd6 Translated using Weblate (French)
Currently translated at 99.8% (2476 of 2479 strings)
2020-04-28 15:07:11 +00:00
Nicolas Maillat
245773e826 Translated using Weblate (French)
Currently translated at 99.8% (2476 of 2479 strings)
2020-04-28 14:09:12 +00:00
Nicolas Maillat
79716efb74 Merge pull request #3461 from alchemy-fr/PHRAS-1071-fix-detail-view
PHRAS-1071 #comment merge 4.1 Prod / detailled view / basket link
2020-04-28 14:55:36 +02:00
Harrys Ravalomanana
ab64f131d1 PHRAS-2851 Set the summary buton to be clickable alltime 2020-04-28 14:25:33 +04:00
aynsix
fe6c14b574 fix basket sql request 2020-04-28 12:25:45 +03:00
Nicolas Maillat
7e2d9e9613 Merge branch 'master' into PHRAS-2524-worker-log 2020-04-27 20:53:22 +02:00
Nicolas Maillat
482b23a5a5 Merge pull request #3460 from alchemy-fr/PHRAS-3042
PHRAS-3042 #comment merge Admin - User edit - keep right pict always visible.
2020-04-27 20:46:21 +02:00
Nicolas Maillat
d752481a26 Merge branch 'master' into PHRAS-3042 2020-04-27 18:59:19 +02:00
Nicolas Maillat
e7739ed1bf Merge pull request #3459 from alchemy-fr/PHRAS-3041_Fix_Admin_tooltip_ui
PHRAS-3041 #comment merge Admin - connected user - roll over on user - user info - css is NOK
2020-04-27 18:58:58 +02:00
Harrys Ravalomanana
5cf68aac9a PHRAS-3042 2020-04-27 15:53:28 +04:00
Harrys Ravalomanana
a610aa7b60 remove unused library juery timepicker 2020-04-27 15:41:14 +04:00
Harrys Ravalomanana
12849e1beb PHRAS-3041 #comment fix Admin tooltip_ui display #time 2h 2020-04-27 15:23:52 +04:00
Harrys Ravalomanana
402113d55b PHRAS-2851 2020-04-27 15:16:51 +04:00
Harrys Ravalomanana
75607bcd7f PHRAS-2851 #comment fix lightbox summary display #time 3h 2020-04-27 14:10:48 +04:00
Nicolas Maillat
a262c57d8b add app error in filebeat conf 2020-04-27 09:44:43 +02:00
Nicolas Maillat
f6a1df0af9 Merge pull request #3456 from alchemy-fr/PHRAS-3037_Prod_fix_reload_mapbox
PHRAS-3037 #comment merge Prod - Query with map - at reload the map box circle generate an error
2020-04-25 00:37:38 +02:00
Nicolas Maillat
7cc6d40d63 Merge branch 'master' into PHRAS-3037_Prod_fix_reload_mapbox 2020-04-25 00:15:35 +02:00
Nicolas Maillat
5be92e7d2c Merge pull request #3450 from alchemy-fr/PHRAS-3031-trim-email-adress
PHRAS-3031 #comment merge  user account - remove space at end of email adress
2020-04-25 00:15:14 +02:00
Nicolas Maillat
674b320925 Merge branch 'master' into PHRAS-3031-trim-email-adress 2020-04-24 22:12:40 +02:00
aynsix
30fa50f48d put worker log to ELK 2020-04-24 20:27:11 +03:00
Jennifer
fa25b39da8 Translated using Weblate (German)
Currently translated at 99.7% (2473 of 2479 strings)
2020-04-24 15:51:57 +00:00
Nicolas Maillat
46e5967c4c Translated using Weblate (French)
Currently translated at 99.8% (2476 of 2479 strings)
2020-04-24 15:51:57 +00:00
Jennifer
087ff20f1d Translated using Weblate (English)
Currently translated at 99.7% (2473 of 2479 strings)
2020-04-24 15:51:57 +00:00
Harrys Ravalomanana
977a84d3b5 PHRAS-3037 2020-04-24 17:46:07 +04:00
Nicolas Maillat
eae612cd5e Merge branch 'master' into PHRAS-3031-trim-email-adress 2020-04-24 13:38:51 +02:00
Nicolas Maillat
e212eb5732 Merge pull request #3455 from alchemy-fr/PHRAS-3035_Prod_videoTools_change_save_message
PHRAS-3035 #comment merge  Prod - videotools - change save message
2020-04-24 13:38:15 +02:00
Nicolas Maillat
10c73e9ea8 Merge branch 'master' into PHRAS-3035_Prod_videoTools_change_save_message 2020-04-24 13:04:01 +02:00
Nicolas Maillat
3327dd457f Merge pull request #3451 from alchemy-fr/PHRAS-3033_Prod_tools_with_storie
PHRAS-3033 #comment merge Prod - 500 error when click on "Tools" (action bar) with a story in selection.
2020-04-24 13:02:19 +02:00
Nicolas Maillat
692b738809 Merge branch 'master' into PHRAS-3033_Prod_tools_with_storie 2020-04-24 13:00:20 +02:00