fixes typos

closes #12453

fixes typos
closes #12453
ce88e4b9 · bergquist · fb2b2c9f · ce88e4b9 · ce88e4b9 · ce88e4b9
Commit ce88e4b9 authored Jun 29, 2018 by bergquist
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

CHANGELOG.md
+1 -1

public/app/partials/login.html
+1 -1

yarn.lock
+6 -6

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1336,7 +1336,7 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
 **New features**
 - [Issue #1623](https://github.com/grafana/grafana/issues/1623). Share Dashboard: Dashboard snapshot sharing (dash and data snapshot), save to local or save to public snapshot dashboard snapshots.raintank.io site
 - [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embedd a single graph on another web site
- [Issue #718](https://github.com/grafana/grafana/issues/718).   Dashboard: When saving a dashboard and another user has made changes in between the user is promted with a warning if he really wants to overwrite the other's changes
+- [Issue #718](https://github.com/grafana/grafana/issues/718).   Dashboard: When saving a dashboard and another user has made changes in between the user is prompted with a warning if he really wants to overwrite the other's changes
 - [Issue #1331](https://github.com/grafana/grafana/issues/1331). Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views
 - [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change ``now`` to be for example ``now-1m``, useful when you want to ignore last minute because it contains incomplete data
 - [Issue #171](https://github.com/grafana/grafana/issues/171).   Panel: Different time periods, panels can override dashboard relative time and/or add a time shift

--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -89,7 +89,7 @@
            <a class="btn btn-link" ng-click="skip();">
              Skip
              <info-popover mode="no-padding">
-                If you skip you will be promted to change password next time you login.
+                If you skip you will be prompted to change password next time you login.
              </info-popover>
            </a>
            <button type="submit" class="btn btn-large p-x-2" ng-click="changePassword();" ng-class="{'btn-inverse': !loginForm.$valid, 'btn-success': loginForm.$valid}">

--- a/yarn.lock
+++ b/yarn.lock
@@ -1114,7 +1114,7 @@ babel-plugin-istanbul@^4.1.5, babel-plugin-istanbul@^4.1.6:
    istanbul-lib-instrument "^1.10.1"
    test-exclude "^4.2.1"
-babel-plugin-jest-hoist@^22.4.4:
+babel-plugin-jest-hoist@^22.4.3, babel-plugin-jest-hoist@^22.4.4:
  version "22.4.4"
  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz#b9851906eab34c7bf6f8c895a2b08bea1a844c0b"
@@ -6498,7 +6498,7 @@ jest-docblock@^22.4.0, jest-docblock@^22.4.3:
  dependencies:
    detect-newline "^2.1.0"
-jest-environment-jsdom@^22.4.1:
+jest-environment-jsdom@^22.4.1, jest-environment-jsdom@^22.4.3:
  version "22.4.3"
  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
  dependencies:
@@ -6506,7 +6506,7 @@ jest-environment-jsdom@^22.4.1:
    jest-util "^22.4.3"
    jsdom "^11.5.1"
-jest-environment-node@^22.4.1:
+jest-environment-node@^22.4.1, jest-environment-node@^22.4.3:
  version "22.4.3"
  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129"
  dependencies:
@@ -6533,7 +6533,7 @@ jest-haste-map@^22.4.2:
    micromatch "^2.3.11"
    sane "^2.0.0"
-jest-jasmine2@^22.4.4:
+jest-jasmine2@^22.4.3, jest-jasmine2@^22.4.4:
  version "22.4.4"
  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.4.tgz#c55f92c961a141f693f869f5f081a79a10d24e23"
  dependencies:
@@ -6587,7 +6587,7 @@ jest-resolve-dependencies@^22.1.0:
  dependencies:
    jest-regex-util "^22.4.3"
-jest-resolve@^22.4.2:
+jest-resolve@^22.4.2, jest-resolve@^22.4.3:
  version "22.4.3"
  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea"
  dependencies:
@@ -6671,7 +6671,7 @@ jest-validate@^21.1.0:
    leven "^2.1.0"
    pretty-format "^21.2.1"
-jest-validate@^22.4.4:
+jest-validate@^22.4.3, jest-validate@^22.4.4:
  version "22.4.4"
  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.4.tgz#1dd0b616ef46c995de61810d85f57119dbbcec4d"
  dependencies: