Commit graph

1373 commits

Author SHA1 Message Date
Cassie Tarakajian
66944c6f25 add script to backup mongodb 2016-11-16 14:41:40 -05:00
Cassie Tarakajian
26bebc1fb8 Merge branch 'master' into development 2016-11-16 13:19:21 -05:00
Cassie Tarakajian
81475c0e16 Squashed commit of the following:
commit fb5e82cea930b011792983c7d1cc9f6ecacc7dd4
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 16 12:28:10 2016 -0500

    add server side rendering, untested

commit 5c60fb30c46ea49a8d9a0ecb56f39ec778464a8b
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 18:26:06 2016 -0500

    add redux-form bandage post react update, should probably update to redux-form 6 at some point

commit 057b5871e7137179abc93f7821a9690f0ea52c92
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 16:30:09 2016 -0500

    remove passing jsFiles and cssFiles to PreviewFrame, fix rendering bug

commit 88c56fd36d3a8d88902c79642171988ce37825f2
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 16:21:59 2016 -0500

    code cleanup, untested

commit 82e5dcf8bca461892f1daf06d38f1eaebe72983f
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 15:53:50 2016 -0500

    update react and react router, fix a few bugs in rendering code, add ability to parse inline js and css

commit e02f4b67803ea45328eff4e53659222f3149964c
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 14:43:38 2016 -0500

    add almost full code to create preview html correctly, untested

commit 12f61b2a1aed4607fab24d01572b647ca6210262
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 2 17:09:26 2016 -0400

    refactor some of the preview html generation code

commit 111825846703d5c8959cb18795a3aadb7ebe505c
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 2 11:06:36 2016 -0400

    add comments as plan of action

commit 1cc2cf5203674732b4057382f1937de38b687078
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Thu Oct 27 19:34:55 2016 -0400

    add href parsing

commit e67189298cda9b70645f454ecd541a363980f0e4
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Thu Oct 27 10:48:36 2016 -0400

    continue parsing html

commit 1458fb940a15a3dc5d74890211a3073e920b84b8
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Oct 26 17:40:31 2016 -0400

    start to add html parsing
2016-11-16 13:18:46 -05:00
Cassie Tarakajian
fc937a87bb Merge branch 'master' into development 2016-11-16 13:17:20 -05:00
Cassie Tarakajian
5e0216f2ec Squashed commit of the following:
commit fb5e82cea930b011792983c7d1cc9f6ecacc7dd4
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 16 12:28:10 2016 -0500

    add server side rendering, untested

commit 5c60fb30c46ea49a8d9a0ecb56f39ec778464a8b
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 18:26:06 2016 -0500

    add redux-form bandage post react update, should probably update to redux-form 6 at some point

commit 057b5871e7137179abc93f7821a9690f0ea52c92
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 16:30:09 2016 -0500

    remove passing jsFiles and cssFiles to PreviewFrame, fix rendering bug

commit 88c56fd36d3a8d88902c79642171988ce37825f2
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 16:21:59 2016 -0500

    code cleanup, untested

commit 82e5dcf8bca461892f1daf06d38f1eaebe72983f
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 15:53:50 2016 -0500

    update react and react router, fix a few bugs in rendering code, add ability to parse inline js and css

commit e02f4b67803ea45328eff4e53659222f3149964c
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 14:43:38 2016 -0500

    add almost full code to create preview html correctly, untested

commit 12f61b2a1aed4607fab24d01572b647ca6210262
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 2 17:09:26 2016 -0400

    refactor some of the preview html generation code

commit 111825846703d5c8959cb18795a3aadb7ebe505c
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 2 11:06:36 2016 -0400

    add comments as plan of action

commit 1cc2cf5203674732b4057382f1937de38b687078
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Thu Oct 27 19:34:55 2016 -0400

    add href parsing

commit e67189298cda9b70645f454ecd541a363980f0e4
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Thu Oct 27 10:48:36 2016 -0400

    continue parsing html

commit 1458fb940a15a3dc5d74890211a3073e920b84b8
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Oct 26 17:40:31 2016 -0400

    start to add html parsing
2016-11-16 13:16:39 -05:00
Cassie Tarakajian
04922522cc cool to share some of this code between client and server
Squashed commit of the following:

commit fb5e82cea930b011792983c7d1cc9f6ecacc7dd4
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 16 12:28:10 2016 -0500

    add server side rendering, untested

commit 5c60fb30c46ea49a8d9a0ecb56f39ec778464a8b
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 18:26:06 2016 -0500

    add redux-form bandage post react update, should probably update to redux-form 6 at some point

commit 057b5871e7137179abc93f7821a9690f0ea52c92
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 16:30:09 2016 -0500

    remove passing jsFiles and cssFiles to PreviewFrame, fix rendering bug

commit 88c56fd36d3a8d88902c79642171988ce37825f2
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 16:21:59 2016 -0500

    code cleanup, untested

commit 82e5dcf8bca461892f1daf06d38f1eaebe72983f
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 15:53:50 2016 -0500

    update react and react router, fix a few bugs in rendering code, add ability to parse inline js and css

commit e02f4b67803ea45328eff4e53659222f3149964c
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 14:43:38 2016 -0500

    add almost full code to create preview html correctly, untested

commit 12f61b2a1aed4607fab24d01572b647ca6210262
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 2 17:09:26 2016 -0400

    refactor some of the preview html generation code

commit 111825846703d5c8959cb18795a3aadb7ebe505c
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 2 11:06:36 2016 -0400

    add comments as plan of action

commit 1cc2cf5203674732b4057382f1937de38b687078
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Thu Oct 27 19:34:55 2016 -0400

    add href parsing

commit e67189298cda9b70645f454ecd541a363980f0e4
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Thu Oct 27 10:48:36 2016 -0400

    continue parsing html

commit 1458fb940a15a3dc5d74890211a3073e920b84b8
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Oct 26 17:40:31 2016 -0400

    start to add html parsing
2016-11-16 13:12:36 -05:00
Mathura MG
ced885d03f Add multiple canvas text outputs (#197)
* added grid

* add table to textoutput

* add all three outputs

* add shortcuts

* fix sound bug for triangle

* fix triangle bug - again
2016-11-12 11:53:02 -05:00
Cassie Tarakajian
ddc4fb32b1 injects S3 CSS/JS files properly into preview, as found in #196 2016-11-11 17:36:19 -05:00
Cassie Tarakajian
167828b872 fix #185 2016-11-10 18:49:42 -05:00
Cassie Tarakajian
66b83df0f2 fix #180, relates to #185 in that the user is redirected to where they were post signup/login 2016-11-10 16:13:00 -05:00
Cassie Tarakajian
c959aec6a9 add commit to hopefully prevent #195 from happening again 2016-11-10 12:26:35 -05:00
Mathura MG
b3ac90a4c6 Change text output content (#194)
* make output less verbose

* fix bug in setup

* remove log; fix area

* fix type casting
2016-11-09 13:16:14 -05:00
Yining Shi
e86e9a0ae0 Added a star icon for unsaved file name, added 'Saved: xx time ago' (#177)
* added a star icon for unsaved file name, added saved time ago

* changed text

* added timer component

* clean extra styling in _editor.sass

* customize momentjs fromnow function

* clear 10s interval in componentWillUnmount

* use space-between instead of float
2016-11-09 12:52:14 -05:00
Cassie Tarakajian
33582a1a2e change nav extension to jsx 2016-11-08 19:04:08 -05:00
Cassie Tarakajian
fc83040c8f remove some dead code/files, change react components to .jsx files because of sublime syntax highlighting, fix linting errors 2016-11-08 18:54:54 -05:00
Cassie Tarakajian
f40ecebfba #142 add webpack configuration to decrease loading speed 2016-11-08 18:11:12 -05:00
Cassie Tarakajian
2750b1f0ef #189 i have literally been putting this off for months but i finally figured out now to resolve file paths \ 😄 / 2016-11-08 16:50:21 -05:00
Cassie Tarakajian
081c7d521e #189 load text files from server via filename, does not work for file paths 2016-11-08 14:42:23 -05:00
Cassie Tarakajian
77e2f5bfff fix #186 2016-11-08 13:30:41 -05:00
Cassie Tarakajian
c7483b5d3a fix #190, also fix bug in which fontSize and indentation amount could be NaN 2016-11-08 13:11:07 -05:00
Mathura MG
d082ada1fd Add keyboard shortcut for text based output (#193)
* add shortcuts

* add keyboard shortcut for text based output

* remove duplicate
2016-11-08 12:39:46 -05:00
Cassie Tarakajian
41c1613d10 fix #191 2016-11-04 18:54:14 -04:00
Cassie Tarakajian
dd01aeb599 fix #188 2016-11-04 17:31:04 -04:00
Cassie Tarakajian
33c7c0ec8f fix #187 2016-11-04 17:27:39 -04:00
Cassie Tarakajian
7ededa5c18 #143 revert not printing to console if it is not expanded 2016-11-02 22:41:10 -04:00
Cassie Tarakajian
23fb53bc9b fix bug where you could save another user's sketches with keyboard shortcut 2016-11-02 22:19:05 -04:00
Cassie Tarakajian
d33b6a354f #143 handle undefined console messages 2016-11-02 19:26:13 -04:00
Cassie Tarakajian
b06fb4cb80 change p5.js password reset email 2016-11-02 18:08:28 -04:00
Jen Kagan
93f871e857 Add the word "copy" to sketch name after duplicating (#176)
* starting to work on clone project

* adds the word *copy* to sketches that have been dupicated
2016-11-02 17:35:47 -04:00
Cassie Tarakajian
3a8e67d484 fixes #178 2016-11-02 17:28:06 -04:00
Cassie Tarakajian
588668886d update default version of p5 to 5.4 2016-11-02 15:06:28 -04:00
Cassie Tarakajian
64b4fd41d1 #174 increase loopprotect time to 500ms 2016-11-02 15:00:26 -04:00
Cassie Tarakajian
85b8f5b589 fixes #96, downloads now work on safari and firefox 2016-11-02 14:08:53 -04:00
Cassie Tarakajian
a06369ab06 add font uploads 2016-11-02 11:42:59 -04:00
Cassie Tarakajian
2645e13786 change full screen view to embed view 2016-11-02 11:12:07 -04:00
Cassie Tarakajian
1e32e42729 change max file upload size to 5MB 2016-10-28 16:19:56 -04:00
Yining Shi
83b077450a Showing "Autosave enabled" toast (#173)
* showing Autosave enabled toast

* fixed variable names

* fixed constant name typo
2016-10-27 19:45:09 -04:00
Cassie Tarakajian
8ce36cd997 update pencil to modern pictograms 2016-10-26 17:49:42 -04:00
Jen Kagan
476a4a4d20 Add pen icon next to sketch name (#171)
* add pencil icon, start wiring toolbar

* Closes #156
2016-10-26 17:40:10 -04:00
Cassie Tarakajian
b48cf1ebdc parse CSS files for links to S3 2016-10-25 18:38:20 -04:00
Cassie Tarakajian
17fab1782e fixes #162 2016-10-25 17:05:53 -04:00
Cassie Tarakajian
315e83c593 fix #152, puts a limit on the local file size 2016-10-25 15:51:44 -04:00
Cassie Tarakajian
61925b67e4 show error messages for invalid files 2016-10-24 21:15:32 -04:00
Cassie Tarakajian
7cba11f90c add video upload support 2016-10-24 18:25:57 -04:00
Cassie Tarakajian
5c050e078b add uploader support for obj files 2016-10-24 18:01:14 -04:00
Cassie Tarakajian
aae72ea57d add ability to use svgs 2016-10-24 17:40:03 -04:00
Cassie Tarakajian
99df998e11 add csv, don't include s3 js/css/json/txt/csv files as blobs 2016-10-24 17:05:49 -04:00
Cassie Tarakajian
1d7aaa9981 set unsaved changes when file is uploaded 2016-10-24 16:42:15 -04:00
Cassie Tarakajian
8aeb044509 fix bug where plaintext files were being posted to s3 2016-10-24 16:33:16 -04:00
Cassie Tarakajian
8c270c2ced generate blob urls for text and json files 2016-10-22 16:42:43 -04:00