Commit Graph

14292 Commits

Author SHA1 Message Date
Nicolas Maillat
0b6191fac5 Merge pull request #3432 from alchemy-fr/PHRAS-3020_setup-queue-for-scheduler
PHRAS-3020 #comment merge Fix for worker and scheduler conf in configuration.yml
2020-04-07 19:38:57 +02:00
Nicolas Maillat
134069e567 fix for worker and scheduler in configuration.yml 2020-04-07 19:14:41 +02:00
Harrys Ravalomanana
06c98244c9 PHRAS-3007 2020-04-07 18:54:05 +04:00
Jean-Yves Gaulier
76692bf3cc PHRAS-3018_reject-php32_4.1
fix : reject install if not php64
2020-04-07 11:22:10 +02:00
Jean-Yves Gaulier
662fe95712 PHRAS-3015_sb31-crashes-indexer_4.1
fix : set es:flags_bitfield as long (signed 64 bits)
2020-04-06 19:51:52 +02:00
Harrys Ravalomanana
aef7e015cb PHRAS-3007 #comment upgrade phraseanet-production-client 2020-04-06 14:59:32 +04:00
Harrys Ravalomanana
adf33e4bb1 Merge branch 'master' into PHRAS-3007_geoloc_config_replace_lng_by_lon 2020-04-06 14:56:05 +04:00
Nicolas Maillat
95a086308d Merge branch 'master' into PHRAS-3008_multiple-definitions-warnings_4.1 2020-04-06 10:48:56 +02:00
Nicolas Maillat
5a0c71e0d3 Merge pull request #3425 from alchemy-fr/PHRAS-3006_Port41_Front_delete_3_by_3
PHRAS-3006 #comment merge Port to 41 :  front delete 3 by 3
2020-04-06 10:48:31 +02:00
Harrys Ravalomanana
fa0332522f PHRAS-3007 2020-04-03 19:20:14 +04:00
Harrys Ravalomanana
99c2528cb3 PHRAS-3007 2020-04-03 14:34:01 +04:00
Harrys Ravalomanana
66a5895958 PHRAS-3007 2020-04-03 14:31:25 +04:00
Nicolas Maillat
2cb76f396b Report change in configuration.yml 2020-04-03 11:23:33 +02:00
Harrys Ravalomanana
e8c9b73ea1 PHRAS-3006 add translation 2020-04-03 11:44:13 +04:00
Harrys Ravalomanana
64ddac3a1f PHRAS-3007 Rename geoloc config 2020-04-03 11:39:16 +04:00
Nicolas Maillat
d4647ad0e1 Merge branch 'master' into PHRAS-3006_Port41_Front_delete_3_by_3 2020-04-03 00:52:15 +02:00
Nicolas Maillat
733f9e3c77 Merge pull request #3395 from alchemy-fr/PHRAS-2972_update_readme-1
PHRAS-2972 #comment Update Readme with docker images on docker hub
2020-04-02 19:37:35 +02:00
Nicolas Maillat
9d68c12cb6 Update README.md 2020-04-02 19:35:46 +02:00
Nicolas Maillat
0f39756147 Merge branch 'master' into PHRAS-2972_update_readme-1 2020-04-02 19:03:37 +02:00
Nicolas Maillat
935152d3ac Merge pull request #3407 from alchemy-fr/PHRAS-2937_libfdk_aac_in_db_model
PHRAS-2937 #comment merge of replace libmp3aac by libfdk_aac in databox model
2020-04-02 19:01:37 +02:00
Nicolas Maillat
ac69912d84 Merge branch 'master' into PHRAS-2937_libfdk_aac_in_db_model 2020-04-02 18:46:07 +02:00
Nicolas Maillat
da81f8dbf1 Merge pull request #3421 from alchemy-fr/PHRAS-3002-upgrade-php-ffmpeg-lib
PHRAS-3002 #comment merge Build subdef with fdk_aac NOK with ffmpeg 4.2.2 on Docker.
2020-04-02 18:45:12 +02:00
Harrys Ravalomanana
11e729ca1e PHRAS-3006 2020-04-02 19:37:44 +04:00
Nicolas Maillat
a38f01ca57 Merge branch 'master' into PHRAS-3002-upgrade-php-ffmpeg-lib 2020-04-02 16:37:40 +02:00
Nicolas Maillat
314e9b4ae7 Merge pull request #3416 from alchemy-fr/PHRAS-3001_es-geopoint-sources_4.1
PHRAS-3001 #comment  merge es geopoint sources 4.1
2020-04-02 16:37:19 +02:00
Jean-Yves Gaulier
1106e28603 PHRAS-3008_multiple-definitions-warnings_4.1
- fix : removed composer.phar after plugin add.
2020-04-02 14:57:05 +02:00
Harrys Ravalomanana
ca02542b96 Merge branch 'PHRAS-3006_Port41_Front_delete_3_by_3' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3006_Port41_Front_delete_3_by_3 2020-04-02 15:58:25 +04:00
Harrys Ravalomanana
01ac6936c2 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3006_Port41_Front_delete_3_by_3 2020-04-02 15:57:49 +04:00
aynsix
51b10b6bec add php modification 2020-04-02 14:56:27 +03:00
Nicolas Maillat
bb430f76d4 Merge branch 'master' into PHRAS-3001_es-geopoint-sources_4.1 2020-04-02 12:23:27 +02:00
Nicolas Maillat
c42e419ad2 Merge pull request #3424 from alchemy-fr/PHRAS-2992
PHRAS-2992 #comment merge of Prod Fix Date translation everywhere record history.
2020-04-02 12:21:50 +02:00
Nicolas Maillat
3767c75b0a Merge branch 'master' into PHRAS-2992 2020-04-02 10:08:08 +02:00
Nicolas Maillat
1885a51b1e Merge branch 'master' into PHRAS-3001_es-geopoint-sources_4.1 2020-04-02 09:59:53 +02:00
Harrys Ravalomanana
661f09e3fd PHRAS-3006 #comment port 41 Front elete 3 by 3 2020-04-02 11:52:52 +04:00
Nicolas Maillat
3cff44eec2 Merge branch 'master' into PHRAS-3002-upgrade-php-ffmpeg-lib 2020-04-01 23:48:33 +02:00
Nicolas Maillat
32ec5da4a8 Merge pull request #3423 from alchemy-fr/PHRAS-3005-Prod-workzone-fox-error-feedback-date
PHRAS-3005 #comment merge  Prod - workzone - error when expand feedback.
2020-04-01 23:48:00 +02:00
Nicolas Maillat
9df31156a8 Merge branch 'master' into PHRAS-3005-Prod-workzone-fox-error-feedback-date 2020-04-01 20:08:49 +02:00
Nicolas Maillat
dec19c1b73 Merge pull request #3422 from alchemy-fr/PHRAS-2999_PROD_Answer_grid
PHRAS-2999 #comment merge prod - answer grid - hide selection summary
2020-04-01 20:08:19 +02:00
Harrys Ravalomanana
1b752fde1c PHRAS-2992 code factoring 2020-04-01 17:42:36 +04:00
Harrys Ravalomanana
eddf95e71b PHRAS-2992 2020-04-01 17:40:01 +04:00
Harrys Ravalomanana
ed0c2bbf2e PHRAS-2992 fix date translation 2020-04-01 17:27:54 +04:00
Harrys Ravalomanana
5229eba49e PHRAS-3005 #comment fix error on feedback-date 2020-04-01 16:35:48 +04:00
aynsix
a39c0b5ff0 use php-ffmpeg v0.15 2020-04-01 13:52:55 +03:00
Harrys Ravalomanana
4febd38154 PHRAS-2999 #comment remove Detail info block 2020-04-01 14:46:34 +04:00
jygaulier
5df663cad2 Merge branch 'master' into PHRAS-3001_es-geopoint-sources_4.1 2020-03-31 17:54:55 +02:00
Jean-Yves Gaulier
027f7e1571 PHRAS-3001_es-geopoint-sources_4.1
- fix : exif source is a fallback if no good values are found in the configured source field (or if conf is not set)
2020-03-31 17:54:22 +02:00
Jean-Yves Gaulier
9f216813b7 PHRAS-3001_es-geopoint-sources_4.1
- fix : follow the original conf structure (position-fields into provider)
- add : handles "latlng" format
2020-03-31 17:16:57 +02:00
Nicolas Maillat
65a4a7deb0 Merge pull request #3418 from alchemy-fr/PHRAS-2998_prod_workzone_default_sort_2
PHRAS-2998 #merge Prod - workzone - basket tab - default sort is always by date
2020-03-31 13:39:33 +02:00
Nicolas Maillat
02ba33a8f9 Merge branch 'master' into PHRAS-2998_prod_workzone_default_sort_2 2020-03-31 12:50:58 +02:00
Nicolas Maillat
fe575e9830 Merge pull request #3417 from alchemy-fr/PHRAS-3003_large-value-32ko_es_4.1
PHRAS-3003 #comment Merge truncate large value at 32ko in elasticesearch  4.1
2020-03-31 12:48:54 +02:00