Nicolas Maillat
|
516125a682
|
Merge branch 'master' into PHRAS-2938_Prod_facet_filter_Revert-bis
|
2020-02-28 22:51:01 +01:00 |
|
Nicolas Maillat
|
730c08d924
|
Merge branch 'master' into PHRAS-2956_Fix_Account-developpers-application
|
2020-02-28 22:27:35 +01:00 |
|
Nicolas Maillat
|
7bb764ccf5
|
Merge branch 'master' into PHRAS-1648-user-password
|
2020-02-28 22:11:32 +01:00 |
|
Nicolas Maillat
|
0a65cfcc8c
|
Merge pull request #3381 from alchemy-fr/PHRAS-2951-application-edit
PHRAS-2951 #comment merge 4.1 bin/console user:applications
|
2020-02-28 22:09:30 +01:00 |
|
Nicolas Maillat
|
b2e529acb7
|
Merge branch 'master' into docker-compose-merge
|
2020-02-28 20:41:31 +01:00 |
|
Nicolas Maillat
|
f3e97aaec3
|
update help
|
2020-02-28 19:14:46 +01:00 |
|
Nicolas Maillat
|
9625258530
|
Merge branch 'master' into PHRAS-2951-application-edit
|
2020-02-28 18:43:56 +01:00 |
|
Nicolas Maillat
|
1d152b9704
|
Merge branch 'master' into PHRAS-1648-user-password
|
2020-02-28 18:42:45 +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
|
27e8cdd9d2
|
update cmd help
|
2020-02-28 16:52:26 +01:00 |
|
Nicolas Maillat
|
3d194ce8bc
|
Merge branch 'master' into PHRAS-1630-databox-unmount
|
2020-02-28 16:42:24 +01:00 |
|
aynsix
|
93f45af815
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1648-user-password
|
2020-02-28 18:31:45 +03:00 |
|
aynsix
|
3d4d3aed36
|
update command user:password
|
2020-02-28 18:31:29 +03: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 |
|
aynsix
|
d3b4d78b72
|
change activate_password to password_oauth2_gt
|
2020-02-28 16:06:58 +03:00 |
|
Harrys Ravalomanana
|
d4465e2a55
|
PHRAS-2956 #comment fix account-developpers-application #time 3h
|
2020-02-28 16:36:33 +04:00 |
|
Nicolas Maillat
|
d2a899ab4f
|
change in help
|
2020-02-28 13:31:36 +01:00 |
|
Nicolas Maillat
|
2d537cfbbd
|
Merge branch 'master' into PHRAS-1631-collection-unpublish
|
2020-02-28 13:06:26 +01:00 |
|
aynsix
|
05b31a5881
|
confirmation on delete
|
2020-02-28 15:00:34 +03: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 |
|
aynsix
|
a99c23c59e
|
fix command
|
2020-02-28 12:30:56 +03:00 |
|
Arthur de Moulins
|
924b7d1b8e
|
merge phraseanet-docker repo to this one
|
2020-02-28 09:41:58 +01:00 |
|
Nicolas Maillat
|
52c5e5052f
|
update cmd help
|
2020-02-27 17:15:07 +01:00 |
|
aynsix
|
c1c69670b2
|
change command to user:applications
|
2020-02-27 18:29:56 +03:00 |
|
Nicolas Maillat
|
45ab79f506
|
Change in application help
|
2020-02-27 16:09:09 +01:00 |
|
Harrys Ravalomanana
|
f07c1acc52
|
PHRAS-2938
|
2020-02-27 18:58:19 +04:00 |
|
aynsix
|
44ef7891bb
|
add command application:app to create edit delete and list application in phraseanet
|
2020-02-27 17:51:57 +03: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 |
|