Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Repo Link & Add Comment Length Validation #453

Merged
merged 20 commits into from
Jun 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5b9ffcf
Merge pull request #148 from grant-project/develop
dternyak Feb 1, 2019
38cc872
Merge pull request #221 from grant-project/develop
dternyak Feb 18, 2019
da8fae0
Merge pull request #224 from grant-project/develop
dternyak Feb 18, 2019
2bf7866
Merge pull request #270 from grant-project/develop
dternyak Feb 28, 2019
d929e26
Merge pull request #274 from grant-project/develop
dternyak Mar 1, 2019
4abf840
Merge pull request #386 from grant-project/develop
dternyak Mar 15, 2019
90fd441
Merge pull request #417 from grant-project/develop
wbobeirne Mar 28, 2019
75e8ff4
Merge pull request #424 from grant-project/develop
dternyak Apr 5, 2019
4f820db
Merge pull request #432 from grant-project/develop
dternyak Apr 28, 2019
a813a17
Merge pull request #438 from ZcashFoundation/develop
dternyak May 23, 2019
7eb1ef5
edit for heroku
dternyak May 24, 2019
a6586aa
edit for heroku
dternyak May 24, 2019
3acb9c1
more heroku tweak
dternyak May 24, 2019
5b13629
Merge pull request #440 from ZcashFoundation/develop
dternyak May 27, 2019
0c17259
Merge branch 'master' of https://github.com/dternyak/zcash-grant-system
dternyak May 27, 2019
b34ee97
Merge pull request #443 from ZcashFoundation/develop
dternyak May 28, 2019
86fba87
Merge branch 'master' of https://github.com/dternyak/zcash-grant-system
dternyak May 29, 2019
3d0e226
Add 1000 character max limit to comment textarea
dternyak Jun 6, 2019
ead19b3
Correct github issue link
dternyak Jun 6, 2019
493f379
undo README whitespace
dternyak Jun 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions frontend/client/components/MarkdownEditor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ const commands: { [key in MARKDOWN_TYPE]: ReactMdeProps['commands'] } = {
],
},
{
commands: [
ReactMdeCommands.linkCommand,
ReactMdeCommands.quoteCommand,
],
commands: [ReactMdeCommands.linkCommand, ReactMdeCommands.quoteCommand],
},
{
commands: [
Expand Down Expand Up @@ -104,7 +101,7 @@ export default class MarkdownEditor extends React.PureComponent<Props, State> {
const { randomKey, value, tab } = this.state;
return (
<div
ref={(el) => this.el = el}
ref={el => (this.el = el)}
className={classnames({
MarkdownEditor: true,
['is-reduced']: type === MARKDOWN_TYPE.REDUCED,
Expand All @@ -119,6 +116,7 @@ export default class MarkdownEditor extends React.PureComponent<Props, State> {
generateMarkdownPreview={this.generatePreview}
commands={commands[type]}
readOnly={!!readOnly}
textAreaProps={{ maxLength: 1000 }}
minEditorHeight={minHeight}
minPreviewHeight={minHeight - 10}
maxEditorHeight={99999}
Expand Down
2 changes: 1 addition & 1 deletion frontend/client/static/markdown/CONTACT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

* You may reach out to the Zcash Foundation by emailing us at [email protected]
* You can find us on twitter at https://twitter.com/zcashfoundation
* You can contribute or report issues at https://github.com/zcashfoundation
* You can contribute or report issues at https://github.com/ZcashFoundation/zcash-grant-system/issues