merge with branch feature/bugfix_issuetracker

This commit is contained in:
Sebastian Sdorra
2019-01-25 12:35:58 +01:00
12 changed files with 63 additions and 41 deletions

View File

@@ -26,7 +26,7 @@
"react-router-enzyme-context": "^1.2.0"
},
"dependencies": {
"@scm-manager/ui-extensions": "^0.1.1",
"@scm-manager/ui-extensions": "^0.1.2",
"@scm-manager/ui-types": "2.0.0-SNAPSHOT",
"classnames": "^2.2.6",
"moment": "^2.22.2",

View File

@@ -3,15 +3,16 @@ import React from "react";
import type { Changeset, Repository, Tag } from "@scm-manager/ui-types";
import classNames from "classnames";
import {Interpolate, translate} from "react-i18next";
import { Interpolate, translate } from "react-i18next";
import ChangesetId from "./ChangesetId";
import injectSheet from "react-jss";
import {DateFromNow} from "../..";
import { DateFromNow } from "../..";
import ChangesetAuthor from "./ChangesetAuthor";
import ChangesetTag from "./ChangesetTag";
import {parseDescription} from "./changesets";
import {AvatarWrapper, AvatarImage} from "../../avatar";
import { parseDescription } from "./changesets";
import { AvatarWrapper, AvatarImage } from "../../avatar";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
const styles = {
pointer: {
@@ -64,7 +65,15 @@ class ChangesetRow extends React.Component<Props> {
<div className={classNames("media-content", classes.withOverflow)}>
<div className="content">
<p className="is-ellipsis-overflow">
<strong>{description.title}</strong>
<strong>
<ExtensionPoint
name="changesets.changeset.description"
props={{ changeset, value: description.title }}
renderAll={false}
>
{description.title}
</ExtensionPoint>
</strong>
<br />
<Interpolate
i18nKey="changesets.changeset.summary"

View File

@@ -727,9 +727,9 @@
vinyl-source-stream "^2.0.0"
watchify "^3.11.0"
"@scm-manager/ui-extensions@^0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45"
"@scm-manager/ui-extensions@^0.1.2":
version "0.1.2"
resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc"
dependencies:
react "^16.4.2"
react-dom "^16.4.2"