jygaulier
36ce3905d1
Merge branch 'master' into PHRAS-3583_sort-on-dates
2021-11-16 21:56:50 +01:00
jygaulier
ce3a28b5cd
PHRAS-3583
...
define a custom "sort" analyzer (whole value, lowercase, no diacritics)
fix sort by type (string/date/number)
fix sort on business fields (use "private_caption.field")
sort string fields on ".sort" sub-value (in place of ".raw")
add option for docker/es to activate scripting on search (disabled for now)
2021-11-16 20:52:54 +01:00
Nicolas Maillat
9ec60853db
Merge pull request #3882 from alchemy-fr/PHRAS-3519_filesystem-atomic-move
...
PHRAS-3519 merge filesystem atomic move
2021-11-16 18:05:02 +01:00
aynsix
419d74b120
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3555-more-webhook
2021-11-16 17:42:34 +03:00
aynsix
cb3a072712
fix
2021-11-16 17:41:02 +03:00
aynsix
074920353a
PHRAS-3555 add more webhook events
2021-11-16 17:15:49 +03:00
jygaulier
a43b94684e
PHRAS-3583
...
add missing "raw" mapping values to date & numbers
2021-11-15 18:55:03 +01:00
jygaulier
494f9a0e39
PHRAS-3580
...
arial.ttf was moved in resources
2021-11-15 17:10:27 +01:00
jygaulier
a56a56c272
PHRAS-3580 WIP
...
new "watermark text" setting to subdef
2021-11-15 17:10:27 +01:00
jygaulier
951fd22cec
PHRAS-3580 WIP
...
simple wmak is applied (cross ; no text)
[ci skip]
2021-11-15 17:10:27 +01:00
jygaulier
d5a2e8fafd
PHRAS-3580 WIP
...
add wmak checkbox
[ci skip]
2021-11-15 17:10:27 +01:00
Nicolas Maillat
6d63c28059
Merge branch 'master' into PHRAS-3519_filesystem-atomic-move
2021-11-15 14:18:14 +01:00
Nicolas Maillat
808ba6dfe0
Merge pull request #3898 from alchemy-fr/PHRAS-3413-webhook-emit-timeout
...
PHRAS-3413 merge add timeout when emit webhook
2021-11-15 14:18:00 +01:00
Nicolas Maillat
41726407d0
Merge branch 'master' into PHRAS-3519_filesystem-atomic-move
2021-11-15 09:31:38 +01:00
Nicolas Maillat
f09071d99f
Merge branch 'master' into PHRAS-3413-webhook-emit-timeout
2021-11-12 18:38:11 +01:00
Nicolas Maillat
3a5452bae7
Merge pull request #3901 from alchemy-fr/PHRAS-3386-fix-blank-basketzone
...
PHRAS-3386 merge Baskets zone is blank after re-opening the workzone
2021-11-12 18:37:57 +01:00
Nicolas Maillat
5ef8cde379
Merge branch 'master' into PHRAS-3386-fix-blank-basketzone
2021-11-12 17:49:20 +01:00
Nicolas Maillat
6d1827874e
Merge pull request #3900 from alchemy-fr/PHRAS-3581-search-button-redirect-session-expiration
...
PHRAS-3581 merge Prod - Session expiration - Redirect on home when click on search button
2021-11-12 17:48:45 +01:00
Nicolas Maillat
d4dfcf4552
Merge branch 'master' into PHRAS-3581-search-button-redirect-session-expiration
2021-11-12 16:48:11 +01:00
Nicolas Maillat
7306809b37
Merge pull request #3902 from alchemy-fr/PHRAS-3568-heic-image-substitution
...
PHRAS-3568 merge fix heic image substitution
2021-11-12 16:47:50 +01:00
aynsix
76f62bee3f
PHRAS-3568 fix heic image substitution
2021-11-12 14:50:29 +03:00
aynsix
e7db6fb58b
PHRAS-3386 fix basket zone blank
2021-11-11 11:54:40 +03:00
aynsix
b203417340
PHRAS-3581 search buton redirect on home when expire session
2021-11-09 17:41:14 +03:00
jygaulier
2256b3a7a9
Merge pull request #3899 from alchemy-fr/PHRAS-3468-remove-trace-debug
...
PHRAS-3468 remove logs trace
2021-11-09 10:07:28 +01:00
aynsix
c12cefa028
PHRAS-3468 remove logs trace
2021-11-09 10:51:49 +03:00
aynsix
a186068b07
PHRAS-3413 add timeout when emit webhook
2021-11-08 16:51:11 +03:00
Nicolas Maillat
9f997c6a63
Merge branch 'master' into PHRAS-3519_filesystem-atomic-move
2021-11-08 13:48:59 +01:00
Nicolas Maillat
5b93a4b735
Merge pull request #3886 from alchemy-fr/PHRAS-3166-webhook-tables-maintains-value
...
PHRAS-3166 merge Worker webhook - fix guzzle and maintains older tables
2021-11-08 13:48:44 +01:00
Nicolas Maillat
a4beb4edd5
Merge branch 'master' into PHRAS-3166-webhook-tables-maintains-value
2021-11-08 12:20:43 +01:00
Nicolas Maillat
d3d2d5268d
Merge pull request #3895 from alchemy-fr/PHRAS-3546_More_comments_on_each_env_variable_for_populate_documentation_page
...
PHRAS-3546 merge More comments on each env variable for populate documenta…
2021-11-08 10:31:20 +01:00
felixalchemy
6ca22796a6
PHRAS-3546: More comments on each env variable for populate documentation page
2021-11-05 19:40:06 +01:00
Nicolas Maillat
040c29c704
Merge branch 'master' into PHRAS-3166-webhook-tables-maintains-value
2021-11-03 13:03:46 +01:00
Nicolas Maillat
5ed9210ead
Merge branch 'master' into PHRAS-3519_filesystem-atomic-move
2021-11-03 13:01:52 +01:00
jygaulier
b8ad17b7f7
Update Step31.php
...
fix typo
2021-11-02 14:26:23 +01:00
Nicolas Maillat
868e88d0e6
Merge pull request #3891 from alchemy-fr/PHRAS-3572_kibana_dashboard
...
PHRAS-3572 Dashboard improvement
2021-10-23 01:38:43 +02:00
nmaillat
6b76b81bea
PHRAS-3572 Dashboards wip
2021-10-23 01:18:50 +02:00
Nicolas Maillat
c706078781
Merge pull request #3890 from alchemy-fr/PHRAS-3566-fix-status-right-on-upload
...
PHRAS-3566 merge fix status right on upload
2021-10-22 23:55:11 +02:00
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
