diff options
| author | David Svantesson <davidsvantesson@gmail.com> | 2019-09-23 22:08:03 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-09-23 23:08:03 +0300 |
| commit | a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1 (patch) | |
| tree | a40e42bb05f62acaf64e0af5b49142985387ab42 /options | |
| parent | 63ff61615ec6aaa25887f8ce605c9082c106a34b (diff) | |
| download | gitea-a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1.tar.gz gitea-a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1.zip | |
Add teams to repo on collaboration page. (#8045)
* Add teams to repo on collaboration page.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add option for repository admins to change teams access to repo.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add comment for functions
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Make RepoAdminChangeTeamAccess default false in xorm and make it default checked in template instead.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Make proper language strings and fix error redirection.
* Add unit tests for adding and deleting team from repository.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add database migration
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Fix redirect
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Fix locale string mismatch.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Move team access mode text logic to template.
* Move collaborator access mode text logic to template.
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 52ccea68b2..7bb4539684 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -319,6 +319,7 @@ enterred_invalid_repo_name = The repository name you entered is incorrect. enterred_invalid_owner_name = The new owner name is not valid. enterred_invalid_password = The password you entered is incorrect. user_not_exist = The user does not exist. +team_not_exist = The team does not exist. last_org_owner = You cannot remove the last user from the 'owners' team. There must be at least one owner in any given team. cannot_add_org_to_team = An organization cannot be added as a team member. @@ -1136,6 +1137,7 @@ settings.collaboration = Collaborators settings.collaboration.admin = Administrator settings.collaboration.write = Write settings.collaboration.read = Read +settings.collaboration.owner = Owner settings.collaboration.undefined = Undefined settings.hooks = Webhooks settings.githooks = Git Hooks @@ -1217,6 +1219,11 @@ settings.collaborator_deletion_desc = Removing a collaborator will revoke their settings.remove_collaborator_success = The collaborator has been removed. settings.search_user_placeholder = Search user… settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator. +settings.change_team_access_not_allowed = Changing team access for repository has been restricted to organization owner +settings.team_not_in_organization = The team is not in the same organization as the repository +settings.add_team_duplicate = Team already has the repository +settings.add_team_success = The team now have access to the repository. +settings.remove_team_success = The team's access to the repository has been removed. settings.add_webhook = Add Webhook settings.add_webhook.invalid_channel_name = Webhook channel name cannot be empty and cannot contain only a # character. settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Read more in the <a target="_blank" rel="noopener noreferrer" href="%s">webhooks guide</a>. @@ -1475,6 +1482,8 @@ settings.options = Organization settings.full_name = Full Name settings.website = Website settings.location = Location +settings.permission = Permissions +settings.repoadminchangeteam = Repository admin can add and remove access for teams settings.visibility = Visibility settings.visibility.public = Public settings.visibility.limited = Limited (Visible to logged in users only) |