Commit Graph

14368 Commits

Author SHA1 Message Date
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
Nicolas Maillat
a5ddb4e44a Merge pull request #3452 from alchemy-fr/PHRAS-2963_Prod_publication_reader
PHRAS-2963 #comment prod - publication reader - suscribing to a feed - refacto design windows
2020-04-24 12:59:53 +02:00
Nicolas Maillat
1737992a88 Merge branch 'master' into PHRAS-3033_Prod_tools_with_storie 2020-04-24 12:43:52 +02:00
Harrys Ravalomanana
22f6bb3a02 PHRAS-3035 #comment fix save message #comment 2h 2020-04-24 12:40:57 +04:00
Harrys Ravalomanana
6235cbb574 PHRAS-2963 2020-04-23 20:21:04 +04:00
Jennifer
0eb21a607e Translated using Weblate (German)
Currently translated at 98.9% (2452 of 2478 strings)
2020-04-23 14:35:17 +00:00
Nicolas Maillat
4cb65eabbd Translated using Weblate (French)
Currently translated at 99.8% (2475 of 2478 strings)
2020-04-23 14:35:17 +00:00
Harrys Ravalomanana
697628450d PHRAS-3033 2020-04-23 15:23:39 +04:00
aynsix
2545d41e8d trim email from form 2020-04-23 12:14:40 +03:00
Nicolas Maillat
d247bc35cb Merge pull request #3448 from alchemy-fr/PHRAS-2184-list-manager-email-domain-filter
PHRAS-2184 : #comment merge of  list manager fill the email domain filter
2020-04-22 21:59:40 +02:00
aynsix
001e5af572 revert : remove trim 2020-04-22 16:58:23 +03:00
aynsix
ada4702d92 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2184-list-manager-email-domain-filter 2020-04-22 13:58:02 +03:00
aynsix
620943c2cf trim field in where clause 2020-04-22 13:53:47 +03:00
Nicolas Maillat
90cd595834 Merge pull request #3449 from alchemy-fr/PHRAS-2669_upgrade_production_client
PHRAS-2669 #comment merge  upgrade phraseanet-production-client , fix regression on video chaptering GUI
2020-04-22 12:04:00 +02:00
Nicolas Maillat
749944a63a Merge branch 'master' into PHRAS-2669_upgrade_production_client 2020-04-22 11:35:16 +02:00
Nicolas Maillat
8c90920616 Merge pull request #3446 from alchemy-fr/PHRAS-2888_Remove_unused_strings
PHRAS-2888 #comment merge of removing  unused strings
2020-04-22 11:35:00 +02:00
Harrys Ravalomanana
ad7cad5e16 PHRAS-2669 upgrade phraseanet-production-client 2020-04-22 12:28:59 +04:00
Nicolas Maillat
caec5e87f5 Merge branch 'master' into PHRAS-2888_Remove_unused_strings 2020-04-21 22:51:22 +02:00
Nicolas Maillat
ed44497cbe Merge pull request #3447 from alchemy-fr/PHRAS-2991_Prod_Fix-twitter-Sharing
PHRAS-2991 #comment merge Prod - Sharing screen : Sharing to Twitter NOK
2020-04-21 22:46:23 +02:00