Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add region and public ip to peer table and detailed peer view #340

Merged
merged 53 commits into from
Feb 23, 2024

Conversation

heisbrot
Copy link
Contributor

No description provided.

heisbrot and others added 30 commits January 29, 2024 17:24
# Conflicts:
#	package-lock.json
#	package.json
#	src/app/(dashboard)/access-control/page.tsx
#	src/app/(dashboard)/peer/page.tsx
#	src/app/(dashboard)/team/user/page.tsx
#	src/components/PeerSelector.tsx
#	src/components/SquareIcon.tsx
#	src/components/ToggleSwitch.tsx
#	src/components/VerticalTabs.tsx
#	src/components/modal/Modal.tsx
#	src/components/modal/ModalHeader.tsx
#	src/components/select/SelectDropdown.tsx
#	src/components/ui/UserAvatar.tsx
#	src/contexts/PoliciesProvider.tsx
#	src/hooks/useOperatingSystem.ts
#	src/interfaces/AccessToken.ts
#	src/interfaces/ActivityEvent.ts
#	src/interfaces/Peer.ts
#	src/interfaces/Policy.ts
#	src/interfaces/User.ts
#	src/interfaces/Version.ts
#	src/layouts/Navigation.tsx
#	src/modules/activity/ActivityDescription.tsx
#	src/modules/activity/ActivityEntryRow.tsx
#	src/modules/activity/ActivityUserSelector.tsx
#	src/modules/dns-nameservers/NameserverModal.tsx
#	src/modules/groups/useGroupHelper.tsx
#	src/modules/peers/PeerOSCell.tsx
#	src/modules/routes/RouteModal.tsx
#	src/modules/routes/RouteUpdateModal.tsx
#	src/modules/setup-keys/SetupKeyModal.tsx
#	src/modules/users/ServiceUsersTable.tsx
#	src/modules/users/UserInviteModal.tsx
#	src/modules/users/UsersTable.tsx
#	src/modules/users/table-cells/ServiceUserNameCell.tsx
#	src/modules/users/table-cells/UserActionCell.tsx
#	src/modules/users/table-cells/UserBlockCell.tsx
#	src/modules/users/table-cells/UserNameCell.tsx
#	src/utils/api.tsx
@heisbrot heisbrot merged commit f74f9cf into main Feb 23, 2024
3 checks passed
@heisbrot heisbrot deleted the feature/peer-region branch February 23, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants