r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity
1446 commits 4 branches 1 tag 27 MiB
Commit graph

731 commits

Author SHA1 Message Date
Ankur Ingale
80765e03c7 Fixed Issue #659 (#964) 
* Fixed Issue #659

* Undo changes in package.json and package-lock.json

* Resolved error
 2019-03-21 17:08:46 -04:00
siddhant
98d7933dee Added length cap to sketch name (#944) 2019-03-20 16:32:01 -04:00
Gaurang Tandon
1b468aa4ec fixes #795 (#935) 
* fixes #795

* fix lint
 2019-03-20 14:28:15 -04:00
Cassie Tarakajian
1d2cb87c33 for #874, also fixes bug in which file options could be revealed by right clicking even if user isn't owner of sketch 2019-03-14 16:10:50 -04:00
nimish
a018929489 Remove file menu on blur 2019-03-13 18:10:47 +05:30
Nimish Agrawal
87c012b9f6 Autofocus on Add File menu (#882) 2019-03-12 16:17:27 -04:00
Cassie Tarakajian
d9670f7bc3
fixes #865 (#869) 2019-03-05 16:25:34 -05:00
siddhant1
b6e2c4c983 Migrated from momentjs to date-fns 2019-03-02 15:05:40 +05:30
Oliver Wright
e37926de74 Refactor Toolbar Props - See #824 (#849) 2019-03-01 16:21:00 -05:00
Cassie Tarakajian
74ec1ba5bf
fixes #725 by updating jshint (#848) 2019-02-25 16:52:07 -05:00
Cassie Tarakajian
2cc0d578fb
for #790, when saving a sketch, pull from codemirror window (#847) 
* for #790, when saving a sketch, pull from codemirror window

* fix lint errors
 2019-02-25 16:45:20 -05:00
Oliver Wright
61f20d1d4c Refactor Nav Props - See #824 (#846) 2019-02-25 15:11:07 -05:00
Oliver Wright
5fdcd08add Use File id in Redux Actions - Fixes #842 (#844) 
Prevents file name collisions that are possible with the folder
system.
 2019-02-25 12:57:10 -05:00
Cassie Tarakajian
f1b6aab749 fixes #826 2019-02-20 16:03:18 -05:00
Oliver Wright
d0832ea4b7 Prevent crash when console.error is used - Fixes #833 (#834) 2019-02-20 15:57:37 -05:00
Cassie Tarakajian
7bd016bac3
fixes #785, update node, and everything else that comes along with that (#810) 2019-01-16 17:56:18 -05:00
Cassie Tarakajian
437ffba378
fixes #802 (#809) 2019-01-16 12:35:34 -05:00
Peter Blazejewicz
fe950192e7 Fix ESLint errors (#793) 
This fixes failing `npm run lint`:

- fixes `max-len` issue in code by reformat of the expression
- exempt ES6 template literals from `max-len` rule using ESLint
  configuration change

Thanks!
 2019-01-08 17:38:02 -05:00
Cassie Tarakajian
244af16b64
For #675, needs more testing to know if it fixes it! (#784) 
* for #675

* fix linting errors
 2018-12-13 17:06:34 -05:00
Cassie Tarakajian
eebe9d9252
fixes #777 (#782) 2018-12-12 14:43:28 -05:00
Cassie Tarakajian
b68e3a79fd for #687 2018-11-26 18:08:24 -05:00
Cassie Tarakajian
ef98190e25 for #769 2018-11-20 18:00:54 -05:00
Cassie Tarakajian
b70d62164c for #761, add source back to console messages 2018-11-15 17:19:50 -05:00
Cassie Tarakajian
00ea3bc281 Revert "Revert "for #761, fix linting errors"" 
This reverts commit ef7231fe03.
 2018-11-15 16:41:10 -05:00
Cassie Tarakajian
28d7947910 Revert "Revert "fixes #761, but fixes the bigger issue at hand here, which is that log messages were not getting deserialized properly"" 
This reverts commit f1bc7293ce.
 2018-11-15 16:40:37 -05:00
Cassie Tarakajian
f1bc7293ce Revert "fixes #761, but fixes the bigger issue at hand here, which is that log messages were not getting deserialized properly" 
This reverts commit 661a367b72.
 2018-11-15 15:55:02 -05:00
Cassie Tarakajian
ef7231fe03 Revert "for #761, fix linting errors" 
This reverts commit 8952d760d0.
 2018-11-15 15:54:31 -05:00
Cassie Tarakajian
8952d760d0 for #761, fix linting errors 2018-11-15 14:43:36 -05:00
Cassie Tarakajian
661a367b72 fixes #761, but fixes the bigger issue at hand here, which is that log messages were not getting deserialized properly 2018-11-15 14:26:31 -05:00
Bhawesh Bhansali
61dd0bb4d0 [WIP] Set min & max limits on font-size (#716) 
* Set min & max limits on font-size

Disable the font-size setting button when extremum is reached.

References https://github.com/processing/p5.js-web-editor/issues/689

* handle case for user input to input field, also add min and max for indentation amount
 2018-11-02 15:55:06 -04:00
Joey Lee
25bf5ad636 Removed Console.log in client/.../ Project.js to prevent logging user data to console fixes #749 (#750) 
* replaced () with {} to fix implicit return error

* added first version of fetching generative-design examples

* ignore local testing files

* formatting

* updated examples-gg-latest

* updated examples-gg-latest.js

- data files not served via rawgit - hallelujah!
- added jquery

* updated p5 version

* refactoring and code cleanup

* added comment

* comment out link to svgFiles - unused

* moved commented code

* fixed conflicts

* linted examples-gg-latest

* removed console.log of response.data to prevent logging user data to console

* fixed linting error
 2018-11-01 14:59:28 -04:00
anaplian
319e68ddb6 Fix async validation in signup form (fixes #742) (#746) 2018-10-29 19:33:37 -04:00
Cassie Tarakajian
de74c0cac8 fixes #516, sets console lines limit to 500 2018-10-25 18:04:18 -04:00
Cassie Tarakajian
5196a37807 fix linting error caused by 8b2133e 2018-10-23 16:14:27 -04:00
Cassie Tarakajian
8b2133ea99 fixes #740 2018-10-23 16:07:32 -04:00
Cassie Tarakajian
8baec106aa revert for #684 2018-10-22 17:48:02 -04:00
Nitesh Sawant
121bf94007 fixes #726 (#728) 
* fixes #726

* Disabled Sumit butto nif form is not touched & used tri function instead of replace
 2018-10-22 15:41:35 -04:00
Basile Pesin
55dfd7e328 Fixed my scrollbar mistake (#736) 
* Fixed my scrollbar mistake

* Really fixed it by introducing a slightly different class for the fullview frame

* Using classnames module
 2018-10-22 14:59:08 -04:00
Cassie Tarakajian
f417ff4c90 for #684 2018-10-22 12:45:16 -04:00
Basile Pesin
996a1b988a Fixes #692 (#713) 
* Got the basis covered, now I need to style all this

* Corrected and upgraded Share window

* Changed the routes again, and set correct design

* Made some of the requested changes

* Removed PreviewFrame errors

* Redesigned Preview Header

* Corrected style of the FullView

* Corrected most of the css mistakes

* Corrected logo size
 2018-10-18 14:10:37 -04:00
Cassie Tarakajian
474c843e8a Merge branch 'bugfix/680-preview-dimensions' of https://github.com/bendman/p5.js-web-editor into bendman-bugfix/680-preview-dimensions 2018-10-17 15:27:57 -04:00
Cassie Tarakajian
d15e5d0da5 fixes #715 in an extremely hacky way 🤷‍♀️, fixes another error in which when changing the font size, linting highlighting was misaligned 2018-10-10 17:40:47 -04:00
Meru Patel
19bffe58cf Fixes #712 (#718) 
* added matchbrackets

* Added css for matching brackets
 2018-10-08 13:14:59 -04:00
cdncat
e83654f6ad Fixes #717 (#720) 
* remove npm run lint warnings, fixes #717

* Update link for Code of Conduct in CONTRIBUTING.md
 2018-10-05 15:35:31 -04:00
Bhawesh Bhansali
cf5cb1f6e9 components/Editor.jsx: Allow indentation on entering new line (#710) 
indentUnit updated on settings->indentation amount change

Fixes https://github.com/processing/p5.js-web-editor/issues/700
 2018-10-04 13:36:42 -04:00
Cassie Tarakajian
3ecb6fb80f
Merge pull request #690 from Janglee123/master 
[WIP]Fixes #677
 2018-10-02 20:49:02 -04:00
Meru Patel
9f6ce5fa8d alignment fix 2018-09-23 12:26:39 +05:30
Cassie Tarakajian
a1d2acbe9b Merge branch 'master' into production-docker 2018-09-17 14:53:58 -04:00
Cassie Tarakajian
51116bf0d0 fixes #696, update default p5.js to latest version 2018-09-17 14:53:46 -04:00
Meru Patel
de9749b892 lint fixes 2018-09-16 14:27:05 +05:30
Meru Patel
a8261350c9 perfectly aligned 2018-09-16 14:24:48 +05:30
Meru Patel
5a8d814228 css update 2018-09-16 14:15:40 +05:30
Meru Patel
b8f858ae70 misaligned height and logged number size fix 2018-09-15 23:39:48 +05:30
Meru Patel
14d01ae01c misaligned height and logged number size fix 2018-09-15 23:33:42 +05:30
Meru Patel
7777e25990 minor changes 2018-09-14 22:14:41 +05:30
Meru Patel
80d77a6860 scalable svg icons 2018-09-14 13:41:38 +05:30
Meru Patel
d3be437dce size related changes 2018-09-13 23:44:58 +05:30
Meru Patel
b8f43dec78 variable added 2018-09-13 21:20:07 +05:30
Meru Patel
28e7425fb8 small error fix 2018-09-13 07:42:50 +05:30
Meru Patel
2f48413b08 explanation removed 2018-09-13 07:37:43 +05:30
Meru Patel
f2c32e89a6 variable name change 2018-09-13 07:30:19 +05:30
Meru Patel
c676fae7bf lint error fix 2018-09-12 10:54:05 +05:30
Meru Patel
7a44cceb65
Fixes #677 2018-09-12 10:35:15 +05:30
Meru Patel
2475467dd0 Fixes #677 2018-09-12 10:30:29 +05:30
bendman
ffa4ac145a Fixes #680 by adjusting canvas and iframe layout 
- Set the preview canvas to `display:block` to remove vertical spacing
caused by the default value, which was making a full-height canvas cause
vertical scrolling, and the vertical scrollbar caused horizontal
scrolling
- Wrap the preview content in a container with `position:relative` and
no other visible content, so that the full-height iframe excludes the
height of the preview frame header, preventing it from going beyond the
height of the page
 2018-09-08 11:50:39 -07:00
Cassie Tarakajian
cea61a79f5 Merge branch 'master' into production-docker 2018-09-07 15:48:43 -04:00
Jared Donovan
2f21130e0d Fix needs saving mark 2 - for #576 (#658) 
* Comment out show/hide file options action creators.

* Comment out show/hide file options properties

* Comment out show/hide file options action definitions

* Comment out constants for show/hide options action types

* Comment out props for show/hide options and replace with component state.

* Comment out show/hide edit file name reducers.

* Comment out show/hide edit file name actions.

* comment out show/hide edit file name action types.

* Comment out show/edit file name props from IDEView component

* Replace show/hide edit filename props in FileNode component with local state

* Remove commented out code from previous changes for moving redux state back into component state.

* Add binding to this for new functions. And tidy up of code.
 2018-09-07 15:48:25 -04:00
Cassie Tarakajian
7cb2847b94 fix error with undefined env S3_URL_BUCKER_BASE 2018-08-30 19:35:03 -04:00
Cassie Tarakajian
5e70d8bb86 Merge branch 'master' into production-docker 2018-08-29 15:06:59 -04:00
Cassie Tarakajian
4a2d6d3035 fixes #668 2018-08-29 15:06:41 -04:00
Cassie Tarakajian
2c09b082df Merge branch 'master' into production-docker 2018-08-29 14:54:24 -04:00
Cassie Tarakajian
1451c3ff70 update p5.js version 2018-08-29 14:54:09 -04:00
Cassie Tarakajian
d44027c58e for simplicity and security, remove redirect to HTTP and keep everything on HTTPS 2018-08-27 14:37:31 -04:00
Cassie Tarakajian
6705e4c3f8 load client-side environment variables at runtime 2018-08-24 17:41:23 -04:00
Cassie Tarakajian
aeeeda23a2 fix #671, change forum url 2018-08-20 12:26:21 -04:00
Luis Morales-Navarro
3e97360c82 Update name of table output (#670) 2018-08-10 14:09:55 -04:00
Liang Tang
bee02e01ab bug fixes (#666) 2018-07-31 13:07:19 -04:00
Liang Tang
617f00653c Improve current console (#656) 
* init v2

* make replay work

* fix a failing scenary of react-frame

* fix some bugs

* delete/comment some files

* remove

* fix some bugs && remove more comments

* remove unnecessary lines

* minor tweak

* fix some bugs

* try to hook iframe using webpack

* update

* changes according to cassie

* minor tweak

* fix lint

* extract sass

* add icons

* update webpack config

* update webpack configuration

* update

* tweak

* fix a small bug
 2018-07-30 12:20:57 -04:00
Cassie Tarakajian
9958619fc4 fixes #630 and updates codemirror 2018-05-30 15:23:32 -07:00
Liang Tang
d5856ba923 Remove authorization from specific routes (#642) 
* fixes #569

* update listObjectsInS3ForUser

* update client-side routes

* update aws controller

* update

* redirect to /login when unlogged in
 2018-05-29 21:37:10 -07:00
Liang Tang
29dde4776c fixes #588 (#629) 2018-05-11 17:08:15 -07:00
Cassie Tarakajian
593621af62 fixex #627 2018-05-09 10:34:36 -07:00
Cassie Tarakajian
9285d2bf95 fix lint warning 2018-05-08 19:16:05 -07:00
Cassie Tarakajian
9efd9c624f fix remaining linting errors 2018-05-08 19:16:05 -07:00
Cassie Tarakajian
617cffc869 fix many linting errors 2018-05-08 19:16:04 -07:00
Cassie Tarakajian
90c76c1d08 fix linting errors 2018-05-08 19:16:04 -07:00
Cassie Tarakajian
bd303b7710 fix even more linting errors 2018-05-08 19:16:04 -07:00
Cassie Tarakajian
5057a901fe fix a few linting errors 2018-05-08 19:16:04 -07:00
Cassie Tarakajian
c90dac55b7 update eslint and fix linting errors 2018-05-08 19:16:04 -07:00
Cassie Tarakajian
f9d1c601b3 move around static and dist folders to work with server bundle, and make preview generation work with this 2018-05-08 19:16:03 -07:00
Cassie Tarakajian
96646d0d73 update references to p5.js to latest version 2018-05-02 12:44:16 -07:00
Cassie Tarakajian
52b6a6bbb4 minor changes to SCSS styles 2018-04-18 14:00:53 -07:00
Madhurjya Pegu
307091ad3c Solving #553 Addition of google oauth 2.0 for easy login (#608) 
* google oauth added

* google credentials 

updated .env description for google oauth

* changes done wrt review
 2018-04-18 13:38:02 -07:00
Mathura MG
55d8722a02 update p5.accessibility to v0.1.1 (#612) 2018-04-02 17:58:55 -07:00
Luis Morales-Navarro
a4e426f2ce update p5-accessibility.js v0.1.0 (#607) 2018-03-23 12:26:43 -04:00
Himanshu
087b378e58 fixes #441 (#599) 2018-03-12 11:37:28 -04:00
Mathura MG
c9192857cb change accessibility url (#596) 2018-03-06 13:40:03 -05:00
Mr.tang
43f482ab48 fix some bugs in #561 (#578) 2018-03-02 12:26:20 -05:00
Mr.tang
4e5c58595f [WIP] display the script error caused by external library (#579) 
* show the script error

* modify error message

* analyze the error stack
 2018-03-02 12:06:36 -05:00
Himanshu
e7505f8205 Issue overlay (#577) 
* fixes #384

Positioning and font-size was off.

* Added consistent styling

* Further Changes.

* removed line height.

* fixes #371

* Made minor semantic and code consistency changes.

* anchor tag removed
 2018-03-02 11:40:31 -05:00
Mathura MG
3acefe4709 Remove accessibility CSS; Auto focus (#583) 
* Change accessibility example links

* added library to iframe

* changed preview to add accessible elements to iframe

* add library only when accesible output is seleceted

* focus on iframe when plaing

* css

* deleted accessibleOutput.jsx and edited IDEView to integrate accessibility library

* deleted comments

* fix package

* Moved CSS to library and removed section from file.js (#2)

* Remove gitmodule (#509)


* remove git modules

* removed submodule and replaced interceptor for library

* removed submodule and replaced interceptor for library (#510)

* deleted comments

* deleted jquery

* deleted interceptor folder

* delete interceptor

* added jquery

* removed jquery and updated accessible library cdn

* Fixes #508 (#539)

* removed submodule and replaced interceptor for library

* deleted comments

* deleted jquery

* deleted interceptor folder

* delete interceptor

* added jquery

* removed jquery and updated accessible library cdn

* remove empty divs from files.js

* fix merge error

* remove empty divs from files.js

* Fixes #508  (#545)

* removed submodule and replaced interceptor for library

* deleted comments

* deleted jquery

* deleted interceptor folder

* delete interceptor

* added jquery

* removed jquery and updated accessible library cdn

* remove empty divs from files.js

* fix merge error

* remove empty divs from files.js

* moved accessible output css

* removed css, added aria-label, preliminary cdn update

* removed section from iframe

* updated cdn

* add autofocus; remove CSS
 2018-03-01 13:28:43 -05:00
Dhruvdutt Jadhav
3efe3d20f7 chore: fix linting issues (#570) 2018-02-26 15:05:02 -05:00
Mr.tang
287663494a Make saving more user-friendly (#561) 
* enhance saving

* remove console

* rename

* duplicate when saving others' projects

* fix a bug
 2018-02-23 11:55:14 -05:00
Mr.tang
61560b87f7 Fixes #554 (#559) 
* update title

* update titles

* delete unnecessary line
 2018-02-23 11:31:41 -05:00
Luis Morales-Navarro
24b0be629f Accessibility - Transition from interceptor to accessibility library (#508) 
* added library to iframe

* changed preview to add accessible elements to iframe

* add library only when accesible output is seleceted

* focus on iframe when plaing

* css

* deleted accessibleOutput.jsx and edited IDEView to integrate accessibility library

* deleted comments

* Remove gitmodule (#509)


* remove git modules

* removed submodule and replaced interceptor for library (#510)

* Fixes #508 (#539)

* removed submodule and replaced interceptor for library

* deleted comments

* deleted jquery

* deleted interceptor folder

* delete interceptor

* added jquery

* removed jquery and updated accessible library cdn

* Fixes #508  (#545)

* removed submodule and replaced interceptor for library

* deleted comments

* deleted jquery

* deleted interceptor folder

* delete interceptor

* added jquery

* removed jquery and updated accessible library cdn

* remove empty divs from files.js

* fix merge error

* remove empty divs from files.js

* Fixes #508 (#548)

* removed submodule and replaced interceptor for library

* deleted comments

* deleted jquery

* deleted interceptor folder

* delete interceptor

* added jquery

* removed jquery and updated accessible library cdn

* remove empty divs from files.js

* fix merge error

* remove empty divs from files.js

* moved accessible output css
 2018-02-22 16:47:25 -05:00
Mr.tang
3a0139340c Fixes #470 #419 #437 (#546) 
* add status check

* rename variables and remove unnecessary dependencies

* set unsavedchange when error happens

* set unsavedchange when error happens
 2018-02-20 14:44:07 -05:00
Mr.tang
0a1c8bb26f enhance cm (#547) 2018-02-16 11:56:44 -05:00
Himanshu
1969c48cce fixes #537 (#544) 
Commented out hello p5 video page.
Did not remove the features as it can be used again after revamping the hello p5 page.
 2018-02-15 14:43:32 -05:00
Mr.tang
6f5472020c Fixes #517 (#530) 
* update download file's name

* fix lint error

* use moment.js

* slugify filename

* fix lint error
 2018-02-13 11:28:06 -05:00
Cassie Tarakajian
9f25a9ea6a fix github link to link to new issue, not just repo root 2018-02-09 17:55:33 -05:00
Cassie Tarakajian
daeed8749d
fixes #528 (#536) 2018-02-09 16:32:06 -05:00
Mr.tang
dcdb81aa80 make loop protect work (#535) 2018-02-09 12:46:47 -05:00
Mr.tang
193b15e074 fix console.error crash (#532) 2018-02-08 17:40:21 -05:00
Dhruvdutt Jadhav
e7abb55ee7 Fixes #515 Update React to 16 and other dependencies (#519) 
* Update to react, react-dom 16.2.0

* Update react-redux

* Update react-tabs

* Update redux-devtools

* Update redux-devtools-dock-monitor

* Update redux-devtools-log-monitor

* Add prop-types package

* Update gitignore

* Update all files to use prop-types package

* Update react-router

* Update react-inlinesvg
 2018-02-07 13:06:07 -05:00
Chris Hallberg
62670e6dda Add allow-modals to iframe, allowing alert and prompt. Discussed in Issue #507. (#518) 2018-02-07 12:47:25 -05:00
Cassie Tarakajian
86318795ef update p5 versions to latest 2018-02-01 17:17:05 -05:00
Cassie Tarakajian
d2b7f75cfd
fixes #475 (#512) 2018-02-01 17:16:54 -05:00
Cassie Tarakajian
6cd71acb81
update list of mime types and move to common server and client file (#511) 
Fixes #476 and fixes #450
 2018-02-01 16:45:19 -05:00
Francis Li
76a81bb1a0 Fixes #497 by adding support for an optional new env variable, S3_BUCKET_URL_BASE (#499) 
* Fixes #497 by adding support for an optional new env variable, S3_BUCKET_URL_BASE

* Add a section to README about optional S3 bucket URL base configuration.
 2017-12-13 14:56:24 -05:00
Cassie Tarakajian
bdd8df6301 remove https from toolbar 2017-11-14 17:47:16 -05:00
Cassie Tarakajian
9fcef30053 remove commented out code 2017-11-14 17:03:55 -05:00
Cassie Tarakajian
929404a037 fix lint warning 2017-11-14 17:03:16 -05:00
Cassie Tarakajian
c99c867021 almost finished with preferences styling 2017-11-14 16:27:42 -05:00
Cassie Tarakajian
ca80308bc2 continue to fix preferences styles 2017-11-14 15:27:00 -05:00
Cassie Tarakajian
9587d01908 start to add preferences styling 2017-11-13 19:09:08 -05:00
Cassie Tarakajian
9f9b09b99d clean up ideview page 2017-11-13 14:44:23 -05:00
saumya1906
9c655122b2 Adjusted tabs and added serve over https checkbox 2017-11-06 17:41:56 -05:00
saumya1906
9ae27faf55 Issue 266: Changed class name 2017-11-06 17:41:56 -05:00
saumya1906
147128ed40 Issue 266: More Design Changes 2017-11-06 17:41:56 -05:00
saumya1906
67dd614651 Issue 266: Sketch Settings design 2017-11-06 17:41:56 -05:00
saumya1906
6b6ff7ca22 Issue 266: Tabs added 2017-11-06 17:41:55 -05:00
saumya1906
6f068b5503 Issue 266 2017-11-06 17:41:55 -05:00
Cassie Tarakajian
9297496a5e change instance of adding loopProtect to this.jsPreprocess 2017-11-01 16:47:43 -04:00
Cassie Tarakajian
a043dc16fe Merge branch 'syntax-errors' of https://github.com/boazsender/p5.js-web-editor into boazsender-syntax-errors 2017-10-30 17:48:40 -04:00
Cassie Tarakajian
9e11aa3149 remove tooltip delay 2017-10-30 17:38:30 -04:00
Cassie Tarakajian
d121c2c882 fix and finish #391 2017-10-30 17:25:05 -04:00
Cassie Tarakajian
d48d9349a8 start to restyle share modal 2017-10-30 17:25:05 -04:00
Cassie Tarakajian
fd284358c2 fix #466 2017-10-30 15:36:09 -04:00
Andy Lulham
c517423915 Link to p5js.org/learn/ on about page (#465) 2017-10-30 14:53:54 -04:00
Boaz Sender
a69cf8b916 make syntax error checking more reusable per feedback from @catarak 2017-10-26 13:48:01 -04:00
Boaz Sender
8e63b3204d resolves behavior in #428 where syntax errors in auto refresh mode are unrecoverable 2017-10-21 17:22:16 -04:00
Cassie Tarakajian
24030ac7aa Merge branch 'master' into zrispo-feature-runtime-error-highlight 2017-10-12 16:23:31 -04:00
Cassie Tarakajian
68d72771d2 remove extraneous console log 2017-10-12 16:21:17 -04:00
Cassie Tarakajian
1363a7a0c3 add missing linting markers 2017-10-12 16:19:18 -04:00
Cassie Tarakajian
0989ff29eb fix other merge conflict errors 2017-10-12 15:38:02 -04:00
Cassie Tarakajian
53f7217786 fix merge conflicts 2017-10-12 15:00:11 -04:00
Cassie Tarakajian
1f86eb6711 Merge branch 'master' into zrispo-feature-code-folding 2017-10-11 15:55:55 -04:00
Cassie Tarakajian
48cbd79ca8 fixes #443 2017-10-11 12:56:44 -04:00
Akarshit Wal
20bc8633d7 Login and signup page not visible after login (#431) 
* Login and signup page not visible after login

* Redirect added on server side
 2017-09-29 11:52:20 -07:00
Cassie Tarakajian
9253d7e1ec fix reversed keyboard shortcuts on nav, fix wording on keyboard shortcut modal 2017-09-15 12:14:01 -04:00