merge repository heads

2025-11-07 22:15:45 +01:00 · 2019-03-12 13:59:45 +01:00
parent cd302a3768 289a792152
commit c1875994bf
13 changed files with 28 additions and 24 deletions
--- a/scm-plugins/scm-git-plugin/package.json
+++ b/scm-plugins/scm-git-plugin/package.json
@@ -12,6 +12,6 @@
    "@scm-manager/ui-extensions": "^0.1.2"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.25"
+    "@scm-manager/ui-bundler": "^0.0.26"
  }
 }
--- a/scm-plugins/scm-git-plugin/yarn.lock
+++ b/scm-plugins/scm-git-plugin/yarn.lock
@@ -707,9 +707,9 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.25":
-  version "0.0.25"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.25.tgz#1f65b3ff0ae81559a114c6a8d8cf43856cc6e166"
+"@scm-manager/ui-bundler@^0.0.26":
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.26.tgz#4676a7079b781b33fa1989c6643205c3559b1f66"
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-plugins/scm-hg-plugin/package.json
+++ b/scm-plugins/scm-hg-plugin/package.json
@@ -9,6 +9,6 @@
    "@scm-manager/ui-extensions": "^0.1.2"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.25"
+    "@scm-manager/ui-bundler": "^0.0.26"
  }
 }
--- a/scm-plugins/scm-hg-plugin/yarn.lock
+++ b/scm-plugins/scm-hg-plugin/yarn.lock
@@ -641,9 +641,9 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.25":
-  version "0.0.25"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.25.tgz#1f65b3ff0ae81559a114c6a8d8cf43856cc6e166"
+"@scm-manager/ui-bundler@^0.0.26":
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.26.tgz#4676a7079b781b33fa1989c6643205c3559b1f66"
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-plugins/scm-svn-plugin/package.json
+++ b/scm-plugins/scm-svn-plugin/package.json
@@ -9,6 +9,6 @@
    "@scm-manager/ui-extensions": "^0.1.2"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.25"
+    "@scm-manager/ui-bundler": "^0.0.26"
  }
 }
--- a/scm-plugins/scm-svn-plugin/yarn.lock
+++ b/scm-plugins/scm-svn-plugin/yarn.lock
@@ -641,9 +641,9 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.25":
-  version "0.0.25"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.25.tgz#1f65b3ff0ae81559a114c6a8d8cf43856cc6e166"
+"@scm-manager/ui-bundler@^0.0.26":
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.26.tgz#4676a7079b781b33fa1989c6643205c3559b1f66"
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-ui-components/packages/ui-components/package.json
+++ b/scm-ui-components/packages/ui-components/package.json
@@ -14,7 +14,7 @@
    "eslint-fix": "eslint src --fix"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.25",
+    "@scm-manager/ui-bundler": "^0.0.26",
    "create-index": "^2.3.0",
    "enzyme": "^3.5.0",
    "enzyme-adapter-react-16": "^1.3.1",
--- a/scm-ui-components/packages/ui-components/src/DateFromNow.js
+++ b/scm-ui-components/packages/ui-components/src/DateFromNow.js
@@ -4,6 +4,10 @@ import moment from "moment";
 import { translate } from "react-i18next";
 import injectSheet from "react-jss";

+// fix german locale
+// https://momentjscom.readthedocs.io/en/latest/moment/00-use-it/07-browserify/
+import "moment/locale/de";
+
 const styles = {
  date: {
    borderBottom: "1px dotted rgba(219, 219, 219)",
--- a/scm-ui-components/packages/ui-components/yarn.lock
+++ b/scm-ui-components/packages/ui-components/yarn.lock
@@ -687,9 +687,9 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.25":
-  version "0.0.25"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.25.tgz#1f65b3ff0ae81559a114c6a8d8cf43856cc6e166"
+"@scm-manager/ui-bundler@^0.0.26":
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.26.tgz#4676a7079b781b33fa1989c6643205c3559b1f66"
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-ui-components/packages/ui-types/package.json
+++ b/scm-ui-components/packages/ui-types/package.json
@@ -14,7 +14,7 @@
    "check": "flow check"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.25"
+    "@scm-manager/ui-bundler": "^0.0.26"
  },
  "browserify": {
    "transform": [
--- a/scm-ui-components/packages/ui-types/yarn.lock
+++ b/scm-ui-components/packages/ui-types/yarn.lock
@@ -707,9 +707,9 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.25":
-  version "0.0.25"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.25.tgz#1f65b3ff0ae81559a114c6a8d8cf43856cc6e166"
+"@scm-manager/ui-bundler@^0.0.26":
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.26.tgz#4676a7079b781b33fa1989c6643205c3559b1f66"
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -52,7 +52,7 @@
    "pre-commit": "jest && flow && eslint src"
  },
  "devDependencies": {
-    "@scm-manager/ui-bundler": "^0.0.25",
+    "@scm-manager/ui-bundler": "^0.0.26",
    "concat": "^1.0.3",
    "copyfiles": "^2.0.0",
    "enzyme": "^3.3.0",
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -698,9 +698,9 @@
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@scm-manager/eslint-config/-/eslint-config-0.0.2.tgz#94cc8c3fb4f51f870b235893dc134fc6c423ae85"

-"@scm-manager/ui-bundler@^0.0.25":
-  version "0.0.25"
-  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.25.tgz#1f65b3ff0ae81559a114c6a8d8cf43856cc6e166"
+"@scm-manager/ui-bundler@^0.0.26":
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/@scm-manager/ui-bundler/-/ui-bundler-0.0.26.tgz#4676a7079b781b33fa1989c6643205c3559b1f66"
  dependencies:
    "@babel/core" "^7.0.0"
    "@babel/plugin-proposal-class-properties" "^7.0.0"