aynsix
|
87d6ea0eb3
|
fix wording
|
2020-03-04 10:58:43 +03:00 |
|
Nicolas Maillat
|
7ad05c7d17
|
Merge branch 'master' into docker-compose-merge
|
2020-03-03 22:39:09 +01:00 |
|
Nicolas Maillat
|
b83e5500f0
|
Merge branch 'master' into PHRAS-1648-user-password
|
2020-03-03 17:19:37 +01:00 |
|
Nicolas Maillat
|
6efbbc3661
|
Merge pull request #3384 from alchemy-fr/PHRAS-2956_Fix_Account-developpers-application
PHRAS-2956 #comment merge Account - developers - application - GUI create a desktop application
|
2020-03-03 15:31:02 +01:00 |
|
Nicolas Maillat
|
63744b7a3b
|
Merge branch 'master' into PHRAS-2956_Fix_Account-developpers-application
|
2020-03-03 15:07:52 +01:00 |
|
Nicolas Maillat
|
37f5da6511
|
Merge pull request #3388 from alchemy-fr/PHRAS-1632-fix-user-application
PHRAS-1632 #comment merge 4.1 user:application , add client_secret on return
|
2020-03-03 15:07:31 +01:00 |
|
Harrys Ravalomanana
|
1411a013f1
|
Merge branch 'master' into PHRAS-2956_Fix_Account-developpers-application
|
2020-03-03 18:06:13 +04:00 |
|
Harrys Ravalomanana
|
baed57ba21
|
upgrade phraseanet-production-client
|
2020-03-03 18:04:25 +04:00 |
|
Harrys Ravalomanana
|
fd5685f775
|
PHRAS-2956
|
2020-03-03 17:35:11 +04:00 |
|
aynsix
|
495c9ec296
|
add client_secret on return
|
2020-03-03 12:23:19 +03:00 |
|
aynsix
|
8acd7576d0
|
Merge branch 'PHRAS-1648-user-password' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1648-user-password
|
2020-03-03 12:13:32 +03:00 |
|
aynsix
|
354b1b8e6e
|
fix return
|
2020-03-03 12:12:44 +03:00 |
|
aynsix
|
bb356e206f
|
fix mail link and returned hash
|
2020-03-03 11:41:15 +03:00 |
|
Nicolas Maillat
|
b84b769de0
|
Merge branch 'master' into PHRAS-1648-user-password
|
2020-03-03 09:41:12 +01:00 |
|
Nicolas Maillat
|
d387a12049
|
Merge pull request #3386 from alchemy-fr/PHRAS-1661-user-list-remove-application
PHRAS-1661#comment remove application list in bin/console user:list
|
2020-03-02 22:57:57 +01:00 |
|
Nicolas Maillat
|
1bfd5b6de0
|
Update readme
|
2020-03-02 21:59:11 +01:00 |
|
Nicolas Maillat
|
36219a10d4
|
Add Tmp dir for override
|
2020-03-02 21:15:06 +01:00 |
|
Nicolas Maillat
|
b9fa580a12
|
Add tmp volume for override
|
2020-03-02 21:12:09 +01:00 |
|
Nicolas Maillat
|
8e371c3192
|
Merge branch 'master' into docker-compose-merge
|
2020-03-02 20:28:10 +01:00 |
|
Nicolas Maillat
|
938b052707
|
Merge branch 'master' into PHRAS-2741-worker-service-part1
|
2020-03-02 20:15:32 +01:00 |
|
aynsix
|
b5f6b5db9d
|
Merge branch 'PHRAS-1648-user-password' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1648-user-password
|
2020-03-02 14:06:32 +03:00 |
|
aynsix
|
dcc28d5194
|
change template mail and add option
|
2020-03-02 14:05:30 +03:00 |
|
Nicolas Maillat
|
6aa794d89a
|
Merge branch 'master' into PHRAS-1648-user-password
|
2020-03-02 09:47:48 +01:00 |
|
aynsix
|
64d989f0f9
|
remove application list in user list
|
2020-03-02 11:04:16 +03:00 |
|
Nicolas Maillat
|
554d8b2f40
|
Merge pull request #3382 from alchemy-fr/PHRAS-2938_Prod_facet_filter_Revert-bis
PHRAS-2938 # comment merge Phraseanet side
|
2020-02-28 22:52:50 +01:00 |
|
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 |
|