1956 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Cam	4bfcda5898	fix build error	2024-02-21 10:54:38 -06:00
Cam	f3ee9e2e26	Merge branch 'main' of github.com:openziti/zrok into disable-user	2024-02-21 09:38:51 -06:00
Cam	12eebb7b51	fix version for sql script	2024-02-21 09:38:22 -06:00
Michael Quigley	c9a9b27359	Merge pull request #568 from openziti/reset_to_regenerate ... reset token -> regenerate token (#191)	2024-02-20 11:59:47 -05:00
Michael Quigley	a7194aecf6	reset -> regenerate (#191)	2024-02-20 11:40:11 -05:00
Cam	8f445c1eae	update changelog	2024-02-20 09:52:23 -06:00
Cam	d3429e2a6a	added disabled flag to account	2024-02-19 10:37:09 -06:00
Michael Quigley	778e50c056	Merge pull request #546 from openziti/self-service-password ... Password change feature (#148) Refactoring and fortification of token regeneration (#191)	2024-02-16 16:41:39 -05:00
Michael Quigley	471cc4909c	logging (#191)	2024-02-16 16:35:42 -05:00
Michael Quigley	36067f5e91	a better, simpler user interface for token regeneration (#191)	2024-02-16 16:32:51 -05:00
Michael Quigley	9949a55c1f	ui refactoring for change password (#148)	2024-02-16 15:19:32 -05:00
Michael Quigley	fa91d091bb	changelog (#148)	2024-02-16 14:31:41 -05:00
Michael Quigley	29cba30154	changelog (#148)	2024-02-16 12:22:00 -05:00
Michael Quigley	56ed13d96a	Merge branch 'main' into self-service-password	2024-02-16 12:20:13 -05:00
Michael Quigley	fb66f6e628	Merge pull request #559 from openziti/oauth-email-change ... OAuth email address matching changes (#413)	2024-02-16 12:19:25 -05:00
Michael Quigley	6023ca7c5b	refactor email patterns field in share request in python sdk (#413)	2024-02-16 11:57:41 -05:00
Michael Quigley	0c38ab0f43	improvements to public proxy glob implementation (#413)	2024-02-16 11:54:06 -05:00
Michael Quigley	fdc6b72c23	changelog (#413)	2024-02-16 11:27:32 -05:00
Michael Quigley	e2ac7a8bce	Merge branch 'main' into oauth-email-change	2024-02-16 11:23:18 -05:00
Michael Quigley	3cfdcd899a	user interface tweaks (#148)	2024-02-16 11:21:13 -05:00
Cam	2daed61849	update actions tab to include new way to surface password change	2024-02-15 14:47:38 -06:00
Cam	338b5a0936	Merge branch 'main' of github.com:openziti/zrok into self-service-password	2024-02-15 14:46:43 -06:00
Michael Quigley	61101bddf7	Merge pull request #542 from openziti/password-reset-fix ... Fix for multiple password reset requests per account (#452)	2024-02-15 14:41:35 -05:00
Michael Quigley	a5e6f51f2f	Merge branch 'main' into password-reset-fix	2024-02-15 14:23:08 -05:00
Michael Quigley	48d3424a77	Merge pull request #566 from openziti/token-revocation ... Regenerate Account Token (#191)	2024-02-15 14:15:00 -05:00
Michael Quigley	28d3002207	fix for reserved unique name collision checking	2024-02-15 14:08:28 -05:00
Michael Quigley	73340f0f6f	refactor and cleanup token regeneration ui (#191)	2024-02-15 13:58:36 -05:00
Michael Quigley	4437d44553	changelog (#191)	2024-02-15 13:10:44 -05:00
Michael Quigley	8aaec6e882	Merge branch 'main' into token-revocation	2024-02-15 13:07:57 -05:00
Cam	53fd2e349e	Merge branch 'main' of github.com:openziti/zrok into oauth-email-change	2024-02-15 01:03:00 -06:00
Cam	8225b1bb28	revert one name change	2024-02-15 01:02:08 -06:00
Cam	1eac1ad941	removed some deletes after token resetting	2024-02-15 01:00:05 -06:00
Michael Quigley	8cc0ca0215	changelog	2024-02-14 15:05:32 -05:00
Michael Quigley	6966596dab	Merge pull request #548 from openziti/reserve-ui-fixes ... Small reserver ui/ux fixes (#443, #531)	2024-02-14 14:58:24 -05:00
Cam	fe9152c451	Merge branch 'main' of github.com:openziti/zrok into token-revocation	2024-02-14 13:53:16 -06:00
Cam	8555439410	update migration number from merge	2024-02-14 13:51:32 -06:00
Cam	e764103a68	fix up js linting	2024-02-14 13:49:31 -06:00
Cam	811981d671	Merge branch 'main' of github.com:openziti/zrok into oauth-email-change	2024-02-14 13:44:17 -06:00
Cam	df51d9baba	Merge branch 'main' of github.com:openziti/zrok into reserve-ui-fixes	2024-02-14 13:43:38 -06:00
Cam	adfc6e3a07	Merge branch 'main' of github.com:openziti/zrok into self-service-password	2024-02-14 13:43:08 -06:00
Cam	ec21146b4e	Merge branch 'main' of github.com:openziti/zrok into password-reset-fix	2024-02-14 13:42:33 -06:00
Cam	28f6b9f57b	updated email domains to email address patterns	2024-02-14 13:38:19 -06:00
Cam	3fafb55035	update changelog	2024-02-14 13:21:50 -06:00
Cam	6099b3cf44	add changelog	2024-02-14 13:20:41 -06:00
Cam	b6d42de92f	added security key to password changing	2024-02-14 13:18:22 -06:00
Cam	d57d72387f	few small fixes	2024-02-14 13:06:04 -06:00
Michael Quigley	4dafe4a963	Merge pull request #564 from chenrui333/normal-lf-encoding ... chore: normalize encoding for the text files	2024-02-12 16:03:54 -05:00
Rui Chen	f928615bcf	feat: add .gitattributes to enforce lf line encoding ... Signed-off-by: Rui Chen <rui@chenrui.dev>	2024-02-12 21:04:33 +01:00
Rui Chen	ed7f19dc9c	chore: normalize encoding for the text files ... Signed-off-by: Rui Chen <rui@chenrui.dev>	2024-02-12 21:00:52 +01:00
Kenneth Bingham	e28b8df947	Merge pull request #560 from MichaelDavidGK/patch-1 ... Fix windows instruction	2024-02-12 12:59:12 -05:00