Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/collection-view
Browse files Browse the repository at this point in the history
  • Loading branch information
raclim authored Nov 14, 2023
2 parents 6c8e069 + 115a7b2 commit a9f26c1
Show file tree
Hide file tree
Showing 49 changed files with 79 additions and 1,571 deletions.
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ MAILGUN_KEY=<your-mailgun-api-key>
ML5_LIBRARY_USERNAME=ml5
ML5_LIBRARY_EMAIL=[email protected]
ML5_LIBRARY_PASS=helloml5
MOBILE_ENABLED=true
MONGO_URL=mongodb://localhost:27017/p5js-web-editor
PORT=8000
PREVIEW_PORT=8002
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ If you have found a bug in the p5.js Web Editor, you can file it under the ["iss

### How Do I Know My Issue or Pull Request is Getting Reviewed?

To see which pull requests and issues are currently being reviewed, check the [PR Review Board](https://github.com/processing/p5.js-web-editor/projects/9) or the following Milestones: [PATCH Release](https://github.com/processing/p5.js-web-editor/milestone/9), [MINOR Release](https://github.com/processing/p5.js-web-editor/milestone/8).
To see which pull requests and issues are currently being reviewed, check the [PR Review Board](https://github.com/processing/p5.js-web-editor/projects/9) or the following Milestones: [PATCH Release](https://github.com/processing/p5.js-web-editor/milestone/10), [MINOR Release](https://github.com/processing/p5.js-web-editor/milestone/8).

Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones will be prioritized since they are planned to be merged for the next release to Production. Please feel free to [comment on this pinned issue](https://github.com/processing/p5.js-web-editor/issues/2534) if you would like your issue to be considered for the next release!

Expand All @@ -38,11 +38,9 @@ Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones

We will aim to deploy on a 1-2 month basis. Here are some dates we’re working towards:

MINOR Release for [p5.js version 1.8.0](https://github.com/processing/p5.js/releases/tag/v1.8.0): By October 27, 2023
2.9.3 PATCH Release: By November 17, 2023

PATCH Release: By November 2, 2023

MINOR Release: By November 30, 2023
2.10.0 MINOR Release: By December 15, 2023

[You can read more about Semantic Versioning and the differences between a MINOR and PATCH release](https://semver.org/).

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import Button from '../../common/Button';
import { remSize } from '../../theme';
import Button from './Button';
import { remSize } from '../theme';

const ButtonWrapper = styled(Button)`
width: ${remSize(48)};
Expand Down
2 changes: 1 addition & 1 deletion client/components/Dropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import { remSize, prop } from '../theme';
import IconButton from './mobile/IconButton';
import IconButton from '../common/IconButton';

const DropdownWrapper = styled.ul`
background-color: ${prop('Modal.background')};
Expand Down
56 changes: 0 additions & 56 deletions client/components/mobile/ActionStrip.jsx

This file was deleted.

30 changes: 0 additions & 30 deletions client/components/mobile/Explorer.jsx

This file was deleted.

44 changes: 0 additions & 44 deletions client/components/mobile/FloatingNav.jsx

This file was deleted.

17 changes: 0 additions & 17 deletions client/components/mobile/Footer.jsx

This file was deleted.

121 changes: 0 additions & 121 deletions client/components/mobile/Header.jsx

This file was deleted.

12 changes: 0 additions & 12 deletions client/components/mobile/IDEWrapper.jsx

This file was deleted.

45 changes: 0 additions & 45 deletions client/components/mobile/MobileScreen.jsx

This file was deleted.

Loading

0 comments on commit a9f26c1

Please sign in to comment.