6058 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
abhishek9686	cc003c8f73	trim double quotes from netmaker token	2024-09-06 06:43:51 +04:00
abhishek9686	f475abafec	trim double quotes from netmaker tag	2024-09-06 06:27:54 +04:00
abhishek9686	f467dda773	get token if exists already	2024-09-04 13:12:16 +05:30
abhishek9686	883902d91e	add pro arg	2024-09-04 12:55:40 +05:30
abhishek9686	b534c670b6	resolve merge conflicts	2024-09-04 12:42:43 +05:30
Abhishek K	9a748a5a55	Merge pull request #3100 from gravitl/master ... Master	2024-09-04 12:14:23 +05:30
Abhishek K	c684e815af	Merge pull request #3099 from gravitl/release-v0.25.0 ... Release v0.25.0	2024-09-04 12:13:47 +05:30
Abhishek K	bba47fb2f2	Merge pull request #3098 from gravitl/NET-1576 ... build login link from nm domain	2024-09-04 12:13:06 +05:30
abhishek9686	5066781566	build login link from nm domain	2024-09-04 12:12:28 +05:30
Sayan Mallick	a7b415d2fa	Merge pull request #3094 from gravitl/NET-1518 ... Updated Deploy and Test Branch to have a manual trigger	2024-09-03 12:59:28 +05:30
Sayan Mallick	1bb3492060	Updated Deploy and Test Branch to have a manual trigger	2024-09-02 19:27:59 +05:30
Abhishek K	b938dec644	Merge pull request #3093 from gravitl/NET-1518 ... Updated DeleteDroplet workflow to use new token	2024-09-02 17:16:40 +05:30
Sayan Mallick	021cebdd09	Updated DeleteDroplet workflow to use new token	2024-09-02 17:13:33 +05:30
Abhishek K	81ec688ee4	Merge pull request #3092 from gravitl/master ... Master	2024-09-02 17:12:24 +05:30
Abhishek K	954b146999	Merge pull request #3091 from gravitl/release-v0.25.0 ... Release v0.25.0	2024-09-02 17:11:39 +05:30
Abhishek K	0dcf68f154	Merge branch 'master' into release-v0.25.0	2024-09-02 17:11:30 +05:30
Abhishek K	148efabb2c	Merge pull request #3090 from gravitl/NET-1576 ... NET-1576: Use User Email as Primary ID for all Oauth logins	2024-09-02 16:39:13 +05:30
Abhishek K	7494888da9	Merge pull request #3089 from gravitl/NET-1518 ... Delete Droplet update	2024-09-02 15:05:22 +05:30
abhishek9686	c4bfae77df	increase log verbose	2024-09-02 14:15:04 +05:30
abhishek9686	8070f5e6e9	Merge branch 'release-v0.25.0' of https://github.com/gravitl/netmaker into NET-1576	2024-09-02 11:24:46 +05:30
abhishek9686	ed2a0a0a01	fix oidc invite flow	2024-09-02 10:57:10 +05:30
abhishek9686	ebce98448c	use github apis to fetch user email	2024-09-02 09:23:28 +05:30
Sayan Mallick	5ad21606f2	Delete Droplet update	2024-09-01 22:06:49 +05:30
Abhishek K	8308c2f40c	Merge pull request #3086 from gravitl/master ... Master	2024-08-29 16:16:27 +05:30
Max Ma	bbca20e463	NET-1565:fix extClient ip conflict issue (#3082) ... * fix extClient ip conflict issue * Update users.go --------- Co-authored-by: Abhishek K <abhishek@netmaker.io>	2024-08-28 18:58:07 +05:30
Abhishek K	4a7fbc7456	Merge pull request #3081 from gravitl/release-v0.25.0 ... v0.25.0	2024-08-28 18:53:16 +05:30
Aceix	19d7bb1ea2	fix: update yml references to json for v0.25.0 (#3083)	2024-08-28 18:52:59 +05:30
Abhishek K	c10859a466	v0.25.0 release notes (#3080) ... * release notes * Update release.md	2024-08-28 14:34:34 +05:30
Abhishek K	0463b17ea5	NET-1227: Add Additional Oauth Scopes to fetch user email (#3079) ... * add list roles to pro and ce * if not pro set user role to admin * validate update user * add separate validation check for password on update * remove validate check * fix github SSO with invite signup * add oauth scopes for user email * remove debug log * fix azure ad	2024-08-28 14:14:26 +05:30
Abhishek K	9ac78e15bc	NET-1227: Fix Singup Flow with Github SSO (#3078) ... * add list roles to pro and ce * if not pro set user role to admin * validate update user * add separate validation check for password on update * remove validate check * fix github SSO with invite signup	2024-08-27 17:07:21 +05:30
Abhishek K	0a1558d5ac	NET-1227: fix update password on update user handler (#3077) ... * add list roles to pro and ce * if not pro set user role to admin * validate update user * add separate validation check for password on update * remove validate check	2024-08-27 15:24:18 +05:30
Abhishek K	d532060c50	Net 1227 v2 (#3075) ... * add list roles to pro and ce * if not pro set user role to admin * validate update user * add separate validation check for password on update	2024-08-27 13:36:53 +05:30
Abhishek K	a4d528e267	Net 1227 v2 (#3074) ... * add list roles to pro and ce * if not pro set user role to admin * validate update user	2024-08-27 12:29:32 +05:30
Abhishek K	d95b96ad6e	Net 1227 v2 (#3073) ... * add list roles to pro and ce * if not pro set user role to admin	2024-08-27 12:14:57 +05:30
Abhishek K	a39da31fa6	add list roles to pro and ce (#3072)	2024-08-27 11:51:13 +05:30
abhishek9686	ece5951625	add pro arg to usage	2024-08-27 09:31:47 +05:30
abhishek9686	5bded324ef	add install log	2024-08-27 09:21:45 +05:30
abhishek9686	3e35dfcc9a	collect tenant id and license on pro install	2024-08-27 09:20:00 +05:30
abhishek9686	c6ebc004c6	collect tenant id and license on pro install	2024-08-27 09:19:16 +05:30
abhishek9686	f25ee0aab4	add flag to install pro	2024-08-27 08:53:37 +05:30
Abhishek K	936e1b4d45	Net 1227 v1 (#3066) ... * generalise smtp config * copy over smtp vars * env new line * fix master key api access * comment user tests * fix network and user invite for master key access * remove email sender type * user mgmt commands * check user role on CE * user role nmtcl cmds * user groups commands * fix role and groups command * fix user create cmd * add usage info * rm user role check * fix user update cmd * fix static check * add backwards comptability support for extclient api for mobile * rm debug logs * set frontend url from base domain if empty	2024-08-26 18:27:45 +05:30
abhishek9686	8af04309a9	Merge branch 'develop' of https://github.com/gravitl/netmaker into NET-1227-v1	2024-08-26 18:25:59 +05:30
abhishek9686	b3df74807b	set frontend url from base domain if empty	2024-08-26 18:25:42 +05:30
abhishek9686	a8db910fea	Merge branch 'NET-1227-v1' of https://github.com/gravitl/netmaker into NET-1227-v1	2024-08-26 17:39:17 +05:30
abhishek9686	6faeec2437	rm debug logs	2024-08-26 17:39:00 +05:30
Abhishek K	f18937f1e8	Net 1227 v1 (#3065) ... * generalise smtp config * copy over smtp vars * env new line * fix master key api access * comment user tests * fix network and user invite for master key access * remove email sender type * user mgmt commands * check user role on CE * user role nmtcl cmds * user groups commands * fix role and groups command * fix user create cmd * add usage info * rm user role check * fix user update cmd * fix static check * add backwards comptability support for extclient api for mobile	2024-08-26 14:44:18 +05:30
Abhishek K	959c15fb76	Merge branch 'develop' into NET-1227-v1	2024-08-26 14:42:28 +05:30
abhishek9686	c9e593038e	add backwards comptability support for extclient api for mobile	2024-08-26 14:41:18 +05:30
Abhishek K	5a4d0663da	NET-1227: User Cli cmds Update (#3064) ... * generalise smtp config * copy over smtp vars * env new line * fix master key api access * comment user tests * fix network and user invite for master key access * remove email sender type * user mgmt commands * check user role on CE * user role nmtcl cmds * user groups commands * fix role and groups command * fix user create cmd * add usage info * rm user role check * fix user update cmd * fix static check	2024-08-25 07:25:40 +05:30
abhishek9686	31d361e58d	fix static check	2024-08-25 07:23:03 +05:30