Commit Graph

12691 Commits

Author SHA1 Message Date
Arthur de Moulins
25aeb9d73a PHRAS-2494 keep node_modules directory for performance 2019-03-27 17:23:44 +01:00
Nicolas Maillat
e426eff8af Merge pull request #2951 from alchemy-fr/PHRAS-2473_populate_time_improvement
PHRAS-2473 Populate improv, sql query optimization.
2019-03-18 15:43:22 +01:00
Nicolas Maillat
71f0e676f9 PHRAS-2473 Populate improv, sql query optimization.
PHRAS-2473 Populate time improvement with a sql query optimization
2019-03-18 15:08:16 +01:00
Nicolas Maillat
6ca847558a Merge pull request #2941 from HRavalomanana/PHRAS-2437_Prod_Overlay_title__the_text_is_repeated_if_more_than_102_caracters_
PHRAS-2437 Prod_Overlay_title__the_text_is_repeated_if_more_than_102_…
2019-03-12 15:47:02 +01:00
Harrys
0457296a0b PHRAS-2437_Prod_Overlay_title__the_text_is_repeated_if_more_than_102_caracters 2019-03-08 10:30:43 +04:00
Nicolas Maillat
099fce3424 PHRAS-2464 2019-03-01 16:03:14 +01:00
Nicolas Maillat
4da4ae64c0 Merge pull request #2932 from HRavalomanana/PHRAS-2464_downgrade_Phraseanet-production-client_to__0_33_84
PHRAS-2464 downgrade phraseanet production client to  0 33 84
2019-03-01 15:56:06 +01:00
Harrys
8d34e4a7d8 PHRAS-2464_downgrade_Phraseanet-production-client_to_0_33_84 2019-03-01 17:22:19 +04:00
Harrys
28de65edb9 PHRAS-2464_downgrade_Phraseanet-production-client_to_0_33_84 update yarn.lock 2019-03-01 17:13:56 +04:00
Nicolas Maillat
95d427267e Merge pull request #2924 from HRavalomanana/PHRAS-2361_Port_to_4.1_Dev_of_Prod-Push_window-Refacto_tall_icon_Push
PHRAS-2361_Port_41_Refacto_icon_push
2019-03-01 14:07:42 +01:00
Nicolas Maillat
c3f056832f Merge pull request #2930 from HRavalomanana/PHRAS-2464_downgrade_Phraseanet-production-client_to_0_33_84
PHRAS-2464_downgrade_Phraseanet-production-client_to_0_33_84
2019-03-01 12:04:42 +01:00
Harrys
80b0eca7a0 PHRAS-2464_downgrade_Phraseanet-production-client_to_0_33_84 2019-02-28 18:04:13 +04:00
Nicolas Maillat
2da6ad4629 Translated using Weblate (French)
Currently translated at 92.9% (2208 of 2376 strings)
2019-02-21 13:51:14 +01:00
Anthony C
be92a57382 Translated using Weblate (French)
Currently translated at 92.9% (2209 of 2376 strings)
2019-02-21 13:51:14 +01:00
Anthony C
09e688f09c Translated using Weblate (French)
Currently translated at 92.7% (2204 of 2376 strings)
2019-02-21 13:51:14 +01:00
Nicolas Maillat
3ec508c4c1 Merge pull request #2926 from xrousset78800/fix/update-default-php-version-for-master
PHRAS-1802 Update default vagrant php version
2019-02-18 22:33:06 +01:00
Nicolas Maillat
adbba05ae7 Merge branch 'master' into fix/update-default-php-version-for-master 2019-02-18 21:30:14 +01:00
Xavier Rousset
bde79d64e1 PHRAS-1802 Update default vagrant php version 2019-02-18 17:46:10 +01:00
Harrys
af6caaf608 PHRAS-2361_Port_41_Refacto_icon_push 2019-02-18 11:31:33 +04:00
Nicolas Maillat
41d0b373bd Merge pull request #2888 from aynsix/PHRAS-2375-port41-preview-pdf-on-pdfjs
PHRAS-2375 Port To 4.1 - PHRAS-2359 - PDF and office Document as PDF preview
2019-02-15 20:15:32 +01:00
Nicolas Maillat
902e2372a8 Merge branch 'master' into PHRAS-2375-port41-preview-pdf-on-pdfjs 2019-02-13 11:55:19 +01:00
Nicolas Maillat
53f0ab60e7 Merge pull request #2920 from aynsix/PHRAS-2446-database-template-use-pdf-preview-for-document
PHRAS-2446: Databases templates - 'flexpaper' to 'PDF' forChange setting of subdefs
2019-02-11 12:27:19 +01:00
aina-esokia
1fb82d730c change database template to use pdf in default document preview 2019-02-11 11:07:48 +04:00
Nicolas Maillat
3d13616e78 Update Contributors
PHRAS_2397 Update Contributors in Master
2019-02-01 17:37:22 +01:00
Nicolas Maillat
0010340d87 Update Authors In 4.1
PHRAS-2397
2019-02-01 17:01:21 +01:00
Nicolas Maillat
287f40475c Merge pull request #2903 from aynsix/PHRAS-2365-extract-audio-as-subdef
PHRAS-2365 Extract audio as subdef from "video" in wave
2019-01-29 15:33:13 +01:00
aina-esokia
605e6b031a fix presets audio name 2019-01-29 16:54:18 +04:00
aina-esokia
f6668a1bdf Merge branch 'PHRAS-2365-extract-audio-as-subdef' of https://github.com/aynsix/Phraseanet into PHRAS-2365-extract-audio-as-subdef 2019-01-25 16:34:49 +04:00
aina-esokia
30649b0db5 update lib media-alchemyst to 0.5.2 2019-01-25 16:32:10 +04:00
aina-esokia
7ea495d95a Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2365-extract-audio-as-subdef 2019-01-25 16:18:59 +04:00
aina-esokia
b1a4dda522 update alchemy/embed-bundle to 0.3.8 2019-01-25 15:37:11 +04:00
aina-esokia
c1dac08ded Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2375-port41-preview-pdf-on-pdfjs 2019-01-25 15:13:00 +04:00
Nicolas Maillat
2063ddc8a0 Merge branch 'master' into PHRAS-2365-extract-audio-as-subdef 2019-01-25 11:30:11 +01:00
Nicolas Maillat
081c90852e Merge pull request #2906 from alchemy-fr/PHRAS-2410_disable_pear_php_in_4.1
PHRAS-2410 disable pear.php.net in master
2019-01-25 11:29:06 +01:00
Nicolas Maillat
9e7e9fe284 PHRAS-2410 disable pear.php.net in master 2019-01-25 10:58:20 +01:00
aina-esokia
c61d3db187 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2365-extract-audio-as-subdef 2019-01-24 18:03:18 +04:00
aina-esokia
a656aa0072 audio subdeffrom video 2019-01-24 18:03:03 +04:00
Nicolas Maillat
5273f7a3bf Merge pull request #2900 from aynsix/PHRAS-2394-generate-subdef-for-mxf
PHRAS-2394 Generate Subdef (subview) for video MXF container
2019-01-24 01:22:25 +01:00
Nicolas Maillat
e24ae6be2b Merge branch 'master' into PHRAS-2394-generate-subdef-for-mxf 2019-01-24 01:15:29 +01:00
Nicolas Maillat
2a5ba97a32 Merge pull request #2895 from aynsix/PHRAS-2384-api-accept-auth-token-in-header
PHRAS-2384 Securing the API - API accept auth token only in header.
2019-01-24 00:39:01 +01:00
aina-esokia
8799bfb99a update alchemy/mediavorus 2019-01-22 16:36:48 +04:00
aina-esokia
9976ebee6f update composer.lock 2019-01-17 19:02:00 +04:00
aina-esokia
1e851113c8 update alchemy/oauth2php in 4.1 2019-01-17 11:02:22 +04:00
aina-esokia
8740ef9970 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2384-api-accept-auth-token-in-header 2019-01-16 12:27:46 +04:00
aina-esokia
cb490bc83d use const on call 2019-01-16 12:27:24 +04:00
Nicolas Maillat
c51b492fa9 Merge pull request #2894 from filipx/PHRAS-2385_port_local_manu_refacto
PHRAS-2385_port_local_manu_refacto
2019-01-15 14:41:54 +01:00
aina-esokia
fd495e7966 update configuration.sample.yml for api_token_header config 2019-01-15 17:06:34 +04:00
aina-esokia
26a25532f5 taken account config to retrieve token in header or in url 2019-01-15 15:54:37 +04:00
filipx
db7d2f204c Merge branch 'master' into PHRAS-2385_port_local_manu_refacto 2019-01-15 10:59:53 +01:00
Nicolas Maillat
efa402391d Merge pull request #2893 from alchemy-fr/PHRAS-2368_change_elasticsearch_index_creation
PHRAS-2368 Change cmd elasticsearch create index
2019-01-15 10:45:43 +01:00