Harrys Ravalomanana
72000dc03a
PHRAS-2933 #comment add Design on Facets sort options #time 2h
2020-02-20 17:07:54 +04:00
Nicolas Maillat
3fe46083e7
Merge branch 'master' into PHRAS-2933_Fix_sort_facet
2020-02-19 17:57:40 +01:00
Nicolas Maillat
c5d4d5ae27
Merge pull request #3314 from alchemy-fr/PHRDPL-86_xdebug
...
PHRDPL-86 #comment merge of XDebug in dev mode
2020-02-19 17:57:16 +01:00
Nicolas Maillat
807fd42253
Merge branch 'master' into PHRDPL-86_xdebug
2020-02-19 17:39:52 +01:00
Nicolas Maillat
f4acb8cd12
Merge pull request #3353 from alchemy-fr/PHRAS-2854_generate-js-fixtures
...
PHRAS-2854 #comment generate-js-fixtures adding a warn message when plugins are installed
2020-02-19 17:27:57 +01:00
Nicolas Maillat
c040124202
Merge branch 'master' into PHRDPL-86_xdebug
2020-02-19 17:25:02 +01:00
Jean-Yves Gaulier
4f99fb57c7
cleanup debug
2020-02-19 17:10:32 +01:00
Jean-Yves Gaulier
63fce45974
PHRAS-2854_generate-js-fixtures
...
add message to tell to remove plugins
2020-02-19 16:20:36 +01:00
Harrys Ravalomanana
f668d3bcb9
merge master
2020-02-19 18:41:15 +04:00
Harrys Ravalomanana
b232806b8b
PHRAS-2933
2020-02-19 18:38:52 +04:00
Harrys Ravalomanana
fe731406ec
Merge branch 'master' into PHRAS-2933_Fix_sort_facet
2020-02-19 15:31:05 +04:00
Harrys Ravalomanana
b35c1595ed
PHRAS-2933 Fix facets order and move to workzone block
2020-02-19 15:20:19 +04:00
Nicolas Maillat
0c582d3e76
Translated using Weblate (French)
...
Currently translated at 99.8% (2429 of 2433 strings)
2020-02-19 10:16:01 +00:00
Nicolas Maillat
8058e6a86b
Translated using Weblate (English)
...
Currently translated at 99.9% (2431 of 2433 strings)
2020-02-19 10:16:01 +00:00
Nicolas Maillat
1119a158bc
Translated using Weblate (French)
...
Currently translated at 99.8% (2429 of 2433 strings)
2020-02-19 10:06:35 +00:00
Nicolas Maillat
b36e663a52
Translated using Weblate (English)
...
Currently translated at 99.9% (2431 of 2433 strings)
2020-02-19 10:06:18 +00:00
Nicolas Maillat
2c4c119663
Merge branch 'master' into PHRDPL-86_xdebug
2020-02-19 10:28:35 +01:00
Nicolas Maillat
bfb90810e2
Translated using Weblate (English)
...
Currently translated at 99.8% (2429 of 2433 strings)
2020-02-18 20:35:39 +00:00
Nicolas Maillat
1886f6c569
Translated using Weblate (French)
...
Currently translated at 99.7% (2428 of 2433 strings)
2020-02-18 20:35:39 +00:00
Nicolas Maillat
f5a48879e6
Merge branch 'master' into PHRDPL-86_xdebug
2020-02-18 21:12:52 +01:00
Nicolas Maillat
e93506efc7
Merge pull request #3351 from alchemy-fr/PHRAS-2934_Bad-dctrine-mapping-webhookeventdelivery_4.1
...
PHRAS-2934 #comment Bad doctrine mapping webhookeventdelivery 4.1
2020-02-18 21:12:21 +01:00
jygaulier
5b05dc355e
Merge branch 'master' into PHRAS-2934_Bad-dctrine-mapping-webhookeventdelivery_4.1
2020-02-18 17:30:51 +01:00
Jean-Yves Gaulier
50b50116e7
PHRAS-2934_Bad-dctrine-mapping-webhookeventdelivery_4.1
...
- added missing relation
2020-02-18 17:26:45 +01:00
Nicolas Maillat
10cb731a2c
Merge pull request #3347 from alchemy-fr/PHRAS-2779_Account_enable-to_delete_application_in_developer-tab
...
PHRAS-2779 #comment merge Account : Enable to delete an application in Developer tab
2020-02-18 17:20:17 +01:00
Nicolas Maillat
8c16d0c133
Merge branch 'master' into PHRAS-2779_Account_enable-to_delete_application_in_developer-tab
2020-02-18 16:46:40 +01:00
Nicolas Maillat
2d980fb0ff
Merge pull request #3350 from alchemy-fr/PHRAS-2825_add_translation
...
PHRAS-2825 #comment Add missing translation
2020-02-18 16:46:18 +01:00
Nicolas Maillat
de819673c8
Merge branch 'master' into PHRDPL-86_xdebug
2020-02-18 16:34:33 +01:00
Nicolas Maillat
3443a5b39e
Merge branch 'master' into PHRAS-2825_add_translation
2020-02-18 16:29:37 +01:00
Nicolas Maillat
8448e19ba7
Merge branch 'master' into PHRAS-2779_Account_enable-to_delete_application_in_developer-tab
2020-02-18 16:27:19 +01:00
Harrys Ravalomanana
88836b6071
PHRAS-2825 Add translation
2020-02-18 19:26:56 +04:00
Nicolas Maillat
89925048a3
Merge pull request #3348 from alchemy-fr/PHRAS-2911-gif-preview-video
...
PHRAS-2911 #comment The size of the gif subdefinition is set to 0 in the subdefinitions table and appears to be anamorphic: this issue is caused by a recent exiftool version update in 4.1
2020-02-18 16:26:29 +01:00
Nicolas Maillat
d460d1fd75
Merge branch 'master' into PHRAS-2911-gif-preview-video
2020-02-18 15:55:59 +01:00
Nicolas Maillat
759250b7e2
Merge pull request #3346 from alchemy-fr/PHRAS-2825_ass_reset_button
...
PHRAS-2825 #comment merge Prod Search : No result : center the reset button
2020-02-18 15:54:42 +01:00
Nicolas Maillat
2fb3da59be
Merge branch 'master' into PHRAS-2825_ass_reset_button
2020-02-18 15:39:25 +01:00
Nicolas Maillat
8d14df1830
Merge pull request #3331 from alchemy-fr/PHRAS-2913_create-tokens-faster_4.1
...
PHRAS-2913 #comment create publication tokens faster in 4.1
2020-02-18 15:39:01 +01:00
aynsix
ff002e75e7
update alchemy/mediavorus to 0.4.10
2020-02-18 17:25:20 +03:00
Nicolas Maillat
d7417177e4
Merge branch 'master' into PHRAS-2913_create-tokens-faster_4.1
2020-02-18 15:24:11 +01:00
Nicolas Maillat
e7f19af93c
Merge pull request #3333 from alchemy-fr/PHRAS-2901_tokens-add-index_4.1
...
PHRAS-2901 #comment tokens add missing index on token table 4.1
2020-02-18 15:22:12 +01:00
Nicolas Maillat
62ad96951d
Merge branch 'master' into PHRAS-2901_tokens-add-index_4.1
2020-02-18 15:01:48 +01:00
Nicolas Maillat
3640c134a1
Merge pull request #3324 from alchemy-fr/PHRAS-2812-hide-cterms-ckbox
...
PHRAS-2812 #comment merge 4.1 Hide "cterms" ckbox when not relevant
2020-02-18 15:01:16 +01:00
Nicolas Maillat
378daacabb
Merge branch 'master' into PHRAS-2901_tokens-add-index_4.1
2020-02-18 14:52:36 +01:00
Nicolas Maillat
08dfb81007
Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox
2020-02-18 14:27:56 +01:00
Harrys Ravalomanana
b5f1fd18f4
PHRAS-2779 #comment fix delete application on account #time 4h
2020-02-18 16:30:53 +04:00
Nicolas Maillat
f281bf022b
Merge pull request #3301 from alchemy-fr/PHRAS-2879_facet-order_4.1
...
PHRAS-2879 #comment Final fusion of the Define facets order in the query result, this PR also includes the PR #3321
2020-02-18 11:21:06 +01:00
Nicolas Maillat
8723fc3720
Merge branch 'master' into PHRAS-2879_facet-order_4.1
2020-02-18 10:23:12 +01:00
Nicolas Maillat
771ab538fa
Merge branch 'master' into PHRAS-2825_ass_reset_button
2020-02-18 10:15:51 +01:00
Nicolas Maillat
ff4a619afa
Merge pull request #3326 from alchemy-fr/PHRAS-2906-fix-for-job-and-activity-on-user-update
...
PHRAS-2906 #comment fix for job and activity on user update
2020-02-18 10:13:04 +01:00
Harrys Ravalomanana
f2b2092a12
PHRAS-2825 center the reset button
2020-02-18 11:59:31 +04:00
Jean-Yves Gaulier
722b1e3750
include Harrys's new templates
...
fix form restore
fix Version
2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
4f7be4c0a9
fix bad merge happened cause last rebase (?)
2020-02-17 20:17:08 +01:00
