Skip to content

Commit

Permalink
Renaming owner role name to admin (#2125)
Browse files Browse the repository at this point in the history
* Renaming `owner` role name to `admin`

* fixing typos

* delete users.md partial

* Update content/yaml-running-builds/starting-builds-automatically.md

Co-authored-by: helinanever <[email protected]>

* Remove FWE webhook config

---------

Co-authored-by: helinanever <[email protected]>
  • Loading branch information
mohammedbabelly20 and helinanever authored Oct 18, 2023
1 parent c15cbba commit bf51233
Show file tree
Hide file tree
Showing 17 changed files with 31 additions and 58 deletions.
6 changes: 3 additions & 3 deletions content/billing/billing.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ For pay-as-you-go team and user plans, each build minute is billed at the rate o

## Overdue and failed invoice payments

Invoices that have not been paid on the due date are shown as "Overdue" or "Failed" on the [Billing](https://codemagic.io/billing/) page. This usually happens when there are problems with charging the card, of which team or account owners are notified by email. Codemagic will then attempt to retry the payment in 3, 5 or 7 days.
Invoices that have not been paid on the due date are shown as "Overdue" or "Failed" on the [Billing](https://codemagic.io/billing/) page. This usually happens when there are problems with charging the card, of which team admins or account owners are notified by email. Codemagic will then attempt to retry the payment in 3, 5 or 7 days.

As soon as there is a failed invoice payment, your subscription will be put on hold and running builds will be disabled. In order to continue building, all invoices should be paid.

Team or account owners can manually retry the payment by clicking the **Pay invoice** button on the overdue/pending invoice in **Billing history**. This will redirect you to the Stripe-based payment website where you are required to add your credit card details and click **Make Payment**.
Team admins or account owners can manually retry the payment by clicking the **Pay invoice** button on the overdue/pending invoice in **Billing history**. This will redirect you to the Stripe-based payment website where you are required to add your credit card details and click **Make Payment**.

{{<notebox>}}
**Pending invoices**: Some invoices may remain pending due to issues with the payment. This can happen when international payments on your card are disabled or when automatic payments are not allowed in which case the first payment has to be made manually to comply with the new RBI regulations for Indian cardholders. Team or account owners can then manually retry the payment as described above.
**Pending invoices**: Some invoices may remain pending due to issues with the payment. This can happen when international payments on your card are disabled or when automatic payments are not allowed in which case the first payment has to be made manually to comply with the new RBI regulations for Indian cardholders. Team admins or account owners can then manually retry the payment as described above.
{{</notebox>}}

Note that overdue invoices should be paid before the subscription can be disabled. Please refer to the [Disable billing](/billing/billing/#disabling-billing) section for further info.
Expand Down
2 changes: 1 addition & 1 deletion content/custom-menu-position/ios-provisioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You can also check the [Register Devices](https://help.apple.com/developer-accou

## Requirements

* You have to be a team owner to manage iOS test devices.
* You have to be a team admin to manage iOS test devices.
* The **Apple Developer Portal integration** must be connected in **Team integrations** to be able to register new devices. This requires creating an App Store Connect API key with **Developer** permissions, see how to create one [here](https://developer.apple.com/documentation/appstoreconnectapi/creating_api_keys_for_app_store_connect_api).

## Creating a tester group
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Follow the instructions [here](../knowledge-base/partner-center-authentication)

### Step 2. Connecting the Microsoft Partner Center integration for your team/account

The Microsoft Partner Center integration can be enabled in **Teams > Personal Account > Integrations** for personal projects and in **Teams > Your Team Name > Team integrations** for projects shared in the team (if you're the team owner). This allows you to conveniently use the same access credentials for publishing across different apps and workflows.
The Microsoft Partner Center integration can be enabled in **Teams > Personal Account > Integrations** for personal projects and in **Teams > Your Team Name > Team integrations** for projects shared in the team (if you're a team admin). This allows you to conveniently use the same access credentials for publishing across different apps and workflows.

1. In the list of available integrations, click the **Connect** button for **Partner Center**.
2. In the **Tenant name** field, provide a name for the set of credentials you are going to set up the integration with. This is for identifying the set of credentials in Codemagic.
Expand Down
17 changes: 7 additions & 10 deletions content/getting-started/teams.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ To create a new team:
4. Click **Next: Add payment details**. You will be then asked to add your credit card details and company information (if relevant) to enable billing for the team.
5. Then click **Finish: Create team** to enable billing and continue setting up the team.

Once the team has been created, team owners can change the team's name, add or remove shared applications, add or remove users, change user roles and manage billing.
Once the team has been created, team admins can change the team's name, add or remove shared applications, add or remove users, change user roles and manage billing.

{{<notebox>}}**Note:** Keep in mind to review the filter settings on the Applications page to see your newly created team and shared team apps.{{</notebox>}}

## Managing shared applications

To add or remove shared applications, click on **Shared applications** to see the list of available applications. Check the repositories you wish to share with your team and uncheck the ones you wish to remove. Once done, click **Save changes**.

{{<notebox>}}**Note:** Unless you set up a repository integration in [Team integrations](#managing-team-integrations), Codemagic will use the primary team owner's credentials for accessing the repositories.{{</notebox>}}
{{<notebox>}}**Note:** Unless you set up a repository integration in [Team integrations](#managing-team-integrations), Codemagic will use the primary team admin's credentials for accessing the repositories.{{</notebox>}}

## Inviting team members

Expand All @@ -48,13 +48,13 @@ To remove any team members, click on the three dots next to their name and selec

Users in Codemagic teams can have one of the three roles.

* **Owner**. The user creating a team will become a team owner by default and has full access to all team, app, and repository settings. Other members of the team can be upgraded to owners as well. Owners can select the repositories to be shared with the team, invite new team members, change their roles or remove existing members, including other team owners, manage team integrations and billing.
* **Admin**. (previously called **Owner**) The user creating a team will become a team admin by default and has full access to all team, app, and repository settings. Other members of the team can be upgraded to admins as well. Admins can select the repositories to be shared with the team, invite new team members, change their roles or remove existing members, including other team admins, manage team integrations and billing.

* **Member**. A user with this role has access to the Codemagic UI and can view team settings, configure app settings and trigger new builds. Members cannot modify any team settings, billing details, or repository settings other than the app name.

* **User**. Any user that triggers builds from a webhook but does not have access to the team in Codemagic UI.

Owners can upgrade members to owners by clicking on the three dots next to their name and selecting **Upgrade to owner**, or downgrade other owners by selecting **Downgrade to member**.
Admins can upgrade members to admins by clicking on the three dots next to their name and selecting **Upgrade to admin**, or downgrade other admins by selecting **Downgrade to member**.

Users that have triggered builds can be invited to the team by clicking **Add to team** on the email address in the list of users.

Expand All @@ -66,21 +66,18 @@ The build dashboards feature makes it possible to share the team's builds and bu

In Team integrations, it is possible to set up integrations to be used with team apps.

Unless team owners have connected an integration in team settings, team creator's credentials are used to access repository information. It is advisable to configure access to the shared repositories on the team level in the **Team integrations** section. Set up an integration with a service where your repositories are hosted by clicking **Connect** next to its name.
Unless team admins have connected an integration in team settings, team creator's credentials are used to access repository information. It is advisable to configure access to the shared repositories on the team level in the **Team integrations** section. Set up an integration with a service where your repositories are hosted by clicking **Connect** next to its name.

## Managing billing

Billing is managed separately for each team. Read more about billing [here](../billing/billing).

## Leaving the team

A team member can leave the team at any time by clicking **Leave team** in the lower part of the page. If the only team owner wants to leave the team, they first have to upgrade another member to the owner role or delete the team completely.
A team member can leave the team at any time by clicking **Leave team** in the lower part of the page. If the only team admin wants to leave the team, they first have to upgrade another member to the admin role or delete the team completely.

## Deleting the team

Only the team owner can delete the team. To do so, scroll down to the **Danger zone** and click **Delete team**.
Only the team admin can delete the team. To do so, scroll down to the **Danger zone** and click **Delete team**.

{{<notebox>}}**Note:** Teams can only be deleted if they are empty (no members or shared applications) and billing has been disabled.{{</notebox>}}


<!-- {{< include "/partials/users.md" >}} -->
2 changes: 1 addition & 1 deletion content/partials/bitbucket.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For the best integration with the Git provider, it’s recommended to connect yo
Adding apps from Bitbucket requires granting access to your Bitbucket account to enable the integration and load repositories.

1. Click **Add application** in the top right corner of the Applications page.
2. If you are an owner of a team in Codemagic, you'll be asked to **Select a team**. You can only add the application to a team that has billing enabled. If you don't own any teams, this step is skipped and the application will be added to your personal account.
2. If you are an admin in a team in Codemagic, you'll be asked to **Select a team**. You can only add the application to a team that has billing enabled. If you don't own any teams, this step is skipped and the application will be added to your personal account.
3. Select **Bitbucket** as the Git provider and click **Next: Authorize integration**. A new window appears for you to authorize Codemagic. Confirm the authorization by clicking **Grant access**. If you have already authorized Bitbucket, click **Next: Select repository** instead.
4. Set up the application by selecting the repository from the dropdown menu and specifying the project type. Click **Finish: Add application**. You will be then redirected to the app settings.

Expand Down
4 changes: 2 additions & 2 deletions content/partials/github.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For the best integration with the Git provider, it’s recommended to connect yo
Adding apps from GitHub requires authorizing Codemagic and installing the Codemagic CI/CD GitHub App to a GitHub account or an organization to be able to load the repositories.

1. Click **Add application** in the top right corner of the Applications page.
2. If you are an owner of a team in Codemagic, you'll be asked to **Select a team**. You can only add the application to a team that has billing enabled. If you don't own any teams, this step is skipped and the application will be added to your personal account.
2. If you are an admin of a team in Codemagic, you'll be asked to **Select a team**. You can only add the application to a team that has billing enabled. If you don't own any teams, this step is skipped and the application will be added to your personal account.
3. Select **GitHub** as the Git provider. If you have already set up the integration, click **Next: Select repository** and skip to step 4. If the GitHub integration has not been set up, you'll see click **Next: Authorize integration** instead. A new window appears for you to authorize Codemagic. Confirm the authorization by clicking **Authorize Codemagic CI/CD**.
4. In the next step, click **Install GitHub App** to set up the integration. A GitHub page opens in a new window. Select the account or an organization where to install the app and choose whether to give Codemagic access to all the repositories from this account or only selected ones. Finish the installation by clicking **Install & Authorize**.
5. Finally, set up the application by selecting the repository from the dropdown menu and specifying the project type. Click **Finish: Add application**. You will be then redirected to the app settings.
Expand All @@ -22,7 +22,7 @@ Adding apps from GitHub requires authorizing Codemagic and installing the Codema
Codemagic uses the [Codemagic CI/CD GitHub App](https://github.com/apps/codemagic-ci-cd) to integrate with GitHub. To share your GitHub repositories with Codemagic, Codemagic GitHub App will have to be installed on the account or organization in GitHub from which you would like to build applications.

{{<notebox>}}
**Note:** The GitHub App integration can be connected separately for your personal account and each team. The integrations configured for your personal account apply to the apps that are not part of a team in Codemagic. While teams inherit the integrations from the team owner's personal account, it is highly recommended to set up repository integrations separately in team settings.
**Note:** The GitHub App integration can be connected separately for your personal account and each team. The integrations configured for your personal account apply to the apps that are not part of a team in Codemagic. While teams inherit the integrations from the team admin's personal account, it is highly recommended to set up repository integrations separately in team settings.
{{</notebox>}}
</p>
{{<notebox>}}
Expand Down
2 changes: 1 addition & 1 deletion content/partials/gitlab.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For the best integration with the Git provider, it’s recommended to connect yo
Adding apps from GitLab requires granting access to your GitLab account to enable the integration and load repositories.

1. Click **Add application** in the top right corner of the Applications page.
2. If you are an owner of a team in Codemagic, you'll be asked to **Select a team**. You can only add the application to a team that has billing enabled. If you don't own any teams, this step is skipped and the application will be added to your personal account.
2. If you are an admin of a team in Codemagic, you'll be asked to **Select a team**. You can only add the application to a team that has billing enabled. If you don't own any teams, this step is skipped and the application will be added to your personal account.
3. Select **GitLab** as the Git provider and click **Next: Authorize integration**. A new window appears for you to authorize Codemagic. Confirm the authorization by clicking **Authorize**. If you have already authorized GitLab, click **Next: Select repository** instead.
4. Set up the application by selecting the repository from the dropdown menu and specifying the project type. Click **Finish: Add application**. You will be then redirected to the app settings.

Expand Down
2 changes: 1 addition & 1 deletion content/partials/integrations-setup-app-store-connect.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The Apple Developer Portal integration can be enabled in **Teams > Personal Account > Integrations** for personal projects and in **Teams > Your Team Name > Team integrations** for projects shared in the team (if you're the team owner). This allows you to conveniently use the same access credentials for automatic code signing and publishing across different apps and workflows.
The Apple Developer Portal integration can be enabled in **Teams > Personal Account > Integrations** for personal projects and in **Teams > Your Team Name > Team integrations** for projects shared in the team (if you're a team admin). This allows you to conveniently use the same access credentials for automatic code signing and publishing across different apps and workflows.

1. In the list of available integrations, click the **Connect** button for **Developer Portal**.
2. In the **App Store Connect API key name**, provide a name for the key you are going to set up the integration with. This is for identifying the key in Codemagic.
Expand Down
2 changes: 1 addition & 1 deletion content/partials/modifying-access.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ aliases:

Navigate to **App settings > Repository settings** to update repository access settings, change the app name or icon in Codemagic, archive or delete the app.

Note that if the app is part of a team, only team owners can update repository access settings or delete the app.
Note that if the app is part of a team, only team admins can update repository access settings or delete the app.

## Updating access to the repository

Expand Down
2 changes: 1 addition & 1 deletion content/partials/other.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Apps that cannot be added via a repository integration can be cloned from a URL.
## Connecting repository via SSH

1. Click **Add application** in the top right corner of the Applications page.
2. If you are an owner of a team in Codemagic, you'll be asked to **Select a team**. You can only add the application to a team that has billing enabled. If you don't own any teams, this step is skipped and the application will be added to your personal account.
2. If you are an admin of a team in Codemagic, you'll be asked to **Select a team**. You can only add the application to a team that has billing enabled. If you don't own any teams, this step is skipped and the application will be added to your personal account.
3. Select **Other** and click **Next: Select repository**.
4. Enter the **Repository URL** for **cloning** the repository. You can find the URL from your repository by clicking **Clone** / **Clone or download**. Usually, the URL is in this format: `[email protected]:username/repo.git`.
5. Upload the **SSH private key** file. If your key is password-protected, enter the **Private key passphrase**.
Expand Down
25 changes: 0 additions & 25 deletions content/partials/users.md

This file was deleted.

Loading

0 comments on commit bf51233

Please sign in to comment.