Merge branch 'master' into production-docker

This commit is contained in:
Cassie Tarakajian 2018-06-20 10:23:13 -07:00
commit d29be20395
2 changed files with 7 additions and 3 deletions

View file

@ -36,7 +36,9 @@ const defaultHTML =
<!-- Chroma --> <!-- Chroma -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/chroma-js/1.3.6/chroma.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/chroma-js/1.3.6/chroma.min.js"></script>
<!-- Jquery --> <!-- Jquery -->
<script src="http://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script> <script src="http://code.jquery.com/jquery-3.3.1.min.js"
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
crossorigin="anonymous"></script>
<!-- sketch additions --> <!-- sketch additions -->

View file

@ -14,7 +14,8 @@ export const renderResetPassword = (data) => {
noteText: 'If you did not request this, please ignore this email and your password will remain unchanged. Thanks for using the p5.js Web Editor!', // eslint-disable-line max-len noteText: 'If you did not request this, please ignore this email and your password will remain unchanged. Thanks for using the p5.js Web Editor!', // eslint-disable-line max-len
meta: { meta: {
keywords: 'p5.js, p5.js web editor, web editor, processing, code editor', keywords: 'p5.js, p5.js web editor, web editor, processing, code editor',
description: 'A web editor for p5.js, a JavaScript library with the goal of making coding accessible to artists, designers, educators, and beginners.' description: 'A web editor for p5.js, a JavaScript library with the goal'
+ ' of making coding accessible to artists, designers, educators, and beginners.'
} }
}; };
@ -45,7 +46,8 @@ export const renderEmailConfirmation = (data) => {
noteText: 'This link is only valid for the next 24 hours. Thanks for using the p5.js Web Editor!', noteText: 'This link is only valid for the next 24 hours. Thanks for using the p5.js Web Editor!',
meta: { meta: {
keywords: 'p5.js, p5.js web editor, web editor, processing, code editor', keywords: 'p5.js, p5.js web editor, web editor, processing, code editor',
description: 'A web editor for p5.js, a JavaScript library with the goal of making coding accessible to artists, designers, educators, and beginners.' description: 'A web editor for p5.js, a JavaScript library with the goal'
+ ' of making coding accessible to artists, designers, educators, and beginners.'
} }
}; };