Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

H

Hubs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

0221433d

Commit 0221433d authored 6 years ago by Kevin Lee

Downloads
- Plain Diff

Merge branch 'master' into feature/drawing

# Conflicts:
#	src/components/super-spawner.js
#	src/hub.js
#	src/utils/media-utils.js

parents 35ccfc4d f573a62a

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.env.defaults 2 additions, 2 deletions

.env.defaults
README.md 1 addition, 1 deletion

README.md
src/components/media-loader.js 27 additions, 14 deletions

src/components/media-loader.js
src/components/media-views.js 414 additions, 0 deletions

src/components/media-views.js
src/components/super-spawner.js 3 additions, 1 deletion

src/components/super-spawner.js
src/hub.js 19 additions, 8 deletions

src/hub.js
src/network-schemas.js 9 additions, 1 deletion

src/network-schemas.js
src/object-types.js 86 additions, 0 deletions

src/object-types.js
src/react-components/create-object-dialog.js 2 additions, 1 deletion

src/react-components/create-object-dialog.js
src/utils/hub-channel.js 13 additions, 0 deletions

src/utils/hub-channel.js
src/utils/media-utils.js 8 additions, 1 deletion

src/utils/media-utils.js

with 584 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment