Harrys Ravalomanana
|
c9907449a3
|
merge branch from master
|
2019-11-25 18:39:07 +04:00 |
|
Nicolas Maillat
|
b58a0c95e3
|
Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report
|
2019-11-25 15:23:25 +01:00 |
|
Harrys Ravalomanana
|
7a88ece5fe
|
PHRAS-2829
|
2019-11-25 17:45:29 +04:00 |
|
Nicolas Maillat
|
3b8163e98c
|
Merge pull request #3234 from alchemy-fr/PHRAS-2842_audio_codec_libmp3lame
PHRAS-2842 #comment change audio codec in databases models #time 15m
|
2019-11-23 08:17:17 +01:00 |
|
nmaillat
|
1f5a484a3a
|
PHRAS-2842 #comment change audio codec in databases model #time 1h
|
2019-11-22 22:55:19 +01:00 |
|
Nicolas Maillat
|
fe74bf62c4
|
Merge pull request #3230 from alchemy-fr/PHRDPL-81_circleci_docker_tag
PHRDPL-81 #comment Use circle env vars CIRCLE_BRANCH
|
2019-11-22 17:22:48 +01:00 |
|
Nicolas Maillat
|
1ccda42f8d
|
update repo name
|
2019-11-22 16:59:16 +01:00 |
|
Nicolas Maillat
|
6040917774
|
Merge branch 'master' into PHRDPL-81_circleci_docker_tag
|
2019-11-22 16:53:29 +01:00 |
|
Alexandre BRACH
|
6a5678d1b7
|
PHRDPL-81 #comment remove obsolete param in circuleci.xml
|
2019-11-22 16:37:14 +01:00 |
|
Nicolas Maillat
|
60f13074e9
|
Merge pull request #3232 from alchemy-fr/reqdme-docker-deployment
README instruction to deploy the phraseanet stack
|
2019-11-22 16:25:48 +01:00 |
|
Alexandre BRACH
|
03402cec92
|
#comment README instruction to deploy the phraseanet stack
|
2019-11-22 15:47:31 +01:00 |
|
Alexandre BRACH
|
3c0bf41e51
|
PHRDPL-81 #comment Use circle env vars CIRCLE_BRANCH to push image with correct tag
|
2019-11-22 15:29:50 +01:00 |
|
Nicolas Maillat
|
a9ed349f86
|
Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report
|
2019-11-22 15:21:00 +01:00 |
|
Harrys Ravalomanana
|
fb708cb131
|
PHRAS-2829 #comment fix lightbox mobile #time 8h
|
2019-11-22 17:50:55 +04:00 |
|
Harrys Ravalomanana
|
443fce14da
|
PHRAS-2829 lightbox-mobile nw design
|
2019-11-21 17:30:07 +04: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 |
|
Harrys Ravalomanana
|
b98d51397d
|
PHRAS-2829 #comment lightbox: fix basket display on mobile #time 1h
|
2019-11-20 16:37:53 +04: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
|
4f7b9b2646
|
Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report
|
2019-11-19 18:26:51 +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
|
eb9d70463b
|
Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report
|
2019-11-19 16:30:33 +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 |
|
Harrys Ravalomanana
|
f025745170
|
PHRAS-2829 #comment add translation and upgrade phraseanet-production-client
|
2019-11-19 11:52:40 +04:00 |
|
Harrys Ravalomanana
|
b69ff691fa
|
PHRAS-2829 #comment Pord41 of Lightbox mobile: user choice and validation report #time 5h
|
2019-11-19 11:38:02 +04: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 |
|