hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,620 Commits 268 Branches 107 Tags
ed037b4874cbc50cabeac6d16fd489ac03eb9c51
Commit Graph

14620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harrys Ravalomanana
4bb1caab5d Merge branch 'master' into PHRAS-3116_prod_video-tools-add_subtitle_generation 2020-06-19 15:09:29 +04:00
Nicolas Maillat
9a3896eb80 Merge pull request #3538 from alchemy-fr/PHRAS-3138_fix_on_lightbox 
PHRAS-3138 Merge Lightbox - Lightbox detail - caption is not present and design improvement
 2020-06-19 12:48:29 +02:00
Harrys Ravalomanana
bc1ee17272 PHRAS-3138 2020-06-19 13:19:17 +04:00
Harrys Ravalomanana
34b4f26318 PHRAS-3138 Fix on lightbox 2020-06-18 22:56:23 +04:00
Harrys Ravalomanana
130912f6f9 PHRAS-3116 Fix on duration display 2020-06-18 19:27:38 +04:00
Harrys Ravalomanana
0726e57187 PHRAS-3116 2020-06-18 16:55:18 +04:00
Harrys Ravalomanana
b7799e2c82 PHRAS-3116 : Add some fix on video display 2020-06-18 16:45:04 +04:00
Harrys Ravalomanana
d7f38accbc PHRAS-3116 add translation 2020-06-17 21:35:44 +04:00
Harrys Ravalomanana
add763c244 PHRAS-3116 2020-06-17 21:30:54 +04:00
Harrys Ravalomanana
1f6166dfab PHRAS-3116 2020-06-16 18:34:50 +04:00
Harrys Ravalomanana
5c5078c36f PHRAs-3116 : save video caption field 2020-06-16 12:09:38 +04:00
aynsix
f84b5a2c4e fix drop down langage 2020-06-16 10:32:12 +03:00
Harrys Ravalomanana
18ba8b746d PHRAS-3116 Add language list 2020-06-15 22:19:43 +04:00
aynsix
6a626886e0 get videotexttrack field 2020-06-15 19:00:16 +03:00
Harrys Ravalomanana
4c19ee4e8f PHRAS-3116 2020-06-15 15:52:57 +04:00
Harrys Ravalomanana
5ad9a1a183 PHRAS-3116 2020-06-11 19:32:43 +04:00
Harrys Ravalomanana
a5f1ba0851 Merge branch 'master' into PHRAS-3116_prod_video-tools-add_subtitle_generation 2020-06-11 19:27:56 +04:00
Nicolas Maillat
d3619c8780 Merge pull request #3537 from alchemy-fr/PHRAS-3137-help-menu-4-1 
PHRAS-3137 merge help menu to doc 4.1
 2020-06-11 15:21:31 +02:00
Nicolas Maillat
4edd40f91d Merge branch 'master' into PHRAS-3137-help-menu-4-1 2020-06-11 14:53:54 +02:00
Nicolas Maillat
420932b400 Translated using Weblate (French) 
Currently translated at 99.6% (2564 of 2573 strings)
 2020-06-11 12:53:12 +00:00
Jennifer
9f612abd2a Translated using Weblate (English) 
Currently translated at 99.7% (2566 of 2573 strings)
 2020-06-11 12:53:11 +00:00
Jennifer
e88dc84fbb Translated using Weblate (German) 
Currently translated at 99.6% (2563 of 2573 strings)
 2020-06-11 12:51:30 +00:00
Nicolas Maillat
1264e09384 Translated using Weblate (English) 
Currently translated at 99.7% (2566 of 2573 strings)
 2020-06-11 12:43:13 +00:00
aynsix
0f9a37f44c help menu to doc 4.1 2020-06-11 15:28:49 +03:00
Nicolas Maillat
f01270a5a3 Merge pull request #3535 from alchemy-fr/PHRAS-3128-queue-monitor 
PHRAS-3128 #comment worker check queue monitor for display in admin worker section
 2020-06-11 12:58:41 +02:00
aynsix
6c182cccc1 Merge branch 'PHRAS-3128-queue-monitor' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3128-queue-monitor 2020-06-11 10:04:19 +03:00
aynsix
967a8f5355 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3128-queue-monitor 2020-06-11 10:03:55 +03:00
aynsix
89c92fc91c change databox name on the first column 2020-06-11 10:03:05 +03:00
Nicolas Maillat
495b1e976a Merge branch 'master' into PHRAS-3128-queue-monitor 2020-06-10 19:24:17 +02:00
Nicolas Maillat
d2440e0034 Merge pull request #3536 from alchemy-fr/PHRAS-3135_check_undefine_env 
PHRAS-3135 merge check undefined env
 2020-06-10 19:24:01 +02:00
nmaillat
4d5247aa70 test if other env is set 2020-06-10 18:53:12 +02:00
nmaillat
bbde0c4cce test if PHRASEANET_SMTP_ENABLED var is set 2020-06-10 18:53:12 +02:00
aynsix
6d31f93774 add tab queue monitor, limit job list to 500 2020-06-10 19:25:16 +03:00
Nicolas Maillat
b8487cd141 Merge pull request #3534 from alchemy-fr/PHRAS-2969_4.1.1_release 
PHRAS-2969 #comment 4.1.1 release
4.1.1 		2020-06-09 22:50:31 +02:00
nmaillat
345f560af5 Update changelog 2020-06-09 22:20:58 +02:00
nmaillat
588bd73116 Update readme 2020-06-09 21:51:01 +02:00
nmaillat
3ad635fcf3 Release version 4.1.1 2020-06-09 17:22:37 +02:00
nmaillat
5bb08e55ac 4.1.0 release 2020-06-09 17:22:37 +02:00
Nicolas Maillat
847d94e518 Merge pull request #3529 from alchemy-fr/PHRAS-3127-default-worker-process 
PHRAS-3127 #comment merge Worker - set default nbr of worker to 1
 2020-06-09 17:10:01 +02:00
Nicolas Maillat
694cb2a498 Merge branch 'master' into PHRAS-3127-default-worker-process 2020-06-09 16:42:31 +02:00
Harrys Ravalomanana
a758b1efe6 PHRAS-3116 add production-client 2020-06-09 11:11:30 +04:00
Nicolas Maillat
73eb66101f Merge pull request #3532 from alchemy-fr/PHRAS-3134_nano_into_fpm_worker_container 
PHRAS-3134 #comment merge Add nano into fpm and worker container
 2020-06-08 19:02:12 +02:00
Harrys Ravalomanana
e3c1e875fb PHRAS-3116 : video tools : add tab video subtitle 2020-06-08 19:55:55 +04:00
Nicolas Maillat
6bd7a5ad6c PHRAS-3134 Add nano into fpm and worker container 2020-06-08 17:53:45 +02:00
Nicolas Maillat
96c53b8eb8 Merge branch 'master' into PHRAS-3127-default-worker-process 2020-06-08 15:25:16 +02:00
Nicolas Maillat
e709896e58 PHRAS-1890 change audio codec for videopreview 2020-06-07 21:05:25 +02:00
Nicolas Maillat
96c12cc992 Translated using Weblate (German) 
Currently translated at 99.8% (2564 of 2568 strings)
 2020-06-06 16:04:37 +00:00
Nicolas Maillat
0aef39a083 Translated using Weblate (English) 
Currently translated at 99.9% (2566 of 2568 strings)
 2020-06-06 16:04:37 +00:00
Nicolas Maillat
642ac2a5f4 Translated using Weblate (French) 
Currently translated at 99.8% (2565 of 2568 strings)
 2020-06-06 16:04:37 +00:00
Nicolas Maillat
b950686496 Merge pull request #3530 from alchemy-fr/PHRAS-3112_env_for_locale 
PHRAS-3112 #comment merge add env for locale in worker and fpm container
 2020-06-06 17:19:37 +02:00