Skip to content

Commit

Permalink
Merge branch 'master' into 2158-title-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
ckcherry23 authored Apr 18, 2024
2 parents a197032 + 1e76355 commit b98d881
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/_markbind/layouts/ug-sitenav.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{name: "Appendices"},
{level: 2, name: "CLI syntax reference", link: "ug/cli.html"},
{level: 2, name: "Config files format", link: "ug/configFiles.html"},
{level: 2, name: "Advanced syntax: `author-config.csv`", link: "ug/authorConfigSyntax.html"},
{level: 2, name: "Advanced syntax: `author-config.csv`", link: "ug/authorConfigSyntax.html"},
{level: 2, name: "Using `@@author` tags", link: "ug/usingAuthorTags.html"},
{level: 2, name: "RepoSense with Netlify", link: "ug/withNetlify.html"},
{level: 2, name: "RepoSense with GitHub Actions", link: "ug/withGithubActions.html"},
Expand Down
2 changes: 1 addition & 1 deletion docs/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Contributor [2023 January - 2024 January]<br/>
<!-- ------------------------------------------------------------------------------------------------------ -->

### [Gokul Rajiv](https://github.com/gok99)
**Role**: Senior Developer [2024 January - ]<br/>
**Role**: Senior Developer [2024 January - ]<br/>
Contributor [2022 January - 2024 January]<br/>

<!-- ------------------------------------------------------------------------------------------------------ -->
Expand Down
2 changes: 1 addition & 1 deletion docs/ug/authorConfigSyntax.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div class="lead">

Given below are the advanced syntax available for `author-config.csv`.
Given below are the advanced syntax available for `author-config.csv`.
</div>

## Multiple `Repository's Location` per author
Expand Down
2 changes: 1 addition & 1 deletion docs/ug/usingReports.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ The `Code panel` allows users to see the code attributed to a specific author. C
* Clicking the file title toggles the file content.
* Clicking the first icon beside the file title opens the history view of the file on the remote repository.
* Clicking the second icon beside the file title opens the blame view of the file on the remote repository.
* When using the code panel for a specific author, code attributed to the author is highlighted in green.
* When using the code panel for a specific author, code attributed to the author is highlighted in green.
* When using the `merge group` option with `group by repos`, the code panel will consist of multiple authors' contributions. Code attributed to these authors can be differentiated by the highlight colors of the code. The color legend is shown at the top of each file and consists only those authors that edited a particular file.
* Non-trivial code segments that the selected author has not written are hidden by default, but you can toggle them by clicking on the %%:fas-plus-circle:%% icon.

Expand Down
10 changes: 6 additions & 4 deletions frontend/src/components/c-summary-charts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@
)
| [{{ getGroupTotalContribution(repo) }} lines]
span.tooltip-text(
v-if="filterGroupSelection === 'groupByRepos' && !isChartGroupWidgetMode"
)(v-bind:ref="`summary-charts-${i}-total-contribution`") Total contribution of group
v-if="filterGroupSelection === 'groupByRepos' && !isChartGroupWidgetMode",
v-bind:ref="`summary-charts-${i}-total-contribution`"
) Total contribution of group
span.tooltip-text(
v-else-if="filterGroupSelection === 'groupByAuthors' && !isChartGroupWidgetMode"
)(v-bind:ref="`summary-charts-${i}-total-contribution`") Total contribution of author
v-else-if="filterGroupSelection === 'groupByAuthors' && !isChartGroupWidgetMode",
v-bind:ref="`summary-charts-${i}-total-contribution`"
) Total contribution of author
a(
v-if="!isGroupMerged(getGroupName(repo)) && !isChartGroupWidgetMode",
v-on:click="handleMergeGroup(getGroupName(repo))"
Expand Down

0 comments on commit b98d881

Please sign in to comment.