Nicolas Maillat
|
5435028605
|
Merge branch 'master' into PHRAS-3566-fix-status-right-on-upload
|
2021-10-22 19:30:20 +02:00 |
|
Nicolas Maillat
|
619fd4cd3c
|
Merge pull request #3887 from alchemy-fr/PHRAS-3565-fix-geoname-confirm-modal
PHRAS-3565 merge fix geoname confirm modal on edit
|
2021-10-22 19:30:07 +02:00 |
|
Nicolas Maillat
|
d51270de79
|
Merge branch 'master' into PHRAS-3565-fix-geoname-confirm-modal
|
2021-10-22 19:06:03 +02:00 |
|
Nicolas Maillat
|
43d5819fe1
|
Merge pull request #3889 from alchemy-fr/PHRAS-3551_dc_containers_by_workers
PHRAS-3551 merge Docker-compose file refacto, add profiles on services
|
2021-10-22 19:05:41 +02:00 |
|
nmaillat
|
53055952e8
|
Merge branch 'PHRAS-3551_dc_containers_by_workers' of github.com:alchemy-fr/Phraseanet into PHRAS-3551_dc_containers_by_workers
|
2021-10-22 18:46:44 +02:00 |
|
nmaillat
|
c8aeb244ae
|
fix typo in overirde [CI SKIP]
|
2021-10-22 18:44:48 +02:00 |
|
nmaillat
|
d83518e3b1
|
fix version in docker-compose.tools https://docs.docker.com/compose/profiles/
|
2021-10-22 18:44:48 +02:00 |
|
nmaillat
|
58177a2ddc
|
renaming service all in one worker from workers to worker
|
2021-10-22 18:44:48 +02:00 |
|
nmaillat
|
eac3eee74f
|
Fix readme [CI SKIP]
|
2021-10-22 18:44:48 +02:00 |
|
nmaillat
|
f37b817ed1
|
typo fix [CI SKIP]
|
2021-10-22 18:44:48 +02:00 |
|
nmaillat
|
98e90c3008
|
PHRAS-3551 Docker-compose file refacto, add profiles on services
|
2021-10-22 18:44:48 +02:00 |
|
Nicolas Maillat
|
d9f17caebd
|
Merge pull request #3888 from alchemy-fr/PHRAS-3567-worker-log-message
PHRAS-3567 merge Worker recordDeletion , clean log message , the deletion message is missing
|
2021-10-22 18:43:42 +02:00 |
|
nmaillat
|
83983477e2
|
fix typo in overirde [CI SKIP]
|
2021-10-22 16:20:04 +02:00 |
|
nmaillat
|
ad559497ca
|
fix version in docker-compose.tools https://docs.docker.com/compose/profiles/
|
2021-10-22 16:05:52 +02:00 |
|
aynsix
|
a551225a74
|
assetFileVersion
|
2021-10-22 16:41:53 +03:00 |
|
aynsix
|
f1e7646a6c
|
fix status right on quarantine
|
2021-10-22 16:37:28 +03:00 |
|
nmaillat
|
3617284811
|
renaming service all in one worker from workers to worker
|
2021-10-22 14:43:17 +02:00 |
|
aynsix
|
d07bfd2ec9
|
PHRAS-3566 fix status right on upload
|
2021-10-22 14:58:07 +03:00 |
|
aynsix
|
45d48f2b9e
|
remove space
|
2021-10-22 14:28:58 +03:00 |
|
nmaillat
|
4684e11d38
|
Fix readme [CI SKIP]
|
2021-10-22 12:11:34 +02:00 |
|
nmaillat
|
6156bf86ba
|
typo fix [CI SKIP]
|
2021-10-22 12:01:09 +02:00 |
|
nmaillat
|
3fa071a7bb
|
PHRAS-3551 Docker-compose file refacto, add profiles on services
|
2021-10-22 11:13:38 +02:00 |
|
aynsix
|
84b555dc2b
|
PHRAS-3567 fix worker log
|
2021-10-22 11:48:49 +03:00 |
|
aynsix
|
f44e3493f2
|
add version in css file
change jsFileVersion to assetFileVersion
|
2021-10-21 12:04:38 +03:00 |
|
aynsix
|
a2dcbe3b0c
|
PHRAS-3565 fix geoname confirm modal
|
2021-10-20 14:55:03 +03:00 |
|
aynsix
|
8d524a8512
|
enable webhook by proxy
|
2021-10-19 11:21:14 +03:00 |
|
aynsix
|
eb9e87c1f4
|
fix webhook
|
2021-10-18 16:53:49 +03:00 |
|
jygaulier
|
d1d5873463
|
Merge branch 'master' into PHRAS-3519_filesystem-atomic-move
|
2021-10-18 11:10:51 +02:00 |
|
Nicolas Maillat
|
ddabb03925
|
Merge pull request #3885 from alchemy-fr/PHRAS-3551_dc_explode_service
PHRAS-3551 dc split for Rabbitmq service
|
2021-10-16 01:43:10 +02:00 |
|
nmaillat
|
0230306206
|
PHRAS-3551 fix env [SKIP CI]
|
2021-10-16 00:04:31 +02:00 |
|
nmaillat
|
0d3cfe4304
|
PHRAS-3551 split dc for RabbitMQ and env for mailhog mapping
|
2021-10-15 19:19:18 +02:00 |
|
Nicolas Maillat
|
6e78e25827
|
Merge pull request #3880 from alchemy-fr/PHRAS-3544_invalidate-stamp
PHRAS-3544 merge invalidate stamp on file rotation
|
2021-10-15 19:08:00 +02:00 |
|
Nicolas Maillat
|
b0abd5d54f
|
Merge branch 'master' into PHRAS-3544_invalidate-stamp
|
2021-10-15 16:36:44 +02:00 |
|
Nicolas Maillat
|
7886b4bc35
|
Merge pull request #3878 from alchemy-fr/PHRAS-3543---Alternate-fix-for-CA-X3-Expiration
PHRAS-3543 merge Update Dockerfile
|
2021-10-15 16:36:26 +02:00 |
|
Nicolas Maillat
|
adaf90b7d3
|
Merge branch 'master' into PHRAS-3543---Alternate-fix-for-CA-X3-Expiration
|
2021-10-15 15:56:23 +02:00 |
|
Nicolas Maillat
|
28e9d50118
|
Merge pull request #3873 from alchemy-fr/PHRAS-3484
PHRAS-3435 merge set heartbeat to 60 on AMQP connection
|
2021-10-15 15:55:35 +02:00 |
|
Nicolas Maillat
|
c15ea5e683
|
Merge branch 'master' into PHRAS-3484
|
2021-10-15 11:44:19 +02:00 |
|
Nicolas Maillat
|
60b0b420ad
|
Merge pull request #3879 from alchemy-fr/PHRAS-3541-rotation-nok
PHRAS-3541 merge prod - Image rotation NOK - ETAG is not renew - File is correctly rotated but not invalidate in browser cache.
|
2021-10-15 11:44:06 +02:00 |
|
Nicolas Maillat
|
18fcbfbfe0
|
Merge branch 'master' into PHRAS-3541-rotation-nok
|
2021-10-15 10:33:28 +02:00 |
|
Nicolas Maillat
|
534da757a9
|
Merge pull request #3884 from alchemy-fr/PHRAS-3543-update-ubuntu-14-image
PHRAS-3543 merge bump ubuntu 20 image
|
2021-10-15 10:33:03 +02:00 |
|
aynsix
|
38306ae460
|
test
|
2021-10-15 11:04:09 +03:00 |
|
aynsix
|
8025fa027c
|
test
|
2021-10-15 10:51:29 +03:00 |
|
Nicolas Maillat
|
ea07b3de41
|
Merge branch 'master' into PHRAS-3543-update-ubuntu-14-image
|
2021-10-14 15:37:46 +02:00 |
|
Moctar
|
c9aa1c918b
|
tests - update imagick version
|
2021-10-13 16:34:09 +02:00 |
|
Moctar
|
fcd3122167
|
tests - update imagick version
|
2021-10-13 15:50:54 +02:00 |
|
Moctar
|
900e87d88b
|
tests - update imagick version
|
2021-10-13 15:46:26 +02:00 |
|
Moctar
|
246ca5d30e
|
tests - update imagick version
|
2021-10-13 15:30:43 +02:00 |
|
Moctar
|
966dbb88d3
|
tests - update imagick version
|
2021-10-13 15:27:14 +02:00 |
|
Moctar
|
8c17f31996
|
tests - unifiy mysql test user
|
2021-10-12 14:56:59 +02:00 |
|
Moctar
|
d454e3bf70
|
mysql set localhost and update grant on setup tests
|
2021-10-12 14:33:34 +02:00 |
|