hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,528 Commits 268 Branches 107 Tags
a41a87d7d0c25d1397232cba44251c88c26635fd
Commit Graph

13528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
a41a87d7d0 Merge branch 'master' into PHRAS-2603-migration-patch-configuration-yml 2020-01-20 16:31:16 +01: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
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
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
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
jygaulier
998c751843 Port PHRAS-2877 
Port of PHRAS-2877 User manipulator did not allow to set a null email
Temporary Null email is used by saml plugin while creating a user.
 2020-01-13 14:48:53 +01:00
Nicolas Maillat
a9e8d9aae1 Merge pull request #3287 from jygaulier/PHRAS-2757_print-feedback_4.1 
PHRAS-2757 # comment add print model  named feedback in 4.1
 2020-01-10 10:34:13 +01:00
jygaulier
b6fa28276d Merge branch 'master' into PHRAS-2757_print-feedback_4.1 2020-01-09 20:33:11 +01:00
Jean-Yves Gaulier
32fbf049cf PHRAS-2757_print-feedback_4.1 
Add a print format when printing a feedback basket
Only the creator of the feedback can print it.
 2020-01-09 20:31:09 +01:00
Nicolas Maillat
a445e44d47 Merge pull request #3283 from alchemy-fr/PHRAS-2868_PRod-video_tools_define_thumbnails_video 
PHRAS-2868 #comment merge PROD Video tools Fix canvas  for vertical video
 2020-01-09 17:08:11 +01:00
Nicolas Maillat
4dcd663425 Merge branch 'master' into PHRAS-2868_PRod-video_tools_define_thumbnails_video 2020-01-09 16:54:19 +01:00
Jennifer
4f0669e65f Translated using Weblate (English) 
Currently translated at 98.1% (2363 of 2408 strings)
 2020-01-09 15:47:22 +00:00
Harrys Ravalomanana
1dd0be65d4 PHRAS-2868 #comment update phraseanet-production-client version 2020-01-09 19:05:31 +04:00
Nicolas Maillat
fe358834ff Translated using Weblate (French) 
Currently translated at 99.0% (2384 of 2408 strings)
 2020-01-08 19:18:17 +00:00
Nicolas Maillat
a60487bd0c Translated using Weblate (English) 
Currently translated at 97.9% (2359 of 2408 strings)
 2020-01-08 19:18:17 +00:00
Nicolas Maillat
8d0165d14f Translated using Weblate (English) 
Currently translated at 98.0% (2360 of 2408 strings)
 2020-01-08 19:18:17 +00:00
Nicolas Maillat
3aeb627d43 Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference 2020-01-08 14:03:13 +01:00
Nicolas Maillat
b23ad7456b Merge branch 'master' into PHRAS-2868_PRod-video_tools_define_thumbnails_video 2020-01-08 14:02:44 +01:00
Nicolas Maillat
068c8422df Merge pull request #3285 from alchemy-fr/PHRAS-2863-lightbox-mobile-PDF-Reading 
PHRAS-2863 #comment merge Lightbox mobile: Load PDF reader (videojs)
 2020-01-08 14:01:46 +01:00
Nicolas Maillat
5951568da6 Merge branch 'master' into PHRAS-2868_PRod-video_tools_define_thumbnails_video 2020-01-08 13:38:01 +01:00
Harrys Ravalomanana
c62b43f4a5 Merge branch 'master' into PHRAS-2863-lightbox-mobile-PDF-Reading 2020-01-08 16:29:47 +04:00
Harrys Ravalomanana
d57901e0b0 PHRAS-2868 2020-01-07 19:02:33 +04:00
Nicolas Maillat
e98017d9fd Translated using Weblate (French) 
Currently translated at 99.0% (2384 of 2408 strings)
 2020-01-07 13:13:22 +00:00
Harrys Ravalomanana
c7acefdb6e Merge branch 'master' into PHRAS-2868_PRod-video_tools_define_thumbnails_video 2020-01-07 16:56:36 +04:00
Nicolas Maillat
b61f55e976 Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference 2020-01-07 12:16:55 +01:00
Nicolas Maillat
992a2bc3ad Merge branch 'master' into PHRAS-2863-lightbox-mobile-PDF-Reading 2020-01-07 12:15:44 +01:00
Nicolas Maillat
eea77e3274 Translated using Weblate (French) 
Currently translated at 95.5% (2300 of 2408 strings)
 2020-01-07 11:13:53 +00:00
Harrys Ravalomanana
9089993d6a Merge branch 'PHRAS-2863-lightbox-mobile-PDF-Reading' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2863-lightbox-mobile-PDF-Reading 2020-01-07 11:06:52 +04:00
Harrys Ravalomanana
93a9bb83e0 PHRAS-2863 2020-01-07 11:04:24 +04:00
Harrys Ravalomanana
2fd36d0e6a Merge branch 'master' into PHRAS-2863-lightbox-mobile-PDF-Reading 2020-01-07 11:02:52 +04:00
Harrys Ravalomanana
4d768889f2 PHRAS-2863 #comment Lightbox mobile: resize pdf iframe #time 3h 2020-01-07 10:55:11 +04:00
Jennifer
5f3d8d8038 Translated using Weblate (French) 
Currently translated at 95.5% (2300 of 2408 strings)
 2020-01-06 20:05:19 +00:00