7780 Commits

Author	SHA1	Message	Date
Nicolas Maillat	a89f170241	Merge branch 'master' into PHRAS-2979-41-fix-right-access	2020-03-18 10:27:58 +01:00
Nicolas Maillat	9a3d4600b9	Merge branch 'master' into PHRAS-2741-worker-service-part1	2020-03-18 00:37:29 +01:00
Nicolas Maillat	5fdcc9eb86	Merge branch 'master' into PHRAS-2979-41-fix-right-access	2020-03-18 00:01:54 +01:00
Harrys Ravalomanana	a1deb3c28f	PHRAS-2978 fix date format	2020-03-17 18:35:36 +04:00
Harrys Ravalomanana	eddc47301c	merge of master	2020-03-17 15:44:16 +04:00
Harrys Ravalomanana	fbc4e01ef3	PHRAS-2978 #comment update feedback expiration date #time 6h	2020-03-17 15:34:24 +04:00
Nicolas Maillat	d118347880	Merge branch 'master' into PHRAS-2981-builder-for-dev	2020-03-16 18:26:28 +01:00
Nicolas Maillat	be5b67d7e2	Merge branch 'master' into PHRAS-2741-worker-service-part1	2020-03-16 15:42:48 +01:00
Arthur de Moulins	6ed22b53dc	fix AddPluginTest	2020-03-13 19:51:10 +01:00
Arthur de Moulins	23d757c4d6	plugin installation in docker	2020-03-13 15:53:15 +01:00
Harrys Ravalomanana	947bc734ac	PHRAS-2978 #comment fix date format and add datepicker fo modify feedback validation deadline #time 4h	2020-03-13 17:14:37 +04:00
aynsix	597216429a	fix right access and right on story elements per user	2020-03-12 16:16:41 +03:00
Harrys Ravalomanana	c4d33f5f55	PHRAS-2978 #comment Workzone basket: fix date format and tooltip display	2020-03-11 16:59:44 +04:00
aynsix	cd42452db8	migration patch for facets	2020-03-10 10:49:53 +03:00
aynsix	38afc8dd43	change version to 4.1.0-alpha.24a	2020-03-09 17:58:20 +03:00
aynsix	7a72485b33	use 4.1.0-alpha.25a	2020-03-06 14:08:29 +03:00
aynsix	bccf38cbf6	change column size	2020-03-06 11:47:01 +03:00
Nicolas Maillat	87928440a6	Merge branch 'master' into PHRAS-2927_optimize-feedback-process_4.1	2020-03-04 14:00:17 +01:00
aynsix	87d6ea0eb3	fix wording	2020-03-04 10:58:43 +03:00
Nicolas Maillat	b83e5500f0	Merge branch 'master' into PHRAS-1648-user-password	2020-03-03 17:19:37 +01: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	938b052707	Merge branch 'master' into PHRAS-2741-worker-service-part1	2020-03-02 20:15:32 +01:00
aynsix	dcc28d5194	change template mail and add option	2020-03-02 14:05:30 +03:00
aynsix	64d989f0f9	remove application list in user list	2020-03-02 11:04:16 +03:00
Nicolas Maillat	7bb764ccf5	Merge branch 'master' into PHRAS-1648-user-password	2020-02-28 22:11:32 +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	a1067aac82	Merge branch 'master' into PHRAS-1631-collection-unpublish	2020-02-28 18:20:36 +01:00
Nicolas Maillat	cb7fc7cb1f	Merge branch 'master' into PHRAS-1628-collection-publish	2020-02-28 17:38:57 +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
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
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
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