110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ggmaleva	410e27441e	fix review	2021-04-19 18:02:13 +03:00
ggmaleva	6155882f39	bump tomcat core	2021-04-19 17:35:18 +03:00
ggmaleva	c946d65778	bump tomcat core	2021-04-19 16:48:45 +03:00
ggmaleva	7317b9592b	add logs	2021-04-19 15:59:09 +03:00
Gregory	e8ca700bd7	Merge pull request #33 from rbkmoney/ft/JD-251 ... deactivate role while remove role and fix get member list query	2021-04-16 17:10:29 +03:00
ggmaleva	c371bb2749	fix after review	2021-04-16 16:54:20 +03:00
ggmaleva	b08571ac2c	deactivate role while remove role and fix get member list query	2021-04-16 16:09:29 +03:00
Gregory	c97a7d3515	Merge pull request #32 from rbkmoney/fix/activate_role ... add default true for active flag in role while create invitation	2021-04-13 16:16:53 +03:00
ggmaleva	d2037b3ed1	fix tests	2021-04-13 15:14:33 +03:00
ggmaleva	b4caa6c2d3	add default true for active flag in role while create invitation	2021-04-13 15:02:14 +03:00
Gregory	bb3b646e3d	Merge pull request #31 from rbkmoney/ft/JD-241 ... add active flag to member role	2021-04-13 10:59:31 +03:00
ggmaleva	ff97af978c	fix after review add dto	2021-04-12 22:41:18 +03:00
ggmaleva	795e14369e	fix after review	2021-04-12 22:37:38 +03:00
ggmaleva	f75d7d6f89	fix after review	2021-04-12 13:50:51 +03:00
ggmaleva	6c7068a998	refactoring	2021-04-12 10:32:12 +03:00
ggmaleva	a5baa6da56	add active flag to member role	2021-04-09 19:19:46 +03:00
Gregory	d4114e9341	Merge pull request #30 from rbkmoney/ft/JD-236 ... Fix delete role and get member methods	2021-04-08 17:59:48 +03:00
ggmaleva	d0433cf75f	remove redundant transactional annotation	2021-04-08 16:38:15 +03:00
ggmaleva	5c3a4b7fd0	fix mapper	2021-04-08 16:22:34 +03:00
ggmaleva	3d21995d1e	fix delete role and get member methods	2021-04-08 15:59:08 +03:00
ggmaleva	78fe85db5a	add null ignore property for jackson	2021-04-07 16:18:51 +03:00
Gregory	d4ab0741f4	Merge pull request #29 from rbkmoney/ft/JD-217 ... Ft/jd 217	2021-04-06 12:04:11 +03:00
ggmaleva	36fa26c8de	fix adding new member with correct roles from invitation	2021-04-05 21:36:55 +03:00
ggmaleva	7da5487cd0	Fix expel org member method, remove member role with member + refactoring test + migrate to junit5	2021-04-05 18:56:09 +03:00
ggmaleva	04337decc0	refactoring test	2021-04-02 14:11:35 +03:00
ggmaleva	95ad91fcf6	fix empty scope should be null	2021-04-02 13:42:09 +03:00
Gregory	da6dbbce6d	Merge pull request #28 from rbkmoney/ft/JD-190 ... Update swag api for member role and refactoring tests	2021-04-02 11:23:46 +03:00
ggmaleva	1481f663b3	change cascade type for entity	2021-04-02 11:04:35 +03:00
ggmaleva	3162dc8544	add param in log	2021-04-01 15:15:01 +03:00
ggmaleva	42e3a2d89c	fix log and test refactoring	2021-03-31 22:27:04 +03:00
ggmaleva	cda6dd3ea6	Update swag api for member role and refactoring tests	2021-03-31 22:14:11 +03:00
Gregory	f786c7f825	Merge pull request #27 from rbkmoney/fix/JD-178 ... Fix convert null scope from entity	2021-03-30 17:21:54 +03:00
ggmaleva	c121c8ea0a	Merge branch 'master' into fix/JD-178	2021-03-30 16:56:30 +03:00
ggmaleva	dee73d5c07	fix convert null scope in member role entity	2021-03-30 16:55:51 +03:00
Gregory	9b050b2b48	Merge pull request #26 from rbkmoney/fix/flyway_init ... revert init script	2021-03-30 12:21:35 +03:00
ggmaleva	dd8991d759	revert init script	2021-03-30 11:25:14 +03:00
Gregory	93eaed8254	Merge pull request #25 from rbkmoney/ft/JD-178 ... Fix org-manager issues	2021-03-29 13:03:04 +03:00
ggmaleva	a93f4d1402	fix code format	2021-03-29 11:31:47 +03:00
ggmaleva	ba47968734	add flyway script	2021-03-29 11:20:46 +03:00
ggmaleva	593f4fd00d	Fix null field in member role	2021-03-26 19:20:37 +03:00
ggmaleva	6a9cd975ff	Add member role without scope while create invitation	2021-03-26 15:48:21 +03:00
ggmaleva	79b74e2471	add owner filer on listOrgMembership	2021-03-26 15:31:19 +03:00
Gregory	8f0a6fa5da	Merge pull request #24 from rbkmoney/ft/JD-143 ... Add userId in list membership method + refactoring tests	2021-03-24 11:07:09 +03:00
ggmaleva	284d8b5f8c	remove redundant dto	2021-03-24 09:38:57 +03:00
ggmaleva	05d978fb44	refactoring	2021-03-22 18:21:49 +03:00
ggmaleva	631fa26993	add userId in list membership method + refactoring tests	2021-03-22 17:53:36 +03:00
Gregory	09cf25e24f	Merge pull request #23 from rbkmoney/ft/JAVA-114 ... Add checking invitation rights in orgs controller	2021-03-10 17:59:12 +03:00
ggmaleva	5b5d4919ac	update bouncer proto + add invitation id in context	2021-03-10 17:26:55 +03:00
ggmaleva	57cae09d82	Merge branch 'master' into ft/JAVA-114	2021-03-10 16:43:29 +03:00
Gregory	d1e75914c0	Merge pull request #22 from rbkmoney/ft/JAVA-103 ... add checking rights in rest methods in user controller	2021-03-10 16:31:38 +03:00