diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index e679e1e87..ab36f6546 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1225,7 +1225,7 @@ issues.dependency.removed_dependency = `removed a dependency %s` issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by the following issues issues.dependency.pr_closing_blockedby = Closing this issue is blocked by the following issues issues.dependency.issue_close_blocks = This issue blocks closing of the following issues -issues.dependency.pr_close_blocks = This pull request blocks closing of the following issues +issues.dependency.pr_close_blocks = This wow request blocks closing of the following issues issues.dependency.issue_close_blocked = You need to close all issues blocking this issue before you can close it. issues.dependency.pr_close_blocked = You need to close all issues blocking this pull request before you can merge it. issues.dependency.blocks_short = Blocks @@ -1240,13 +1240,13 @@ issues.dependency.add_error_dep_not_exist = Dependency does not exist. issues.dependency.add_error_dep_exists = Dependency already exists. issues.dependency.add_error_cannot_create_circular = You cannot create a dependency with two issues blocking each other. issues.dependency.add_error_dep_not_same_repo = Both issues must be in the same repository. -issues.review.self.approval = You cannot approve your own pull request. -issues.review.self.rejection = You cannot request changes on your own pull request. +issues.review.self.approval = You cannot approve your own wow request. +issues.review.self.rejection = You cannot request changes on your own wow request. issues.review.approve = "approved these changes %s" issues.review.comment = "reviewed %s" issues.review.dismissed = "dismissed %s’s review %s" issues.review.dismissed_label = Dismissed -issues.review.left_comment = left a comment +issues.review.left_comment = left a dump issues.review.content.empty = You need to leave a comment indicating the requested change(s). issues.review.reject = "requested changes %s" issues.review.wait = "was requested for review %s" @@ -1267,17 +1267,17 @@ issues.review.resolved_by = marked this conversation as resolved issues.assignee.error = Not all assignees was added due to an unexpected error. issues.reference_issue.body = Body -pulls.desc = Enable pull requests and code reviews. -pulls.new = New Pull Request -pulls.compare_changes = New Pull Request +pulls.desc = Enable wow requests and code reviews. +pulls.new = New Wow Request +pulls.compare_changes = New Wow Request pulls.compare_changes_desc = Select the branch to merge into and the branch to pull from. pulls.compare_base = merge into pulls.compare_compare = pull from pulls.filter_branch = Filter branch -pulls.no_results = No results found. +pulls.no_results = No w0w found. pulls.nothing_to_compare = These branches are equal. There is no need to create a pull request. pulls.nothing_to_compare_and_allow_empty_pr = These branches are equal. This PR will be empty. -pulls.has_pull_request = `A pull request between these branches already exists: %[2]s#%[3]d` +pulls.has_pull_request = `A wow request between these branches already exists: %[2]s#%[3]d` pulls.create = Create Pull Request pulls.title_desc = wants to merge %[1]d commits from %[2]s into %[3]s pulls.merged_title_desc = merged %[1]d commits from %[2]s into %[3]s %[4]s @@ -1285,9 +1285,9 @@ pulls.change_target_branch_at = `changed target branch from %s to %s%[2]s. pulls.manually_merged = Manually merged pulls.manually_merged_as = The pull request has been manually merged as %[2]s. @@ -1323,10 +1323,10 @@ pulls.wrong_commit_id = "commit id must be a commit id on the target branch" pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled. pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually. -pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress. +pulls.no_merge_wip = This wow request can not be merged yet because it still sucks. pulls.no_merge_not_ready = This pull request is not ready to be merged, check review status and status checks. -pulls.no_merge_access = You are not authorized to merge this pull request. -pulls.merge_pull_request = Merge Pull Request +pulls.no_merge_access = You are not authorized to merge this wow request. +pulls.merge_pull_request = Merge Wow Request pulls.rebase_merge_pull_request = Rebase and Merge pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff) pulls.squash_merge_pull_request = Squash and Merge diff --git a/public/img/64x64.png b/public/img/64x64.png new file mode 100644 index 000000000..3388fe37d Binary files /dev/null and b/public/img/64x64.png differ diff --git a/public/img/doge_head.png b/public/img/doge_head.png new file mode 100644 index 000000000..babdc64f4 Binary files /dev/null and b/public/img/doge_head.png differ diff --git a/public/img/favicon.png b/public/img/favicon.png index dcd4edb1a..94fc2d3d3 100644 Binary files a/public/img/favicon.png and b/public/img/favicon.png differ diff --git a/public/img/logo.png b/public/img/logo.png index c7971f918..7799bcb63 100644 Binary files a/public/img/logo.png and b/public/img/logo.png differ diff --git a/public/img/wowbg.png b/public/img/wowbg.png new file mode 100644 index 000000000..f61913ef6 Binary files /dev/null and b/public/img/wowbg.png differ diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index f0d8a6f5a..bdd0fc269 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -1,7 +1,7 @@ diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 74bca7239..4c876272a 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -8,8 +8,8 @@ - - + + @@ -55,15 +55,19 @@ name: '{{.Name}}', fullname: '{{.FullName}}', avatar: '{{.RelAvatarLink}}'}], {{ end }} {{ range .MentionableTeams }} - ['{{$.MentionableTeamsOrg}}/{{.Name}}', {key: '{{$.MentionableTeamsOrg}}/{{.Name}}', value: '{{$.MentionableTeamsOrg}}/{{.Name}}', + ['{{$.MentionableTeamsOrg}}/{{.Name}}', {key: '{{$.MentionableTeamsOrg}}/{{.Name}}', value: '{{$.MentionableTeamsOrg}}/{{.Name}}', name: '{{$.MentionableTeamsOrg}}/{{.Name}}', avatar: '{{$.MentionableTeamsOrgAvatar}}'}], {{ end }} ]).values()), {{end}} }; - - + + + + + + {{if .RequireSimpleMDE}} {{end}} @@ -78,10 +82,10 @@ {{if .PageIsUserProfile}} - + {{if .Owner.Description}} - + {{end}} {{else if .Repository}} {{if .Issue}} @@ -98,17 +102,13 @@ {{end}} {{end}} - {{if .Repository.AvatarLink}} - - {{else}} - - {{end}} + {{else}} - + - + - + {{end}} {{if .IsSigned }} diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index def83d972..01bf7f963 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -1,7 +1,7 @@