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 |
|
jygaulier
|
0b099878f5
|
OK to test
|
2020-06-04 20:54:21 +02:00 |
|
Nicolas Maillat
|
09d0a66a57
|
Merge pull request #3522 from alchemy-fr/PHRAS-2797-unused-webhook-subdefcount
PHRAS-2797 #comment merge remove unused webhook subdef_count
|
2020-06-04 20:33:14 +02:00 |
|
Nicolas Maillat
|
65c4c4870f
|
Merge branch 'master' into PHRAS-2797-unused-webhook-subdefcount
|
2020-06-04 17:15:46 +02:00 |
|
jygaulier
|
cdadb3acc4
|
WIP
refacto common code
|
2020-06-04 14:08:08 +02:00 |
|
Nicolas Maillat
|
19bd6cf4b0
|
Merge branch 'master' into PHRAS-2773_Prod_add_notification_on_downloading_large_file
|
2020-06-04 13:31:44 +02:00 |
|
Nicolas Maillat
|
ac05b02bbc
|
Merge pull request #3523 from alchemy-fr/PHRAS-3110_app_right_cache
PHRAS-3110 #comment merge phraseanet entrypoint move chown
|
2020-06-04 13:29:09 +02:00 |
|
aynsix
|
733d97b5d5
|
fix test
|
2020-06-04 14:13:11 +03:00 |
|
Harrys Ravalomanana
|
68085f1511
|
PHRAS-2773 Prod add notification on downloading large files
|
2020-06-04 14:52:46 +04:00 |
|
nmaillat
|
944f78fbf6
|
phraseanet entrypoint move chown
|
2020-06-04 12:39:19 +02:00 |
|
aynsix
|
7ea8e95549
|
remove unused webhook subdef_count
|
2020-06-04 12:02:52 +03:00 |
|
Nicolas Maillat
|
d43ab78dfc
|
Merge branch 'master' into PHRAS-3107-tools-rebuildsubdef-issue
|
2020-06-04 10:40:31 +02:00 |
|
Nicolas Maillat
|
d1e9a5992a
|
Merge pull request #3521 from alchemy-fr/PHRAS-2680-webhook-privacy-security
PHRAS-2680 #comment merge Webhook Privacy and Security
|
2020-06-04 10:39:32 +02:00 |
|
aynsix
|
da2ce2471a
|
webhook privacy
|
2020-06-04 10:50:26 +03:00 |
|
jygaulier
|
9272f3642f
|
WIP
refacto : explode v3 controller, fix warnings
|
2020-06-03 20:32:10 +02:00 |
|
aynsix
|
952388aba1
|
add espace
|
2020-06-03 17:55:39 +03:00 |
|
aynsix
|
1057cb0493
|
fix issuee whe trying to rebuild subdef from tool
|
2020-06-03 17:52:21 +03:00 |
|
Nicolas Maillat
|
fe0d9178e1
|
Merge pull request #3518 from alchemy-fr/PHRAS-3119_same_volumes_for_dev_and_deployment
PHRAS-3119 #comment merge change volumes path in docker-compose and in override
|
2020-06-03 16:25:10 +02:00 |
|
nmaillat
|
c1448f7bb2
|
fix email setting in conf,remove tmp volume form gateway
|
2020-06-03 13:56:10 +02:00 |
|
nmaillat
|
627bf104a9
|
change volumes path in docker-compose and in override
|
2020-06-03 13:21:12 +02:00 |
|
jygaulier
|
aeb7b4e60b
|
WIP
fix ; add errors catch
todo :
- status-bits
- apply changes to record
- json output
|
2020-06-03 12:48:13 +02:00 |
|
Nicolas Maillat
|
991d1681fe
|
Merge pull request #3486 from alchemy-fr/PHRAS-1890_Add-GS1-databases-model-to-Phraseanet
PHRAS-1890 #comment merge add GS1 database model
|
2020-06-03 10:41:30 +02:00 |
|
aynsix
|
a007b8dbb3
|
fix xml content
|
2020-06-03 10:33:22 +03:00 |
|
aynsix
|
3a8b99bf67
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet
|
2020-06-03 10:31:26 +03:00 |
|
Nicolas Maillat
|
93394ae927
|
Merge pull request #3517 from alchemy-fr/PHRAS-3120_fix_file_path_audio_subview
PHRAS-3120 #comment merge fix storage file path for subview
|
2020-06-03 02:24:14 +02:00 |
|
Nicolas Maillat
|
19d0d1901b
|
PHRAS-3120 fix storage file path for subview
fix for audiovideowav and audiovideomp3
|
2020-06-03 01:49:46 +02:00 |
|
jygaulier
|
b67c37c340
|
WIP
|
2020-06-02 20:26:30 +02:00 |
|
Nicolas Maillat
|
083c2cde3a
|
Merge pull request #3515 from alchemy-fr/upgrade_phraseanet-production-client-dependencies__
PHRAS-2515 #comment merge Bump axios, lodash, lodash.merge and node-sass to recents versions
|
2020-06-02 09:58:10 +02:00 |
|
Nicolas Maillat
|
006b0cf234
|
Merge branch 'master' into upgrade_phraseanet-production-client-dependencies__
|
2020-06-01 21:02:47 +02:00 |
|