Commit Graph

13805 Commits

Author SHA1 Message Date
Nicolas Maillat
d630f80844 Merge branch 'master' into PHRAS-2761-audio-file-preview-case 2020-01-23 10:37:43 +01:00
Nicolas Maillat
785bc7fddd Merge pull request #3303 from alchemy-fr/PHRAS-2757-fix-feedback-result
PHRAS-2757 : #comment merge last fix 4.,1 add localisation for date format, add informations on records , add information about feedback participants.
2020-01-23 10:34:50 +01:00
Nicolas Maillat
9d51e8428c Merge branch 'master' into PHRAS-2603-migration-patch-configuration-yml 2020-01-23 10:29:10 +01:00
aynsix
e3f596963a add base name in pdf feedback 2020-01-23 12:12:59 +03:00
aynsix
5b38565e1a add format deedback only and fix pdf text 2020-01-23 11:38:17 +03:00
Nicolas Maillat
7c98f50bf0 Merge pull request #3294 from alchemy-fr/PHRAS-2875_Prod_workzone_and_basket_zone_Refacto
PHRAS-2875 #comment merge  Prod -Workzone & basket Refacto
2020-01-22 15:55:52 +01:00
Harrys Ravalomanana
7b9cf8e72d PHRAS-2875 remove sort on twig 2020-01-22 18:28:44 +04:00
Harrys Ravalomanana
e06c4d8eca PHRAS-2875 add Collection on caption tooltip 2020-01-22 16:04:36 +04:00
Harrys Ravalomanana
482583f891 PHRAS-2875 2020-01-21 18:30:08 +04:00
aynsix
12ff461e48 fix preview audio file case 2020-01-21 17:20:12 +03:00
Harrys Ravalomanana
3306e69a8e Merge branch Master 2020-01-21 18:15:52 +04:00
Harrys Ravalomanana
bcc05fc543 PHRAS-2875 Port of PHRAS-2864 2020-01-21 18:10:28 +04:00
Nicolas Maillat
423ebfed4c Merge branch 'master' into PHRAS-2875_Prod_workzone_and_basket_zone_Refacto 2020-01-21 14:53:50 +01:00
Jennifer
9dddb20119 Translated using Weblate (German)
Currently translated at 92.1% (2227 of 2418 strings)
2020-01-21 13:36:25 +00:00
Jennifer
5941a7ebca Translated using Weblate (French)
Currently translated at 99.1% (2397 of 2418 strings)
2020-01-21 13:36:25 +00:00
Nicolas Maillat
ab2d954eb7 Translated using Weblate (French)
Currently translated at 99.1% (2397 of 2418 strings)
2020-01-21 13:36:25 +00:00
Nicolas Maillat
4a04c246bc Merge pull request #3299 from alchemy-fr/PHRAS-2866_Form_create_user_from_push_or_feedback
PHRAS-2866 #comment merge Create User from push or feedback GUI, field label is missing, removing this fields.
2020-01-21 14:16:12 +01:00
Nicolas Maillat
0152e8d95f Merge branch 'master' into PHRAS-2875_Prod_workzone_and_basket_zone_Refacto 2020-01-21 11:43:12 +01:00
Harrys Ravalomanana
5af41e67a5 PHRAS-2866 #comment Remove both fields geoname #time 1h 2020-01-21 14:39:00 +04:00
Nicolas Maillat
8d58095a1c Translated using Weblate (French)
Currently translated at 99.0% (2396 of 2418 strings)
2020-01-21 10:01:17 +00:00
Nicolas Maillat
3e2478e2db Translated using Weblate (English)
Currently translated at 98.8% (2389 of 2418 strings)
2020-01-21 10:01:17 +00:00
Harrys Ravalomanana
f0063ff257 PHRAS-2875 2020-01-21 12:39:25 +04:00
Nicolas Maillat
a41a87d7d0 Merge branch 'master' into PHRAS-2603-migration-patch-configuration-yml 2020-01-20 16:31:16 +01:00
Harrys Ravalomanana
04c3830c2a PHRAS-2875 Workzone refacto #time 8h 2020-01-20 18:56:42 +04:00
Harrys Ravalomanana
491d832bfd Merge branch 'master' into PHRAS-2875_Prod_workzone_and_basket_zone_Refacto 2020-01-20 18:53:40 +04:00
Nicolas Maillat
8db785d5db Merge pull request #3298 from alchemy-fr/PHRAS-2750-update-phpexiftool-and-exiftool
PHRAS-2750 : #comment merge for 4.1 update phpexiftool to 0.7.3 in 4.1
2020-01-20 15:22:46 +01:00
aynsix
572e8b0def update phpexiftool to 0.7.3 in 4.1 2020-01-20 12:13:13 +03:00
Harrys Ravalomanana
eff9b3e7b9 Merge branch 'master' into PHRAS-2875_Prod_workzone_and_basket_zone_Refacto 2020-01-20 11:08:20 +04:00
Nicolas Maillat
85b4cba0d1 Merge pull request #3291 from alchemy-fr/PHRAS-2862_Fix_lightbox_mobile_video-resize
PHRAS-2862 #comment Fix lightbox mobile : video resize
2020-01-17 15:18:42 +01:00
Harrys Ravalomanana
af0fa3eb37 Merge branch 'master' into PHRAS-2862_Fix_lightbox_mobile_video-resize 2020-01-17 17:05:59 +04:00
Harrys Ravalomanana
bd297b486f PHRAS-2862 Lightbox mobile :video resize #time 4h 2020-01-17 16:56:30 +04:00
Nicolas Maillat
8e37d36add Merge branch 'master' into PHRAS-2875_Prod_workzone_and_basket_zone_Refacto 2020-01-16 17:18:01 +01:00
Nicolas Maillat
d9ee90377d Merge pull request #3295 from alchemy-fr/composer-install
PHRAS-2867 #comment merge Change the composer installation procedure
2020-01-16 17:10:43 +01:00
Alexandre BRACH
0acd6b7fa0 #comment Change the composer installation procedure 2020-01-16 16:26:15 +01:00
Harrys Ravalomanana
0ea9508ce0 PHRAS-2875 upgrade of Phraseanet-production-client 2020-01-16 18:51:25 +04:00
Nicolas Maillat
ee8b0aef0a Merge branch 'master' into PHRAS-2862_Fix_lightbox_mobile_video-resize 2020-01-16 15:06:05 +01:00
Nicolas Maillat
0474aeca4d Merge pull request #3284 from alchemy-fr/PHRAS-2861_Prod_Basket_menu_preference
PHRAS-2861  #comment merge Prod Basket : add show caption button  and tooltip
2020-01-16 00:35:22 +01:00
Nicolas Maillat
778cf368bd Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference 2020-01-15 23:09:35 +01:00
Nicolas Maillat
c5d2b7bcbe Merge branch 'master' into PHRAS-2862_Fix_lightbox_mobile_video-resize 2020-01-15 23:09:15 +01:00
Nicolas Maillat
19d473bef6 Merge pull request #3293 from alchemy-fr/PHRAS-2757-print-feedback-result-add-translation-41
PHRAS-2757 #comment  add translation to print basket feedback
2020-01-15 23:08:57 +01:00
Harrys Ravalomanana
195b3dcaaa PHRAS-2861 update yarn.lock 2020-01-15 17:28:48 +04:00
Harrys Ravalomanana
8773f4a057 Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference 2020-01-15 15:29:06 +04:00
Harrys Ravalomanana
c43e48a8a6 PHRAS-2861 #comment fix Basket preference #time 3h 2020-01-15 15:24:16 +04:00
aynsix
41bf49fc83 add translation to print basket feedback 2020-01-15 11:47:34 +03:00
Nicolas Maillat
4ad622fccd Merge branch 'master' into PHRAS-2862_Fix_lightbox_mobile_video-resize 2020-01-14 14:11:55 +01:00
Nicolas Maillat
e6bc446e04 Merge pull request #3289 from alchemy-fr/PHRAS-2870_Fix-prod_workzone_detail-view_video_width
PHRAS-2870 #comment merge of Prod - Workzone - Detail view - Vertical video
2020-01-14 14:11:40 +01:00
Harrys Ravalomanana
937b9b4c59 PHRAS-2862 #comment Fix lightbox mobile : video resize #time 3h 2020-01-14 16:56:40 +04:00
Harrys Ravalomanana
7319b345db PHRAS-2870 #comment update phraseanet-production-client 2020-01-14 12:19:03 +04:00
Harrys Ravalomanana
b9dc72fe3a Merge branch master 2020-01-13 18:27:15 +04:00
Harrys Ravalomanana
9082c85b84 PHRAS-2870 #comment fix resize video on preview #time 8h 2020-01-13 18:22:11 +04:00