Merge branch 'feature/member_features' of github.com:solidtime-io/solidtime into feature/update_billable_rate

# Conflicts:
#	e2e/members.spec.ts
#	e2e/organization.spec.ts
This commit is contained in:
Gregor Vostrak
2024-07-01 17:15:08 +02:00
14 changed files with 283 additions and 82 deletions

View File

@@ -2,7 +2,6 @@
import AppLayout from '@/Layouts/AppLayout.vue';
import DeleteTeamForm from '@/Pages/Teams/Partials/DeleteTeamForm.vue';
import SectionBorder from '@/Components/SectionBorder.vue';
import TeamMemberManager from '@/Pages/Teams/Partials/TeamMemberManager.vue';
import UpdateTeamNameForm from '@/Pages/Teams/Partials/UpdateTeamNameForm.vue';
import type { Organization } from '@/types/models';
import type { Permissions, Role } from '@/types/jetstream';
@@ -33,13 +32,6 @@ defineProps<{
<OrganizationBillableRate
v-if="canUpdateOrganization()"
:team="team" />
<TeamMemberManager
class="mt-10 sm:mt-0"
:team="team"
:available-roles="availableRoles"
:user-permissions="permissions" />
<SectionBorder />
<ImportData