|  abhishek9686 | 773693568c
							
							resolve merge conflicts | 2 months ago | 
				
					
						|  Vishal Dalwadi | d5cc14ce49
							
							Patch: Okta IDP Integration (#3586) | 2 months ago | 
				
					
						|  Vishal Dalwadi | 99f1be4aba
							
							Merge branch 'develop' into NM-49 | 3 months ago | 
				
					
						|  Vishal Dalwadi | 0fea8af3e1
							
							Merge branch 'develop' into NM-37 | 3 months ago | 
				
					
						|  Vishal Dalwadi | 7965110ee1
							
							Merge branch 'develop' into NM-49 | 3 months ago | 
				
					
						|  Vishal Dalwadi | 31ed8c5262
							
							Netmaker Desktop Session Duration (#3543) | 3 months ago | 
				
					
						|  Vishal Dalwadi | 8b23e9d6ae
							
							feat(go): add support for okta oauth; | 3 months ago | 
				
					
						|  Vishal Dalwadi | eb40471a6f
							
							feat(go): add support for user settings; | 3 months ago | 
				
					
						|  Vishal Dalwadi | 3551e8e24e
							
							NET-1996: Add Support for TOTP Authentication. (#3517) | 4 months ago | 
				
					
						|  Aceix | 2df02f747e
							
							Merge pull request #3504 from gravitl/depracate-rac-autodisable | 4 months ago | 
				
					
						|  Abhishek K | 810ff21165
							
							NET-2014: add audit log retention period, add timestamp for events (#3486) | 4 months ago | 
				
					
						|  Vishal Dalwadi | 614cf77b5a
							
							NET-1991: Add IDP sync functionality. (#3428) | 5 months ago | 
				
					
						|  Abhishek K | 309e4795a1
							
							NET-1950: Persist Server Settings in the DB (#3419) | 6 months ago |