-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #28 from dhis2/update-upstreams
Update upstreams
- Loading branch information
Showing
13 changed files
with
251 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
{ | ||
"name": "root", | ||
"version": "5.0.0-alpha.5", | ||
"repository": "[email protected]:dhis2/ui.git", | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/dhis2/ui.git" | ||
}, | ||
"author": "Viktor Varland <[email protected]>", | ||
"license": "BSD-3-Clause", | ||
"private": true, | ||
|
@@ -45,21 +48,21 @@ | |
"watch:widgets": "yarn build:widgets --watch --dev" | ||
}, | ||
"devDependencies": { | ||
"@dhis2/cli-app-scripts": "^3.2.5", | ||
"@dhis2/cli-style": "^6.0.0", | ||
"@dhis2/cli-app-scripts": "^3.2.9", | ||
"@dhis2/cli-style": "^7.0.0", | ||
"@dhis2/cli-utils-cypress": "^1.0.2", | ||
"@dhis2/cli-utils-docsite": "^1.3.0", | ||
"@storybook/addons": "^5.3.9", | ||
"@storybook/components": "^5.3.14", | ||
"@storybook/csf": "^0.0.1", | ||
"@storybook/preset-create-react-app": "^1.5.2", | ||
"@storybook/react": "^5.3.14", | ||
"@storybook/preset-create-react-app": "^2.1.1", | ||
"@storybook/react": "^5.3.17", | ||
"@wertarbyte/react-props-md-table": "^1.1.1", | ||
"concurrently": "^5.1.0", | ||
"enzyme": "^3.11.0", | ||
"enzyme-adapter-react-16": "^1.15.2", | ||
"react": "16.8", | ||
"react-dev-utils": "^10.2.0", | ||
"react-dev-utils": "^10.2.1", | ||
"react-docgen": "^5.3.0", | ||
"react-dom": "16.8", | ||
"styled-jsx": "^3.2.4", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import React from 'react' | ||
import propTypes from '@dhis2/prop-types' | ||
|
||
export function CancelOutline({ className }) { | ||
return ( | ||
<svg | ||
xmlns="http://www.w3.org/2000/svg" | ||
viewBox="0 0 16 16" | ||
className={className} | ||
> | ||
<path d="M11.2928932,3.29289322 L12.7071068,4.70710678 L9.41389322,7.99989322 L12.7071068,11.2928932 L11.2928932,12.7071068 L7.99989322,9.41389322 L4.70710678,12.7071068 L3.29289322,11.2928932 L6.58589322,7.99989322 L3.29289322,4.70710678 L4.70710678,3.29289322 L7.99989322,6.58589322 L11.2928932,3.29289322 Z" /> | ||
|
||
<style jsx>{` | ||
svg { | ||
fill: inherit; | ||
height: 16px; | ||
width: 16px; | ||
vertical-align: middle; | ||
pointer-events: none; | ||
} | ||
`}</style> | ||
</svg> | ||
) | ||
} | ||
CancelOutline.propTypes = { | ||
className: propTypes.string, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# Translators: | ||
# 晓东 林 <[email protected]>, 2020 | ||
# | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: i18next-conv\n" | ||
"POT-Creation-Date: 2020-02-18T13:19:29.126Z\n" | ||
"PO-Revision-Date: 2019-08-12 21:09+0000\n" | ||
"Last-Translator: 晓东 林 <[email protected]>, 2020\n" | ||
"Language-Team: Chinese (China) (https://www.transifex.com/hisp-uio/teams/100509/zh_CN/)\n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: 8bit\n" | ||
"Language: zh_CN\n" | ||
"Plural-Forms: nplurals=1; plural=0;\n" | ||
|
||
msgid "Search apps" | ||
msgstr "搜索APP" | ||
|
||
msgid "Edit profile" | ||
msgstr "编辑基本信息" | ||
|
||
msgid "Settings" | ||
msgstr "设置" | ||
|
||
msgid "Account" | ||
msgstr "账号" | ||
|
||
msgid "Help" | ||
msgstr "帮助" | ||
|
||
msgid "About DHIS2" | ||
msgstr "关于DHIS2" | ||
|
||
msgid "Logout" | ||
msgstr "退出" | ||
|
||
msgid "Something went wrong with loading the children." | ||
msgstr "载入下属资源出错" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.