Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

logging-scratch-gui
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

a775aaf2

Unverified Commit a775aaf2 authored Jun 27, 2018 by Paul Kaplan Committed by GitHub Jun 27, 2018

Downloads
- Plain Diff

Merge branch 'develop' into greenkeeper/scratch-audio-0.1.0-prerelease.20180625202813

parents 1f9f7e62 e4d8db7e

Branches

Tags

Loading

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

package.json 5 additions, 1 deletion

package.json
src/components/cards/card.css 1 addition, 2 deletions

src/components/cards/card.css
src/components/gui/gui.jsx 6 additions, 1 deletion

src/components/gui/gui.jsx
src/components/stage/stage.jsx 8 additions, 6 deletions

src/components/stage/stage.jsx
src/containers/dom-element-renderer.jsx 44 additions, 0 deletions

src/containers/dom-element-renderer.jsx
src/containers/gui.jsx 1 addition, 3 deletions

src/containers/gui.jsx
src/containers/slider-monitor.jsx 1 addition, 1 deletion

src/containers/slider-monitor.jsx
src/containers/stage.jsx 11 additions, 9 deletions

src/containers/stage.jsx
src/lib/monitor-adapter.js 11 additions, 1 deletion

src/lib/monitor-adapter.js
src/playground/player.jsx 33 additions, 7 deletions

src/playground/player.jsx

with 121 additions and 31 deletions

Loading

0% Loading or .

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

Finish editing this message first!

Please sign in to comment