Commit Graph

12916 Commits

Author SHA1 Message Date
Nicolas Maillat
e9f363de1d Merge pull request #2954 from aynsix/PHRAS-2478-port-search-different-type-fields
PHRAS-2478: Port to 4.1 - Search issue when query mix data from different type of fields
2019-03-22 10:04:34 +01:00
aina-esokia
eaf8cf076a port to 4.1 search mix type 2019-03-22 12:04:42 +04:00
Harrys
456b0794c3 Update package.json 2019-03-21 18:02:13 +04:00
Harrys
f6fb898ec5 PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-21 17:49:40 +04:00
Harrys
41e847256a PHRAS-2430 Port to 4.1 - Advance search refacto , Restore Query and a little Polish 2019-03-20 16:03:13 +04:00
Harrys
93c4fd1370 Update package.json 2019-03-20 09:28:12 +04:00
Harrys
f02fd6ba6e Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-19 18:09:18 +04:00
Harrys
87c8433f0f PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-19 18:08:44 +04: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
aina-esokia
da8cc25c04 add translation 2019-03-18 16:40:11 +04:00
aina-esokia
8ab2888850 port to 4.1 upload by url 2019-03-18 16:16:14 +04:00
Harrys
f8774eb7d3 PHRAS-2422_Prod-Highlight_fulltext_is_Nok_when_display_option_is_Graphiste_mode 2019-03-18 13:41:35 +04:00
Harrys
1bfdcec97b Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-15 12:54:49 +04: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
aina-esokia
60886ad605 add icon substitution for fonts record .otf and .ttf 2019-03-11 15:48:24 +04:00
Harrys
6b0c225d9e PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query - Port_PHRAS-2381_to_41 2019-03-08 15:51:47 +04:00
Harrys
4336382669 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-08 11:06:20 +04:00
Harrys
146cad15d4 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-08 11:04:37 +04: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
85682cb4a8 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-01 09:20:49 +04: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
Harrys
7937532b90 PHRAS-2430_Advance_search_refacto_add created_on and updated_on 2019-02-14 17:06:03 +04:00
Nicolas Maillat
902e2372a8 Merge branch 'master' into PHRAS-2375-port41-preview-pdf-on-pdfjs 2019-02-13 11:55:19 +01:00
Harrys
46d0db19aa Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2419_refacto_Icons_actions_under_Thumbnail 2019-02-12 10:10:52 +04: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
Harrys
b47ae0b243 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2419_refacto_Icons_actions_under_Thumbnail 2019-02-06 15:49:19 +04:00
Harrys
a2bce71259 PHRAS-2419_refacto_Icons_actions_under_Thumbnail 2019-02-06 11:53:09 +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