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

15801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
f4aea89fd7 Merge pull request #3692 from alchemy-fr/PHRAS-3257-fix-detail-view-clic 
PHRAS-3257 merge Prod - detailled view - Unproper content display when clic on "also in basket/feedback"
 2021-01-14 18:06:12 +01:00
Moctar
94f6a70774 PHRAS-3336 reorder .env 2021-01-14 17:56:11 +01:00
Moctar
4f4f43e674 PHRAS-3330 - add datetime to nb_process output 2021-01-14 17:29:44 +01:00
Moctar
9b9b651b4a PHRAS-3336 - add cache clearing and chmod configuration.yml file 2021-01-14 16:42:16 +01:00
Nicolas Maillat
f3bf9725a8 Merge branch 'master' into PHRAS-3276-invert-push-and-validation-string 2021-01-14 15:17:04 +01:00
Nicolas Maillat
4e02013c91 Merge branch 'master' into PHRAS-3257-fix-detail-view-clic 2021-01-14 15:10:27 +01:00
Nicolas Maillat
3f123e57e5 Merge pull request #3691 from alchemy-fr/PHRAS-3331-story-ordering 
PHRAS-3331 merge Prod - Story - Ordering elements of a story is not working on a Docker environment
 2021-01-14 15:09:53 +01:00
aina esokia
2cd30af386 PHRAS-3257 fix detail view clic on link 2021-01-14 17:00:33 +03:00
aina esokia
358d645508 fix delete icon 2021-01-14 16:57:10 +03:00
aina esokia
ee104bf032 PHRAS-3331 fix story ordering 2021-01-14 14:03:12 +03:00
Moctar
78bf18f912 Merge branch 'master' of github.com:alchemy-fr/Phraseanet into PHRAS-3330-docker-worker-explode-queus 2021-01-14 10:38:01 +01:00
Moctar
7d268adab1 start worker after phraseanet starts 2021-01-14 10:36:28 +01:00
Moctar
d564b17dd5 PHRAS-3336 fix bad smtp secure-mode variable 2021-01-14 10:31:23 +01:00
Jennifer
f033e04344 Translated using Weblate (German) 
Currently translated at 99.7% (2689 of 2696 strings)
 2021-01-14 09:04:25 +00:00
Jennifer
5dddc1a942 Translated using Weblate (French) 
Currently translated at 99.7% (2689 of 2696 strings)
 2021-01-14 09:04:25 +00:00
Jennifer
35c9a6d6a4 Translated using Weblate (English) 
Currently translated at 99.7% (2689 of 2696 strings)

PHRAS-3309 : translation for this issue
 2021-01-14 09:04:25 +00:00
Nicolas Maillat
2db2fcd40a Translated using Weblate (French) 
Currently translated at 99.7% (2689 of 2696 strings)
 2021-01-14 08:42:17 +00:00
Nicolas Maillat
ab9d374ffa Translated using Weblate (English) 
Currently translated at 99.7% (2689 of 2696 strings)
 2021-01-14 08:30:41 +00:00
Jennifer
810cb56e2a Translated using Weblate (German) 
Currently translated at 99.7% (2690 of 2696 strings)
 2021-01-13 19:15:01 +00:00
Jennifer
f622232976 Translated using Weblate (French) 
Currently translated at 99.7% (2690 of 2696 strings)
 2021-01-13 19:15:01 +00:00
Jennifer
c7e380c64b Translated using Weblate (English) 
Currently translated at 99.7% (2690 of 2696 strings)
 2021-01-13 19:15:00 +00:00
Nicolas Maillat
8174370034 Translated using Weblate (English) 
Currently translated at 99.7% (2690 of 2696 strings)
 2021-01-13 19:13:02 +00:00
Moctar
64fe78f804 PHRAS-3336 set defaut env vars for mailhog 2021-01-13 20:10:04 +01:00
Nicolas Maillat
000a21dff6 Translated using Weblate (French) 
Currently translated at 99.7% (2690 of 2696 strings)
 2021-01-13 19:08:31 +00:00
Moctar
6aef918752 PHRAS-3330 fix number of queue env value 2021-01-13 19:44:41 +01:00
Jennifer
b9d2c7f830 Translated using Weblate (French) 
Currently translated at 99.8% (2691 of 2696 strings)
 2021-01-13 18:32:59 +00:00
Jennifer
b559e43ac3 Translated using Weblate (English) 
Currently translated at 99.8% (2691 of 2696 strings)
 2021-01-13 18:23:16 +00:00
Moctar
ddeac86480 PHRAS-3330 manage multiple processes and exit code and wait 2021-01-13 16:45:27 +01:00
Nicolas Maillat
0c0d2793f3 Merge pull request #3690 from alchemy-fr/PHRAS-3309-validation-basket-warn-user-on-delete 
PHRAS-3309 Merge Prod - Baskets - Validation Basket - Warn user when i try to delete item in a "feedback" basket and update some string
 2021-01-13 16:37:27 +01:00
aina esokia
41a4aff7b6 Merge branch 'PHRAS-3309-validation-basket-warn-user-on-delete' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3309-validation-basket-warn-user-on-delete 2021-01-13 17:32:41 +03:00
aina esokia
b094685f19 generate translation 2021-01-13 17:32:05 +03:00
aina esokia
ce224d3a98 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3309-validation-basket-warn-user-on-delete 2021-01-13 17:05:14 +03:00
Moctar
8448e78d6e Merge branch 'master' of github.com:alchemy-fr/Phraseanet into PHRAS-3330-docker-worker-explode-queus 2021-01-13 13:37:08 +01:00
Nicolas Maillat
6b6cc75df3 Merge branch 'master' into PHRAS-3309-validation-basket-warn-user-on-delete 2021-01-13 13:09:43 +01:00
Nicolas Maillat
e35846891f Merge pull request #3680 from alchemy-fr/PHRAS-3282_refacto-some-code-on-workers_bis_MASTER 
PHRAS-3282
Merged 

this config block is not used anymore 
`    retry_queue:
        assetsIngest: '30000'
        createRecord: '30000'
        subdefCreation: '30000'
        writeMetadatas: '30000'
        webhook: '30000'
        exportMail: '30000'
        populateIndex: '90000'
        delayedSubdef: '20000'
        delayedWriteMeta: '20000'`

workers use this one 

`    queues:
        validationReminder:
            ttl_retry: 120000
        writeMetadatas:
            max_retry: 3
            ttl_retry: 30000
            ttl_delayed: 30000
        subdefCreation:
            max_retry: 3
            ttl_retry: 30000
            ttl_delayed: 30000
        exportMail:
            max_retry: 3
            ttl_retry: 30000
        webhook:
            max_retry: 3
            ttl_retry: 120000
        assetsIngest:
            max_retry: 3
            ttl_retry: 30000
        createRecord:
            max_retry: 3
            ttl_retry: 30000
        populateIndex:
            max_retry: 1
            ttl_retry: 30000
        ftp:
            max_retry: 3
            ttl_retry: 600000
        exposeUpload:
            max_retry: 3
            ttl_retry: 600000
        pullAssets:
            ttl_retry: 60000
`


if change is made on queue TTL , you need to delete this queue. 
Delete queue is now available in admin GUI - worker-manager - queues tab
 2021-01-13 13:09:05 +01:00
Nicolas Maillat
984de5acd8 Merge branch 'master' into PHRAS-3282_refacto-some-code-on-workers_bis_MASTER 2021-01-13 12:39:06 +01:00
aina esokia
5b150e0c88 PHRAS-3309 warn user 2021-01-13 14:10:01 +03:00
Moctar
922884452b PHRAS-3330 add worker queue name env and allow worker run exploded 2021-01-13 10:55:42 +01:00
Nicolas Maillat
f2036a786f Merge pull request #3687 from alchemy-fr/PHRAS-3326-basket-item-copie 
PHRAS-3326 merge Prod - Workzone - basket item copy between basket - change behavior
 2021-01-12 14:25:47 +01:00
aina esokia
3e1c8caf40 PHRAS-3326 fix drag element 2021-01-12 11:36:29 +03:00
Nicolas Maillat
d630f13144 Merge branch 'master' into PHRAS-3282_refacto-some-code-on-workers_bis_MASTER 2021-01-11 23:08:38 +01:00
Nicolas Maillat
88915cf84a Merge branch 'master' into PHRAS-3326-basket-item-copie 2021-01-11 22:52:30 +01:00
Nicolas Maillat
e2af71b2a0 Merge pull request #3685 from alchemy-fr/PHRAS-3325-worker-exit-when-db-down 
PHRAS-3325 merge Docker - Worker - if DB is not up, worker need to exit with code 1
 2021-01-11 22:52:08 +01:00
Nicolas Maillat
ec57ccaf06 Merge branch 'master' into PHRAS-3325-worker-exit-when-db-down 2021-01-11 22:18:07 +01:00
Nicolas Maillat
3038d3d7e6 Merge pull request #3686 from alchemy-fr/PHRAS-3321-manage-ImageMagick-policies 
PHRAS-3321 Merge Manage ImageMagick policies on docker context
 2021-01-11 22:17:38 +01:00
aina esokia
3ebe4ceb10 PHRAS-3326 2021-01-11 14:40:50 +03:00
aina esokia
7a2837aea5 PHRAS-3326 move element between basket 2021-01-11 12:09:31 +03:00
Moctar
0630cfa6e2 add uncomment imagemagick temporay path config 2021-01-08 16:45:20 +01:00
Moctar
7cb895f54b update env vars order 2021-01-08 16:44:40 +01:00
aina esokia
f117f0866c basket item copy by default 2021-01-08 14:49:00 +03:00