wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-20 12:40:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into improve-cross-browser-support

Browse Source
This commit is contained in:
Kiwi
2018-09-20 22:54:59 +02:00
committed by GitHub
parent 6df0568378 8b1aec5f24
commit 7ae3e4886a
14 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+6 -6
View File
@@ -1342,9 +1342,9 @@
}
},
"@coralproject/rte": {
"version": "0.10.9",
"resolved": "https://registry.npmjs.org/@coralproject/rte/-/rte-0.10.9.tgz",
"integrity": "sha512-0K+bc3JaOhjgJJ91uupev4EmSoldd/IizfjRgAQ8LbZjRc3pWprzIBhoTMChApBzz7eI9DUfw2ULg5muziV8BA==",
"version": "0.10.11",
"resolved": "https://registry.npmjs.org/@coralproject/rte/-/rte-0.10.11.tgz",
"integrity": "sha512-Tq8NznCOYx84QpHhZbUldxcYrztEQnnNjDC2aW5HhzltO9nBG2Hu78MzTwliML3MmaTFbLehdIb/BKGKj4eMSw==",
"dev": true,
"requires": {
"bowser": "^1.0.0",
@@ -20822,9 +20822,9 @@
"dev": true
},
"react-contenteditable": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-2.1.5.tgz",
"integrity": "sha512-mjaxwybOX7Om8Cx/0mVCUpgvAyheP48JXoABMTvzWENluFTpwAhlsLfKN4xNZk3Y7DsiidA7mUZibh0sTMly2w==",
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-2.1.6.tgz",
"integrity": "sha512-HqqAdAP69SEhZhlrzJSujVSVMmThpUzVnbNDB7dFk+LWhvuhNj5iT0DgedoURpPJqbTDX8msSkFuU7FsAMxf3Q==",
"dev": true,
"requires": {
"@types/prop-types": "^15.5.4",
package.json
+1 -1
View File
@@ -85,7 +85,7 @@
"@babel/polyfill": "7.0.0-beta.49",
"@babel/preset-env": "7.0.0-beta.49",
"@babel/preset-react": "7.0.0-beta.49",
"@coralproject/rte": "^0.10.9",
"@coralproject/rte": "^0.10.11",
"@types/bcryptjs": "^2.4.1",
"@types/bull": "^3.3.16",
"@types/bunyan": "^1.8.4",
src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap
+3 -3
View File
@@ -140,7 +140,7 @@ exports[`navigates to sign in form 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -282,7 +282,7 @@ exports[`navigates to sign up form 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -397,7 +397,7 @@ exports[`renders sign in form 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
src/core/client/auth/test/__snapshots__/signIn.spec.tsx.snap
+9 -9
View File
@@ -95,7 +95,7 @@ exports[`accepts correct password 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -223,7 +223,7 @@ exports[`accepts valid email 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -364,7 +364,7 @@ exports[`checks for invalid email 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -479,7 +479,7 @@ exports[`renders sign in form 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -620,7 +620,7 @@ exports[`shows error when submitting empty form 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -735,7 +735,7 @@ exports[`shows server error 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -855,7 +855,7 @@ exports[`shows server error 2`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -970,7 +970,7 @@ exports[`submits form successfully 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1085,7 +1085,7 @@ exports[`submits form successfully 2`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in to Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
src/core/client/auth/test/__snapshots__/signUp.spec.tsx.snap
+16 -16
View File
@@ -148,7 +148,7 @@ exports[`accepts correct password 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -342,7 +342,7 @@ exports[`accepts correct password confirmation 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -523,7 +523,7 @@ exports[`accepts valid email 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -704,7 +704,7 @@ exports[`accepts valid username 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -898,7 +898,7 @@ exports[`checks for invalid characters in username 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1092,7 +1092,7 @@ exports[`checks for invalid email 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1286,7 +1286,7 @@ exports[`checks for too long username 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1480,7 +1480,7 @@ exports[`checks for too short password 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1674,7 +1674,7 @@ exports[`checks for too short username 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1868,7 +1868,7 @@ exports[`checks for wrong password confirmation 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2010,7 +2010,7 @@ exports[`renders sign up form 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2204,7 +2204,7 @@ exports[`shows error when submitting empty form 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2346,7 +2346,7 @@ exports[`shows server error 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2493,7 +2493,7 @@ exports[`shows server error 2`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2635,7 +2635,7 @@ exports[`submits form successfully 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2777,7 +2777,7 @@ exports[`submits form successfully 2`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign up and join the conversation
Sign up and Join the Conversation
</button>
<div
className="Flex-root Flex-flex Flex-justifyCenter"
src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
+3 -3
View File
@@ -135,7 +135,7 @@ exports[`loads more comments 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in and Join the Conversation
</button>
</div>
</div>
@@ -480,7 +480,7 @@ exports[`renders comment stream 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in and Join the Conversation
</button>
</div>
</div>
@@ -634,7 +634,7 @@ exports[`renders comment stream 1`] = `
onTouchEnd={[Function]}
type="button"
>
Load more
Load More
</button>
</div>
</div>
src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
+2 -2
View File
@@ -21,7 +21,7 @@ exports[`renders permalink view 1`] = `
target="_parent"
type="button"
>
Show all comments
Show All Comments
</a>
<div
className="Indent-root"
@@ -223,7 +223,7 @@ exports[`show all comments 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in and Join the Conversation
</button>
</div>
</div>
src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
+2 -2
View File
@@ -21,7 +21,7 @@ exports[`renders permalink view with unknown comment 1`] = `
target="_parent"
type="button"
>
Show all comments
Show All Comments
</a>
<p
className="Typography-root Typography-bodyCopy Typography-colorTextPrimary"
@@ -167,7 +167,7 @@ exports[`show all comments 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in and Join the Conversation
</button>
</div>
</div>
src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
+1 -1
View File
@@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in and Join the Conversation
</button>
</div>
</div>
src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
+1 -1
View File
@@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in and Join the Conversation
</button>
</div>
</div>
src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
+3 -3
View File
@@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in and Join the Conversation
</button>
</div>
</div>
@@ -292,7 +292,7 @@ exports[`renders comment stream 1`] = `
onTouchEnd={[Function]}
type="button"
>
Show all
Show All
</button>
</div>
</div>
@@ -437,7 +437,7 @@ exports[`show all replies 1`] = `
onTouchEnd={[Function]}
type="submit"
>
Sign in and join the conversation
Sign in and Join the Conversation
</button>
</div>
</div>
src/core/client/ui/components/BaseButton/BaseButton.css
-1
View File
@@ -1,6 +1,5 @@
.root {
composes: buttonReset from "talk-ui/shared/buttonReset.css";
text-transform: capitalize;
}
.keyboardFocus {
src/locales/en-US/auth.ftl
+2 -2
View File
@@ -4,7 +4,7 @@
signIn-signInToJoinHeader = Sign in to join the conversation
signIn-signInAndJoinButton = Sign in and join the conversation
signIn-signInAndJoinButton = Sign in to Join the Conversation
signIn-emailAddressLabel = Email Address
signIn-emailAddressTextField =
@@ -22,7 +22,7 @@ signIn-noAccountSignUp = Don't have an account? <button>Sign Up</button>
signUp-signUpToJoinHeader = Sign up to join the conversation
signUp-signUpAndJoinButton = Sign up and join the conversation
signUp-signUpAndJoinButton = Sign up and Join the Conversation
signUp-emailAddressLabel = Email Address
signUp-emailAddressTextField =
src/locales/en-US/stream.ftl
+4 -4
View File
@@ -17,13 +17,13 @@ general-userBoxAuthenticated-notYou =
comments-streamQuery-assetNotFound = Asset not found
comments-postCommentForm-submit = Submit
comments-stream-loadMore = Load more
comments-replyList-showAll = Show all
comments-stream-loadMore = Load More
comments-replyList-showAll = Show All
comments-permalinkButton-share = Share
comments-permalinkPopover-copy = Copy
comments-permalinkPopover-copied = Copied
comments-permalinkView-showAllComments = Show all comments
comments-permalinkView-showAllComments = Show All Comments
comments-permalinkView-commentNotFound = Comment not found
comments-rte-bold =
@@ -37,7 +37,7 @@ comments-rte-blockquote =
comments-poweredBy = Powered by <logo>{ -brand-name }</logo>
comments-postCommentFormFake-signInAndJoin = Sign in and join the conversation
comments-postCommentFormFake-signInAndJoin = Sign in and Join the Conversation
comments-postCommentForm-rteLabel = Post a comment