Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 05:55:44 +01:00
Code Issues Packages Projects Releases Activity

merge with branch feature/bugfix_issuetracker

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-01-25 12:35:58 +01:00
parent 03e4a17b68 f9d0a316c5
commit 02c3698aaf
12 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-git-plugin/package.json
View File

@@ -9,7 +9,7 @@
"flow": "flow check" "flow": "flow check"
}, },
"dependencies": { "dependencies": {
"@scm-manager/ui-extensions": "^0.1.1" "@scm-manager/ui-extensions": "^0.1.2"
}, },
"devDependencies": { "devDependencies": {
"@scm-manager/ui-bundler": "^0.0.24" "@scm-manager/ui-bundler": "^0.0.24"

7
scm-plugins/scm-git-plugin/yarn.lock
View File

@@ -747,9 +747,10 @@
vinyl-source-stream "^2.0.0" vinyl-source-stream "^2.0.0"
watchify "^3.11.0" watchify "^3.11.0"
"@scm-manager/ui-extensions@^0.1.1": "@scm-manager/ui-extensions@^0.1.2":
version "0.1.1" version "0.1.2"
resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc"
integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA==
dependencies: dependencies:
react "^16.4.2" react "^16.4.2"
react-dom "^16.4.2" react-dom "^16.4.2"

2
scm-plugins/scm-hg-plugin/package.json
View File

@@ -6,7 +6,7 @@
"build": "ui-bundler plugin" "build": "ui-bundler plugin"
}, },
"dependencies": { "dependencies": {
"@scm-manager/ui-extensions": "^0.1.1" "@scm-manager/ui-extensions": "^0.1.2"
}, },
"devDependencies": { "devDependencies": {
"@scm-manager/ui-bundler": "^0.0.24" "@scm-manager/ui-bundler": "^0.0.24"

7
scm-plugins/scm-hg-plugin/yarn.lock
View File

@@ -681,9 +681,10 @@
vinyl-source-stream "^2.0.0" vinyl-source-stream "^2.0.0"
watchify "^3.11.0" watchify "^3.11.0"
"@scm-manager/ui-extensions@^0.1.1": "@scm-manager/ui-extensions@^0.1.2":
version "0.1.1" version "0.1.2"
resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc"
integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA==
dependencies: dependencies:
react "^16.4.2" react "^16.4.2"
react-dom "^16.4.2" react-dom "^16.4.2"

2
scm-plugins/scm-svn-plugin/package.json
View File

@@ -6,7 +6,7 @@
"build": "ui-bundler plugin" "build": "ui-bundler plugin"
}, },
"dependencies": { "dependencies": {
"@scm-manager/ui-extensions": "^0.1.1" "@scm-manager/ui-extensions": "^0.1.2"
}, },
"devDependencies": { "devDependencies": {
"@scm-manager/ui-bundler": "^0.0.24" "@scm-manager/ui-bundler": "^0.0.24"

7
scm-plugins/scm-svn-plugin/yarn.lock
View File

@@ -681,9 +681,10 @@
vinyl-source-stream "^2.0.0" vinyl-source-stream "^2.0.0"
watchify "^3.11.0" watchify "^3.11.0"
"@scm-manager/ui-extensions@^0.1.1": "@scm-manager/ui-extensions@^0.1.2":
version "0.1.1" version "0.1.2"
resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc"
integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA==
dependencies: dependencies:
react "^16.4.2" react "^16.4.2"
react-dom "^16.4.2" react-dom "^16.4.2"

2
scm-ui-components/packages/ui-components/package.json
View File

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

19
scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js
View File

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

6
scm-ui-components/packages/ui-components/yarn.lock
View File

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

2
scm-ui/package.json
View File

@@ -7,7 +7,7 @@
"dependencies": { "dependencies": {
"@babel/polyfill": "^7.0.0", "@babel/polyfill": "^7.0.0",
"@fortawesome/fontawesome-free": "^5.3.1", "@fortawesome/fontawesome-free": "^5.3.1",
"@scm-manager/ui-extensions": "^0.1.1", "@scm-manager/ui-extensions": "^0.1.2",
"bulma": "^0.7.1", "bulma": "^0.7.1",
"bulma-tooltip": "^2.0.2", "bulma-tooltip": "^2.0.2",
"classnames": "^2.2.5", "classnames": "^2.2.5",

23
scm-ui/src/repos/components/changesets/ChangesetDetails.js
View File

@@ -46,7 +46,15 @@ class ChangesetDetails extends React.Component<Props> {
return ( return (
<div> <div>
<div className="content"> <div className="content">
<h4>{description.title}</h4> <h4>
<ExtensionPoint
name="changesets.changeset.description"
props={{ changeset, value: description.title }}
renderAll={false}
>
{description.title}
</ExtensionPoint>
</h4>
<article className="media"> <article className="media">
<AvatarWrapper> <AvatarWrapper>
<p className={classNames("image", "is-64x64", classes.spacing)}> <p className={classNames("image", "is-64x64", classes.spacing)}>
@@ -67,22 +75,23 @@ class ChangesetDetails extends React.Component<Props> {
</div> </div>
<div className="media-right">{this.renderTags()}</div> <div className="media-right">{this.renderTags()}</div>
</article> </article>
<ExtensionPoint
name="changesets.changeset.description"
props={{ changeset, description }}
renderAll={true}
>
<p> <p>
{description.message.split("\n").map((item, key) => { {description.message.split("\n").map((item, key) => {
return ( return (
<span key={key}> <span key={key}>
<ExtensionPoint
name="changesets.changeset.description"
props={{ changeset, value: item }}
renderAll={false}
>
{item} {item}
</ExtensionPoint>
<br /> <br />
</span> </span>
); );
})} })}
</p> </p>
</ExtensionPoint>
</div> </div>
<div> <div>
<ChangesetDiff changeset={changeset} /> <ChangesetDiff changeset={changeset} />

7
scm-ui/yarn.lock
View File

@@ -738,9 +738,10 @@
vinyl-source-stream "^2.0.0" vinyl-source-stream "^2.0.0"
watchify "^3.11.0" watchify "^3.11.0"
"@scm-manager/ui-extensions@^0.1.1": "@scm-manager/ui-extensions@^0.1.2":
version "0.1.1" version "0.1.2"
resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc"
integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA==
dependencies: dependencies:
react "^16.4.2" react "^16.4.2"
react-dom "^16.4.2" react-dom "^16.4.2"