Nicolas Maillat
|
b2e529acb7
|
Merge branch 'master' into docker-compose-merge
|
2020-02-28 20:41:31 +01:00 |
|
Nicolas Maillat
|
d83407b80b
|
Merge pull request #3360 from alchemy-fr/PHRAS-1631-collection-unpublish
PHRAS-1631 #comment merge bin/console collection:unpublish
|
2020-02-28 18:39:43 +01:00 |
|
Nicolas Maillat
|
fb937acc97
|
Merge branch 'master' into docker-compose-merge
|
2020-02-28 18:36:10 +01:00 |
|
Nicolas Maillat
|
a1067aac82
|
Merge branch 'master' into PHRAS-1631-collection-unpublish
|
2020-02-28 18:20:36 +01:00 |
|
Nicolas Maillat
|
ba9fe3309a
|
Merge pull request #3359 from alchemy-fr/PHRAS-1628-collection-publish
PHRAS-1628 #comment merge bin/console collection:publish
|
2020-02-28 18:14:38 +01:00 |
|
Arthur de Moulins
|
1b108352b3
|
add worker run
|
2020-02-28 18:01:07 +01:00 |
|
Arthur de Moulins
|
34ceffdae0
|
add doc for xdebug for macos,
fix worker cmd
|
2020-02-28 17:56:52 +01:00 |
|
Nicolas Maillat
|
cb7fc7cb1f
|
Merge branch 'master' into PHRAS-1628-collection-publish
|
2020-02-28 17:38:57 +01:00 |
|
Nicolas Maillat
|
b170d731e5
|
Merge pull request #3357 from alchemy-fr/PHRAS-1630-databox-unmount
PHRAS-1630 #comment merge bin/console databox:unmount
|
2020-02-28 17:38:26 +01:00 |
|
Arthur de Moulins
|
090ff844e3
|
use custom volumes in docker-compose.override
|
2020-02-28 17:00:31 +01:00 |
|
Nicolas Maillat
|
3d194ce8bc
|
Merge branch 'master' into PHRAS-1630-databox-unmount
|
2020-02-28 16:42:24 +01:00 |
|
Nicolas Maillat
|
b8304b1cfd
|
Merge pull request #3356 from alchemy-fr/PHRAS-1626-databox-mount
PHRAS-1626 #comment merge bin/console databox:mount mount an existing databox
|
2020-02-28 16:08:17 +01:00 |
|
Arthur de Moulins
|
4a634070d1
|
optimize docker build
|
2020-02-28 15:56:16 +01:00 |
|
Arthur de Moulins
|
4cfc712674
|
arrange entrypoints and commands for docker
|
2020-02-28 15:56:16 +01:00 |
|
Arthur de Moulins
|
056feff7b7
|
remove COMPOSE_PROJECT_NAME in order to use folder name
|
2020-02-28 15:56:16 +01:00 |
|
Arthur de Moulins
|
b605f53564
|
also add config volume to override
|
2020-02-28 15:56:16 +01:00 |
|
Nicolas Maillat
|
515e5ae682
|
Add config volume
In deployment mode, add config_vol.
Config_vol is shared by Phraseanet and Worker container.
|
2020-02-28 15:56:16 +01:00 |
|
Arthur de Moulins
|
7adefbc1d4
|
override volumes for dev
|
2020-02-28 15:56:16 +01:00 |
|
Arthur de Moulins
|
d41268ea66
|
arrange volumes
|
2020-02-28 15:56:16 +01:00 |
|
Arthur de Moulins
|
08384d2fff
|
fix nginx image build
|
2020-02-28 15:56:11 +01:00 |
|
aynsix
|
1c081ea25c
|
fix confirmation message
|
2020-02-28 16:54:49 +03:00 |
|
aynsix
|
0e116ca07f
|
change argument login to user ID
|
2020-02-28 16:30:44 +03:00 |
|
Nicolas Maillat
|
2d537cfbbd
|
Merge branch 'master' into PHRAS-1631-collection-unpublish
|
2020-02-28 13:06:26 +01:00 |
|
Nicolas Maillat
|
35002dac26
|
Merge branch 'master' into PHRAS-1628-collection-publish
|
2020-02-28 11:50:28 +01:00 |
|
Nicolas Maillat
|
0c0d068aa8
|
Merge branch 'master' into PHRAS-1626-databox-mount
|
2020-02-28 11:49:19 +01:00 |
|
Nicolas Maillat
|
993df9c1c9
|
Merge branch 'master' into PHRAS-1630-databox-unmount
|
2020-02-28 11:48:40 +01:00 |
|
Arthur de Moulins
|
924b7d1b8e
|
merge phraseanet-docker repo to this one
|
2020-02-28 09:41:58 +01:00 |
|
Nicolas Maillat
|
f80506f55e
|
Merge pull request #3379 from alchemy-fr/PHRAS-2954_Prod_user_pref_Language_selection_port_41
PHRAS-2954 #comment merge Prod - user pref - port to 4.1 language selection
|
2020-02-27 15:16:38 +01:00 |
|
Harrys Ravalomanana
|
0857619aec
|
merge master
|
2020-02-27 18:05:40 +04:00 |
|
Harrys Ravalomanana
|
2bb7074b1d
|
PHRAS-2954 Add translation
|
2020-02-27 18:03:14 +04:00 |
|
Nicolas Maillat
|
672ff12146
|
Merge branch 'master' into PHRAS-2954_Prod_user_pref_Language_selection_port_41
|
2020-02-27 14:32:54 +01:00 |
|
Harrys Ravalomanana
|
ce2fee87ea
|
PHRAS-2954 #comment Port 4.1 language selection #time 1h
|
2020-02-27 16:01:08 +04:00 |
|
Nicolas Maillat
|
feba890076
|
Merge pull request #3378 from alchemy-fr/PHRAS-2950_Prod_facets_tooltips
PHRAS-2950 #comment Prod - facets - tooltips improvement, hits formatting and explanation string
|
2020-02-27 11:15:59 +01:00 |
|
Nicolas Maillat
|
c964ce43c0
|
Merge branch 'master' into PHRAS-2950_Prod_facets_tooltips
|
2020-02-27 10:50:45 +01:00 |
|
Nicolas Maillat
|
f06d0a2641
|
Merge pull request #3366 from 4rthem/doctrine-metadata-cache
PHRAS-2953 #comment merge add doctrine metadata filesystem cache
|
2020-02-27 10:50:24 +01:00 |
|
Nicolas Maillat
|
8de64ce10a
|
Merge branch 'master' into doctrine-metadata-cache
|
2020-02-27 10:09:05 +01:00 |
|
Nicolas Maillat
|
86659ffc10
|
Merge branch 'master' into PHRAS-2950_Prod_facets_tooltips
|
2020-02-27 09:25:45 +01:00 |
|
Harrys Ravalomanana
|
632c1cd592
|
PHRAS-2950 add yarn.lock
|
2020-02-27 11:36:11 +04:00 |
|
Harrys Ravalomanana
|
e283c9d380
|
PHRAS-2950 Add format number of facets number
|
2020-02-27 11:32:08 +04:00 |
|
Nicolas Maillat
|
a74d7b8bf0
|
Merge pull request #3377 from alchemy-fr/PHRAS-2941-user-list-model-option
PHRAS-2941 #comment merge 4.1 bin/console user:list --models
|
2020-02-26 19:15:10 +01:00 |
|
Harrys Ravalomanana
|
63367346b5
|
PHRAS-2950 #comment Add: facet tooltips #time 3h
|
2020-02-26 17:57:57 +04:00 |
|
aynsix
|
20426bde4a
|
model to models
|
2020-02-26 15:37:05 +03:00 |
|
aynsix
|
2e21bc0448
|
add model option in user:list
|
2020-02-26 12:37:05 +03:00 |
|
Nicolas Maillat
|
999b311d12
|
Merge pull request #3375 from alchemy-fr/PHRAS-2638_Remove_bridge_reference_in_account
PHRAS-2638 #comment Remove Bridge reference in /account
|
2020-02-25 16:46:52 +01:00 |
|
Nicolas Maillat
|
9916889263
|
Merge branch 'master' into PHRAS-2638_Remove_bridge_reference_in_account
|
2020-02-25 14:50:45 +01:00 |
|
Nicolas Maillat
|
7a75e5644a
|
Merge pull request #3376 from alchemy-fr/PHRAS-2935_Fix_About_modal_responsive
PHRAS-2935 #comment merge of Prod admin report in responsive About is always old design
|
2020-02-25 14:50:20 +01:00 |
|
Harrys Ravalomanana
|
a3014b4680
|
PHRAS-2935 #comment Fix About popup on responsive #time 1h
|
2020-02-25 17:16:13 +04:00 |
|
Harrys Ravalomanana
|
3b72c99832
|
PHRAS-2638 #comment Remove eventsmanager_notify_bridgeuploadfail #time 2h
|
2020-02-25 17:02:32 +04:00 |
|
Nicolas Maillat
|
3ab7e54db2
|
Merge pull request #3374 from alchemy-fr/PHRAS-2945_Prod_editing_set_default_value_for_editing_top_box
Prod-editing #comment merge Fix default height/min-height for editing_top_box
|
2020-02-25 12:38:46 +01:00 |
|
Harrys Ravalomanana
|
c9871eb570
|
PHRAS-2945 #comment Prod-editing : Fix default height/min-height for editing_top_box #time 2h
|
2020-02-25 14:38:45 +04:00 |
|