Nicolas Maillat
|
77d3405149
|
Merge branch 'master' into PHRAS-2196-api-stories-pagination
|
2019-11-21 17:54:23 +01:00 |
|
Nicolas Maillat
|
e79b409354
|
Merge pull request #3227 from jygaulier/PHRAS-2830_space-in-query_4.1
PHRAS-2830 #comment space-in-query_4.1
|
2019-11-21 09:07:55 +01:00 |
|
Nicolas Maillat
|
c9b6e7175a
|
Merge branch 'master' into PHRAS-2830_space-in-query_4.1
|
2019-11-20 22:36:59 +01:00 |
|
Nicolas Maillat
|
2ebb05be4a
|
Merge pull request #3207 from alchemy-fr/dependabot/npm_and_yarn/fstream-1.0.12
PHRAS-2515 #comment Bump fstream from 1.0.11 to 1.0.12
|
2019-11-20 22:36:19 +01:00 |
|
Nicolas Maillat
|
9b3a751f8a
|
Merge branch 'master' into PHRAS-2830_space-in-query_4.1
|
2019-11-20 19:28:00 +01:00 |
|
Nicolas Maillat
|
2e10a1121a
|
Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12
|
2019-11-20 19:27:45 +01:00 |
|
Nicolas Maillat
|
57a988ffb7
|
Merge pull request #3208 from alchemy-fr/dependabot/npm_and_yarn/mixin-deep-1.3.2
PHRAS-2515 #comment Bump mixin-deep from 1.3.1 to 1.3.2 github bot pr
|
2019-11-20 19:27:20 +01:00 |
|
Jean-Yves Gaulier
|
bac72e269a
|
PHRAS-2830_space-in-query_4.1
fixed grammar
|
2019-11-20 18:34:55 +01:00 |
|
Nicolas Maillat
|
3aac7f692e
|
Merge branch 'master' into dependabot/npm_and_yarn/mixin-deep-1.3.2
|
2019-11-20 18:31:51 +01:00 |
|
Nicolas Maillat
|
425264edb4
|
Merge pull request #3213 from HRavalomanana/PHRAS-2824_admin_add_string_translation
PHRAS-2824 #comment Admin add string for Gui_editable and Gui_visible in admin
|
2019-11-20 10:53:42 +01:00 |
|
Nicolas Maillat
|
30de4546d5
|
Merge branch 'master' into PHRAS-2824_admin_add_string_translation
|
2019-11-20 10:24:48 +01:00 |
|
Nicolas Maillat
|
2f1e247392
|
Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12
|
2019-11-20 10:21:48 +01:00 |
|
Nicolas Maillat
|
2042ab0e33
|
Merge branch 'master' into dependabot/npm_and_yarn/mixin-deep-1.3.2
|
2019-11-20 10:21:30 +01:00 |
|
Nicolas Maillat
|
a7e33c0509
|
Merge pull request #3225 from HRavalomanana/PHRAS-2805_upgrade_phraseanet_production_client
PHRAS-2805 #comment merge upgrade phraseanet-production-client
|
2019-11-20 10:20:33 +01:00 |
|
Harrys Ravalomanana
|
0d1a354b47
|
PHRAS-2805 #comment upgrade phraseanet-production-client
|
2019-11-20 11:57:29 +04:00 |
|
Nicolas Maillat
|
de589ad4bd
|
Merge branch 'master' into PHRAS-2824_admin_add_string_translation
|
2019-11-19 18:27:31 +01:00 |
|
Nicolas Maillat
|
d0fb2c1ab5
|
Merge pull request #3224 from jygaulier/PHRAS-2831_port-truncation_4.1
PHRAS-2831 #comment merge port- truncation 4.1
PHRAS-2802 #comment merge truncation with dot
|
2019-11-19 18:23:00 +01:00 |
|
jygaulier
|
a2b2658c04
|
Merge branch 'master' into PHRAS-2831_port-truncation_4.1
|
2019-11-19 17:34:45 +01:00 |
|
Jean-Yves Gaulier
|
e09c176f3f
|
PHRAS-2831_port-truncation_4.1
fix tests
|
2019-11-19 17:34:27 +01:00 |
|
Jean-Yves Gaulier
|
3145049247
|
PHRAS-2831_port-truncation_4.1
copy elastic/truncation code from 4.0
nb: from already exists
|
2019-11-19 16:45:46 +01:00 |
|
Nicolas Maillat
|
7eeb973083
|
Merge pull request #3214 from HRavalomanana/PHRAS-2805_Port_41_facet-case-sensibility
PHRAS-2805 #comment merge Port to 41 of Facet-case-sensibility
|
2019-11-19 16:21:07 +01:00 |
|
Nicolas Maillat
|
d95c56af69
|
Merge branch 'master' into PHRAS-2805_Port_41_facet-case-sensibility
|
2019-11-19 16:04:41 +01:00 |
|
Nicolas Maillat
|
cc9183373e
|
Merge pull request #3221 from HRavalomanana/PHRAS-2823_fix-icon-on-Admin-page
PHRAS-2823 #comment merge fix icon of Fontawesome on admin page
|
2019-11-18 10:51:19 +01:00 |
|
Harrys Ravalomanana
|
d73d5c26ee
|
PHRAS-2823 #comment fix fontawesome on admin page #time 1h
|
2019-11-18 11:28:31 +04:00 |
|
Nicolas Maillat
|
9108b857d8
|
Merge pull request #3216 from aynsix/PHRAS-2813-redis-delete-deprecated
PHRAS-2813 : #comment merge of 4.1 redis function delete is deprecated
|
2019-11-15 23:13:13 +01:00 |
|
Nicolas Maillat
|
1d803e7afb
|
Merge branch 'master' into PHRAS-2813-redis-delete-deprecated
|
2019-11-15 23:03:35 +01:00 |
|
Nicolas Maillat
|
bf63a4d64c
|
Merge pull request #3218 from AlexandreBrach/autoinstall_check_account_vars
autoinstall #comment check vars on auto-install
|
2019-11-15 17:50:56 +01:00 |
|
Alexandre BRACH
|
962b7c9fa8
|
autoinstall #comment check vars on auto-install
|
2019-11-15 16:38:59 +01:00 |
|
aynsix
|
be73baae5b
|
redis function delete is deprecated
|
2019-11-15 17:12:02 +04:00 |
|
Harrys Ravalomanana
|
f9d3075559
|
PHRAS-2824 #comment add translation
|
2019-11-15 11:15:32 +04:00 |
|
Nicolas Maillat
|
06dc8aa8df
|
Merge branch 'master' into PHRAS-2824_admin_add_string_translation
|
2019-11-14 18:04:17 +01:00 |
|
Nicolas Maillat
|
b8934f17e0
|
Merge pull request #3215 from AlexandreBrach/embed_README
PHRAS-2817 #comment Embed README
4.1.0
|
2019-11-14 15:29:35 +01:00 |
|
Alexandre BRACH
|
9d537532ce
|
Embed README
|
2019-11-14 14:44:24 +01:00 |
|
Harrys Ravalomanana
|
5e4da5f28f
|
PHRAS-2805 #comment Port41 of Facet-case-sensibility
|
2019-11-14 15:02:04 +04:00 |
|
Harrys Ravalomanana
|
d2209412a9
|
PHRAS-2824 #comment generate translation #time 1h
|
2019-11-14 12:33:03 +04:00 |
|
Nicolas Maillat
|
8e428fadad
|
Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12
|
2019-11-13 18:46:31 +01:00 |
|
Nicolas Maillat
|
078cf31072
|
Merge branch 'master' into dependabot/npm_and_yarn/mixin-deep-1.3.2
|
2019-11-13 18:46:12 +01:00 |
|
Nicolas Maillat
|
e4516644c4
|
Merge pull request #3212 from alchemy-fr/PHRAS-2749_create_cache_directory_in_4.1
PHRAS-2749 #comment Add missing cache directory
|
2019-11-13 18:31:19 +01:00 |
|
Nicolas Maillat
|
1180ccf0d2
|
Merge branch 'master' into PHRAS-2749_create_cache_directory_in_4.1
|
2019-11-13 17:44:46 +01:00 |
|
Nicolas Maillat
|
e8400bcf5d
|
Merge pull request #3211 from HRavalomanana/PHRAS-2760_fix_help_menu_in_view_2
PHRAS-2760 #comment HELP menu : close submenu on click a div out of this
|
2019-11-13 16:44:23 +01:00 |
|
Nicolas Maillat
|
372e98b387
|
Merge branch 'master' into PHRAS-2760_fix_help_menu_in_view_2
|
2019-11-13 16:07:54 +01:00 |
|
Nicolas Maillat
|
0fbe121162
|
Merge pull request #3204 from jygaulier/PHRAS-2815_generate-cterms-multi-db_4.1
PHRAS-2815 #comment generate cterms in multi db context on 4.1
|
2019-11-13 16:07:32 +01:00 |
|
Harrys Ravalomanana
|
d4de76662f
|
PHRAS-2760 #comment close submenu on click a div out of this #time 1h
|
2019-11-13 18:37:02 +04:00 |
|
Nicolas Maillat
|
3df845a2d7
|
Merge branch 'master' into PHRAS-2815_generate-cterms-multi-db_4.1
|
2019-11-13 15:22:03 +01:00 |
|
Nicolas Maillat
|
0a4d597a58
|
Merge pull request #3209 from alchemy-fr/dependabot/npm_and_yarn/lodash.merge-4.6.2
PHRAS-2515 #comment Bump lodash.merge from 4.6.1 to 4.6.2
|
2019-11-13 15:21:21 +01:00 |
|
Nicolas Maillat
|
5378d593ca
|
Merge branch 'master' into PHRAS-2815_generate-cterms-multi-db_4.1
|
2019-11-13 15:16:06 +01:00 |
|
Nicolas Maillat
|
c9c3df5964
|
Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12
|
2019-11-13 14:55:22 +01:00 |
|
Nicolas Maillat
|
190acfbd84
|
Merge branch 'master' into dependabot/npm_and_yarn/mixin-deep-1.3.2
|
2019-11-13 14:54:48 +01:00 |
|
Nicolas Maillat
|
956aff393c
|
Merge branch 'master' into dependabot/npm_and_yarn/lodash.merge-4.6.2
|
2019-11-13 14:54:31 +01:00 |
|
Nicolas Maillat
|
d77d1d8428
|
Merge pull request #3210 from HRavalomanana/PHRAS-2816_analyse_hidden_fields_on__roll_over_and_detailled_view_phras_2809
PHRAS-2816 #comment Hidden fields is roll over and detailled view
|
2019-11-13 14:45:51 +01:00 |
|