hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,725 Commits 268 Branches 107 Tags
2390244e9eb3ab2c93a48133e7543d2b3e9bd229
Commit Graph

12725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harrys Ravalomanana
2390244e9e Merge branch master into PHRAS-2430 2019-04-05 15:11:09 +04:00
Nicolas Maillat
4bb3e28bf5 Merge pull request #2967 from 4rthem/randomlib 
PHRAS-2505 replace ircmaxell/random-lib with paragonie/random-lib for php7.1
 2019-04-04 14:24:55 +02:00
Arthur de Moulins
887ad91174 PHRAS-2505 replace ircmaxell/random-lib with paragonie/random-lib for php7.1 2019-04-04 12:34:04 +02:00
Nicolas Maillat
e687b5ba28 Merge pull request #2965 from aynsix/PHRAS-2067-record-font-icon-substitution 
PHRAS-2067: add substitution icon for font otc and ttc
 2019-04-02 14:20:44 +02:00
Nicolas Maillat
d2e09dbdf7 Merge pull request #2966 from aynsix/PHRAS-2499-add-model-order-manager 
PHRAS-2499: Port to 4.1 - Add Model to "Order Managers" of collection
 2019-04-02 14:20:22 +02:00
aina-esokia
e68081399d port add model in order manager of collection 2019-04-02 15:36:49 +04:00
aina-esokia
8015c5ec7b add substitution icon for font otc and ttc 2019-04-02 14:58:34 +04:00
Nicolas Maillat
141bfde9ca Merge pull request #2943 from aynsix/PHRAS-2067-icon-substitution-fonts-record 
PHRAS-2067:  Prod : Introduce thumbnail & preview generic images for Fonts records
 2019-04-01 15:23:04 +02:00
Nicolas Maillat
2b0f6fda2b Merge pull request #2949 from aynsix/PHRAS-2465-port-upload-by-url 
PHRAS-2465 Port To 4.1 - upload-via-url_4.0
 2019-04-01 15:22:08 +02:00
Kamlesh Balloo
c5e95b7e44 PHRAS-2430-update-phraseanet-production-version-for-restore-query 2019-04-01 14:55:04 +04:00
Nicolas Maillat
20a90dfc73 Merge pull request #2962 from 4rthem/arthur-PHRAS-2494 
PHRAS-2494 keep node_modules directory for performance
 2019-04-01 12:10:47 +02:00
Kamlesh Balloo
70ccedf8e5 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-01 10:11:05 +04:00
Arthur de Moulins
25aeb9d73a PHRAS-2494 keep node_modules directory for performance 2019-03-27 17:23:44 +01:00
Nicolas Maillat
788ff0d2b3 Merge pull request #2960 from xrousset78800/PHRAS-2455-resolve-php-warning-on-dashboard 
PHRAS-2455 Resolve PHP warnings on setup, update provisionning
 2019-03-27 17:05:03 +01:00
Xavier Rousset
8c0cd7d886 PHRAS-2455 Resolve PHP warnings on setup, update provisionning 2019-03-27 14:22:24 +01:00
aynsix
905ddcb836 port PHRAS-2468: don't drop log_colls (#2959) 2019-03-27 12:02:30 +01:00
Harrys
04da9678ec Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-27 10:05:44 +04:00
Harrys
b3976733e4 PHRAS-2430 Restore jsonQuery 2019-03-27 10:04:05 +04:00
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
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