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,547 Commits 268 Branches 107 Tags
9f612abd2a1d0383c4f38fc412157c91d71e30b4
Commit Graph

14547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
nmaillat
f30291bab0 PHRAS-3112 add env for locale in worker and fpm container 2020-06-06 16:51:19 +02:00
Nicolas Maillat
d619ef9e0c Merge branch 'master' into PHRAS-3127-default-worker-process 2020-06-06 14:35:58 +02:00
Nicolas Maillat
c1d418cf05 Translated using Weblate (German) 
Currently translated at 99.8% (2565 of 2568 strings)
 2020-06-05 19:33:58 +00:00
Nicolas Maillat
ace8a2bcab Translated using Weblate (French) 
Currently translated at 99.9% (2566 of 2568 strings)
 2020-06-05 19:33:58 +00:00
Nicolas Maillat
59b594ff34 Translated using Weblate (English) 
Currently translated at 99.9% (2567 of 2568 strings)
 2020-06-05 19:33:58 +00:00
Nicolas Maillat
ee5351cbf1 Translated using Weblate (French) 
Currently translated at 99.7% (2561 of 2567 strings)
 2020-06-05 17:50:55 +00:00
Nicolas Maillat
318947024b Merge branch 'master' into PHRAS-3127-default-worker-process 2020-06-05 19:44:58 +02:00
Nicolas Maillat
38305a6682 Merge pull request #3528 from alchemy-fr/PHRAS-2773_Prod_add_notification_on_downloading_large_file 
PHRAS-2773 #comment merge Prod : Add a message when downloading a large amount of file
 2020-06-05 19:44:39 +02:00
aynsix
1a0670fa33 change default nbr process to 1, and remove unused code 2020-06-05 18:10:28 +03:00
Harrys Ravalomanana
bd75cf0d00 PHRAS-2773 add string translation 2020-06-05 18:12:41 +04:00
Nicolas Maillat
f2ea5a787a Merge pull request #3524 from alchemy-fr/PHRAS-2773_Prod_add_notification_on_downloading_large_file 
PHRAS-2773 #comment merge  Prod : Add a message when downloading a large amount of file
 2020-06-05 15:50:17 +02:00
Nicolas Maillat
cd5095e818 Merge branch 'master' into PHRAS-2773_Prod_add_notification_on_downloading_large_file 2020-06-05 15:26:59 +02:00
Nicolas Maillat
a7e06a964d Merge pull request #3526 from alchemy-fr/PHRAS-3092_api-setmetadats-v3_master 
PHRAS-3092 #comment merge api setmetadatas v3
 2020-06-05 15:13:32 +02:00
Harrys Ravalomanana
4d5a2775fb Merge branch 'PHRAS-2773_Prod_add_notification_on_downloading_large_file' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2773_Prod_add_notification_on_downloading_large_file 2020-06-05 16:28:53 +04:00
Harrys Ravalomanana
6cbcf8842d PHRAS-2773 Add notification on mail sending 2020-06-05 16:28:03 +04:00
Nicolas Maillat
bde15c74a6 Merge branch 'master' into PHRAS-3092_api-setmetadats-v3_master 2020-06-05 14:26:21 +02:00
Nicolas Maillat
af6273ac80 Merge pull request #3527 from alchemy-fr/PHRAS-3125_prod_basket_list_design 
PHRAS-3125 #comment merge Prod - basket list - basket detail design is Nok
 2020-06-05 14:26:04 +02:00
Harrys Ravalomanana
659cb69c70 PHRAS-3125 upgrade phraseanet-production-client 2020-06-05 15:19:01 +04:00
Harrys Ravalomanana
a6b4db98c5 Merge branch 'master' into PHRAS-3125_prod_basket_list_design 2020-06-05 15:02:10 +04:00
Nicolas Maillat
42fc633676 Merge pull request #3519 from alchemy-fr/PHRAS-3107-tools-rebuildsubdef-issue 
PHRAS-3107 #comment merge  Prod - Tools - rebuild subdef, fix issue when selection contents ZIP
 2020-06-05 12:55:28 +02:00
Nicolas Maillat
23a58748e2 Merge branch 'master' into PHRAS-3107-tools-rebuildsubdef-issue 2020-06-05 12:35:01 +02:00
Harrys Ravalomanana
e47312f02e PHRAS-3125 Fix on basket browser display 2020-06-05 13:32:53 +04:00
jygaulier
ce09e3226e Merge branch 'master' into PHRAS-3092_api-setmetadats-v3_master 2020-06-04 21:54:12 +02:00